refactor: move removeSubjectIdScope to runtime core

Author: joshunrau

apps/api/src/instrument-records/export-worker.js

@@ -1,10 +1,20 @@
 import { parentPort } from 'worker_threads';
 
-import { removeSubjectIdScope } from '@opendatacapture/subject-utils';
-
 /** @type {typeof import('@opendatacapture/schemas/core').DEFAULT_GROUP_NAME} */
 const DEFAULT_GROUP_NAME = 'root';
 
+/** @type {typeof import( '#runtime/v1/@opendatacapture/runtime-internal/index.js').removeSubjectIdScope} */
+let removeSubjectIdScope;
+
+// we need to resolve import correctly in development
+try {
+  const runtimeInternal = await import('#runtime/v1/@opendatacapture/runtime-internal/index.js');
+  removeSubjectIdScope = runtimeInternal.removeSubjectIdScope;
+} catch {
+  const runtimeInternal = await import('@opendatacapture/runtime-v1/@opendatacapture/runtime-internal/index.js');
+  removeSubjectIdScope = runtimeInternal.removeSubjectIdScope;
+}
+
 /**
  * @typedef {Object} SuccessExpand
  * @property {string} measure

packages/runtime-internal/src/index.d.ts

@@ -13,3 +13,6 @@ export declare function encodeUnicodeToBase64(s: string): string;
 
 /** Decodes a Base64 string back into a Unicode string. */
 export declare function decodeBase64ToUnicode(s: string): string;
+
+/** Remove the scope from a subject ID (e.g., root$123 -> 123) */
+export declare function removeSubjectIdScope(id: string): string;

packages/runtime-internal/src/index.js

@@ -21,3 +21,11 @@ export function decodeBase64ToUnicode(s) {
   const bytes = Uint8Array.from(binaryString, (c) => c.charCodeAt(0));
   return new TextDecoder().decode(bytes);
 }
+
+/** @type {import('./index.d.ts').removeSubjectIdScope} */
+export function removeSubjectIdScope(id) {
+  if (id.includes('$')) {
+    return /** @type {string} */ (id.split('$')[1]);
+  }
+  return id;
+}

packages/subject-utils/package.json

@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "@douglasneuroinformatics/libcrypto": "catalog:",
+    "@opendatacapture/runtime-internal": "workspace:*",
     "@opendatacapture/schemas": "workspace:*",
     "transliteration": "^2.3.5"
   },

packages/subject-utils/src/index.ts

@@ -55,9 +55,4 @@ export function encodeScopedSubjectId(id: number | string, options: { groupName:
   return options.groupName.replaceAll(' ', '_') + '$' + id;
 }
 
-export function removeSubjectIdScope(id: string) {
-  if (id.includes('$')) {
-    return id.split('$')[1]!;
-  }
-  return id;
-}
+export { removeSubjectIdScope } from '@opendatacapture/runtime-internal';