@open-mercato/shared 0.6.3-develop.3663.1.63517660ba → 0.6.3-develop.3680.1.62e9da67c2

package/dist/lib/modules/registry.js

@@ -1,16 +1,25 @@
 import { applyModuleOverridesToModules } from "@open-mercato/shared/modules/overrides";
-let _modules = null;
+const GLOBAL_KEY = "__openMercatoModulesRegistry__";
+function getGlobalModules() {
+  return globalThis[GLOBAL_KEY] ?? null;
+}
+function setGlobalModules(modules) {
+  ;
+  globalThis[GLOBAL_KEY] = modules;
+}
 function registerModules(modules) {
-  if (_modules !== null && process.env.NODE_ENV === "development") {
+  const existing = getGlobalModules();
+  if (existing !== null && process.env.NODE_ENV === "development") {
     console.debug("[Bootstrap] Modules re-registered (this may occur during HMR)");
   }
-  _modules = applyModuleOverridesToModules(modules);
+  setGlobalModules(applyModuleOverridesToModules(modules));
 }
 function getModules() {
-  if (!_modules) {
+  const modules = getGlobalModules();
+  if (!modules) {
     throw new Error("[Bootstrap] Modules not registered. Call registerModules() at bootstrap.");
   }
-  return _modules;
+  return modules;
 }
 export {
   getModules,

package/dist/lib/modules/registry.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/modules/registry.ts"],
-  "sourcesContent": ["import type { Module } from '@open-mercato/shared/modules/registry'\nimport { applyModuleOverridesToModules } from '@open-mercato/shared/modules/overrides'\n\n// Registration pattern for publishable packages\nlet _modules: Module[] | null = null\n\nexport function registerModules(modules: Module[]) {\n  if (_modules !== null && process.env.NODE_ENV === 'development') {\n    console.debug('[Bootstrap] Modules re-registered (this may occur during HMR)')\n  }\n  _modules = applyModuleOverridesToModules(modules)\n}\n\nexport function getModules(): Module[] {\n  if (!_modules) {\n    throw new Error('[Bootstrap] Modules not registered. Call registerModules() at bootstrap.')\n  }\n  return _modules\n}\n"],
-  "mappings": "AACA,SAAS,qCAAqC;AAG9C,IAAI,WAA4B;AAEzB,SAAS,gBAAgB,SAAmB;AACjD,MAAI,aAAa,QAAQ,QAAQ,IAAI,aAAa,eAAe;AAC/D,YAAQ,MAAM,+DAA+D;AAAA,EAC/E;AACA,aAAW,8BAA8B,OAAO;AAClD;AAEO,SAAS,aAAuB;AACrC,MAAI,CAAC,UAAU;AACb,UAAM,IAAI,MAAM,0EAA0E;AAAA,EAC5F;AACA,SAAO;AACT;",
+  "sourcesContent": ["import type { Module } from '@open-mercato/shared/modules/registry'\nimport { applyModuleOverridesToModules } from '@open-mercato/shared/modules/overrides'\n\n// Registration pattern for publishable packages.\n// Use globalThis to survive tsx/esbuild module duplication where the same\n// registry.ts file can be loaded as multiple module instances when mixing\n// dynamic and static imports \u2014 for example a standalone integration test\n// bootstraps via the source path while a worker handler resolves it through\n// node_modules/@open-mercato/shared/dist/. Mirrors the same workaround used\n// by `getDiRegistrars()` in `../di/container.ts`.\nconst GLOBAL_KEY = '__openMercatoModulesRegistry__'\n\nfunction getGlobalModules(): Module[] | null {\n  return (globalThis as any)[GLOBAL_KEY] ?? null\n}\n\nfunction setGlobalModules(modules: Module[]): void {\n  ;(globalThis as any)[GLOBAL_KEY] = modules\n}\n\nexport function registerModules(modules: Module[]) {\n  const existing = getGlobalModules()\n  if (existing !== null && process.env.NODE_ENV === 'development') {\n    console.debug('[Bootstrap] Modules re-registered (this may occur during HMR)')\n  }\n  setGlobalModules(applyModuleOverridesToModules(modules))\n}\n\nexport function getModules(): Module[] {\n  const modules = getGlobalModules()\n  if (!modules) {\n    throw new Error('[Bootstrap] Modules not registered. Call registerModules() at bootstrap.')\n  }\n  return modules\n}\n"],
+  "mappings": "AACA,SAAS,qCAAqC;AAS9C,MAAM,aAAa;AAEnB,SAAS,mBAAoC;AAC3C,SAAQ,WAAmB,UAAU,KAAK;AAC5C;AAEA,SAAS,iBAAiB,SAAyB;AACjD;AAAC,EAAC,WAAmB,UAAU,IAAI;AACrC;AAEO,SAAS,gBAAgB,SAAmB;AACjD,QAAM,WAAW,iBAAiB;AAClC,MAAI,aAAa,QAAQ,QAAQ,IAAI,aAAa,eAAe;AAC/D,YAAQ,MAAM,+DAA+D;AAAA,EAC/E;AACA,mBAAiB,8BAA8B,OAAO,CAAC;AACzD;AAEO,SAAS,aAAuB;AACrC,QAAM,UAAU,iBAAiB;AACjC,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,0EAA0E;AAAA,EAC5F;AACA,SAAO;AACT;",
   "names": []
 }

package/dist/lib/version.js

@@ -1,4 +1,4 @@
-const APP_VERSION = "0.6.3-develop.3663.1.63517660ba";
+const APP_VERSION = "0.6.3-develop.3680.1.62e9da67c2";
 const appVersion = APP_VERSION;
 export {
   APP_VERSION,

package/dist/lib/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/version.ts"],
-  "sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.6.3-develop.3663.1.63517660ba'\nexport const appVersion = APP_VERSION\n"],
+  "sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.6.3-develop.3680.1.62e9da67c2'\nexport const appVersion = APP_VERSION\n"],
   "mappings": "AACO,MAAM,cAAc;AACpB,MAAM,aAAa;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/shared",
-  "version": "0.6.3-develop.3663.1.63517660ba",
+  "version": "0.6.3-develop.3680.1.62e9da67c2",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -92,7 +92,7 @@
     "@mikro-orm/core": "^7.0.17",
     "@mikro-orm/decorators": "^7.0.17",
     "@mikro-orm/postgresql": "^7.0.17",
-    "@open-mercato/cache": "0.6.3-develop.3663.1.63517660ba",
+    "@open-mercato/cache": "0.6.3-develop.3680.1.62e9da67c2",
     "dotenv": "^17.4.2",
     "rate-limiter-flexible": "^11.1.0",
     "re2js": "2.8.2",

package/src/lib/modules/__tests__/registry.test.ts

@@ -0,0 +1,114 @@
+import type { Module } from '@open-mercato/shared/modules/registry'
+
+const GLOBAL_KEY = '__openMercatoModulesRegistry__'
+
+function clearGlobalRegistry(): void {
+  delete (globalThis as any)[GLOBAL_KEY]
+}
+
+function clearRegistryModuleCache(): void {
+  const matchers = [/packages\/shared\/src\/lib\/modules\/registry\.ts$/]
+  for (const key of Object.keys(require.cache)) {
+    if (matchers.some((re) => re.test(key))) {
+      delete require.cache[key]
+    }
+  }
+}
+
+function loadRegistry(): typeof import('../registry') {
+  clearRegistryModuleCache()
+  return require('../registry') as typeof import('../registry')
+}
+
+describe('shared modules registry', () => {
+  const sampleModules: Module[] = [
+    { id: 'auth' } as Module,
+    { id: 'customers' } as Module,
+  ]
+
+  let nodeEnvSnapshot: string | undefined
+
+  beforeEach(() => {
+    nodeEnvSnapshot = process.env.NODE_ENV
+    clearGlobalRegistry()
+  })
+
+  afterEach(() => {
+    clearGlobalRegistry()
+    if (nodeEnvSnapshot === undefined) {
+      delete process.env.NODE_ENV
+    } else {
+      process.env.NODE_ENV = nodeEnvSnapshot
+    }
+    clearRegistryModuleCache()
+  })
+
+  it('returns registered modules from the same module instance', () => {
+    const registry = loadRegistry()
+    registry.registerModules(sampleModules)
+    expect(registry.getModules().map((m) => m.id)).toEqual(['auth', 'customers'])
+  })
+
+  it('throws a helpful error when getModules is called before bootstrap', () => {
+    const registry = loadRegistry()
+    expect(() => registry.getModules()).toThrow(
+      '[Bootstrap] Modules not registered. Call registerModules() at bootstrap.',
+    )
+  })
+
+  it('survives module duplication: a re-required registry instance still sees modules registered by the first', () => {
+    // First load: bootstrap registers modules via the "source" path.
+    const first = loadRegistry()
+    first.registerModules(sampleModules)
+    expect(first.getModules().map((m) => m.id)).toEqual(['auth', 'customers'])
+
+    // Second load: simulate tsx/esbuild re-loading the same file under a
+    // different module identity (e.g. dist/ vs src/). This is the exact
+    // failure mode hit by the standalone TC-CRM-068/069 worker handlers —
+    // they create a fresh container, which calls getModules() through a
+    // different registry instance than the test's bootstrap registered into.
+    // With the module-local `let _modules` variant, this re-require would
+    // throw `[Bootstrap] Modules not registered`. With the globalThis
+    // variant it returns the same list.
+    const second = loadRegistry()
+    expect(second.getModules().map((m) => m.id)).toEqual(['auth', 'customers'])
+  })
+
+  it('reads from globalThis so external setters can prime the registry', () => {
+    // Simulates the case where a bootstrap script in a sibling process or
+    // sibling module instance already wrote to `globalThis` before this
+    // package's registry module was even loaded.
+    ;(globalThis as any).__openMercatoModulesRegistry__ = sampleModules
+    const registry = loadRegistry()
+    expect(registry.getModules().map((m) => m.id)).toEqual(['auth', 'customers'])
+  })
+
+  it('emits the HMR debug log on re-registration in development', () => {
+    process.env.NODE_ENV = 'development'
+    const debugSpy = jest.spyOn(console, 'debug').mockImplementation(() => {})
+    try {
+      const registry = loadRegistry()
+      registry.registerModules(sampleModules)
+      expect(debugSpy).not.toHaveBeenCalled()
+      registry.registerModules(sampleModules)
+      expect(debugSpy).toHaveBeenCalledWith(
+        '[Bootstrap] Modules re-registered (this may occur during HMR)',
+      )
+    } finally {
+      debugSpy.mockRestore()
+    }
+  })
+
+  it('does not emit the HMR debug log when NODE_ENV is not development', () => {
+    process.env.NODE_ENV = 'production'
+    const debugSpy = jest.spyOn(console, 'debug').mockImplementation(() => {})
+    try {
+      const registry = loadRegistry()
+      registry.registerModules(sampleModules)
+      registry.registerModules(sampleModules)
+      expect(debugSpy).not.toHaveBeenCalled()
+    } finally {
+      debugSpy.mockRestore()
+    }
+  })
+})

package/src/lib/modules/registry.ts

@@ -1,19 +1,35 @@
 import type { Module } from '@open-mercato/shared/modules/registry'
 import { applyModuleOverridesToModules } from '@open-mercato/shared/modules/overrides'
 
-// Registration pattern for publishable packages
-let _modules: Module[] | null = null
+// Registration pattern for publishable packages.
+// Use globalThis to survive tsx/esbuild module duplication where the same
+// registry.ts file can be loaded as multiple module instances when mixing
+// dynamic and static imports — for example a standalone integration test
+// bootstraps via the source path while a worker handler resolves it through
+// node_modules/@open-mercato/shared/dist/. Mirrors the same workaround used
+// by `getDiRegistrars()` in `../di/container.ts`.
+const GLOBAL_KEY = '__openMercatoModulesRegistry__'
+
+function getGlobalModules(): Module[] | null {
+  return (globalThis as any)[GLOBAL_KEY] ?? null
+}
+
+function setGlobalModules(modules: Module[]): void {
+  ;(globalThis as any)[GLOBAL_KEY] = modules
+}
 
 export function registerModules(modules: Module[]) {
-  if (_modules !== null && process.env.NODE_ENV === 'development') {
+  const existing = getGlobalModules()
+  if (existing !== null && process.env.NODE_ENV === 'development') {
     console.debug('[Bootstrap] Modules re-registered (this may occur during HMR)')
   }
-  _modules = applyModuleOverridesToModules(modules)
+  setGlobalModules(applyModuleOverridesToModules(modules))
 }
 
 export function getModules(): Module[] {
-  if (!_modules) {
+  const modules = getGlobalModules()
+  if (!modules) {
     throw new Error('[Bootstrap] Modules not registered. Call registerModules() at bootstrap.')
   }
-  return _modules
+  return modules
 }