@open-mercato/cli 0.6.7-develop.6568.1.9f57ffc393 → 0.6.7-develop.6572.1.3d8e83062f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cli",
-  "version": "0.6.7-develop.6568.1.9f57ffc393",
+  "version": "0.6.7-develop.6572.1.3d8e83062f",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,8 +60,8 @@
     "@mikro-orm/decorators": "^7.1.5",
     "@mikro-orm/migrations": "^7.1.5",
     "@mikro-orm/postgresql": "^7.1.5",
-    "@open-mercato/queue": "0.6.7-develop.6568.1.9f57ffc393",
-    "@open-mercato/shared": "0.6.7-develop.6568.1.9f57ffc393",
+    "@open-mercato/queue": "0.6.7-develop.6572.1.3d8e83062f",
+    "@open-mercato/shared": "0.6.7-develop.6572.1.3d8e83062f",
     "cross-spawn": "^7.0.6",
     "pg": "8.22.0",
     "semver": "^7.8.5",
@@ -72,10 +72,10 @@
     "typescript-js": "npm:typescript@6.0.3"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.7-develop.6568.1.9f57ffc393"
+    "@open-mercato/shared": "0.6.7-develop.6572.1.3d8e83062f"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.7-develop.6568.1.9f57ffc393",
+    "@open-mercato/shared": "0.6.7-develop.6572.1.3d8e83062f",
     "@types/jest": "^30.0.0",
     "jest": "^30.4.2",
     "ts-jest": "^29.4.11"

package/src/__tests__/mercato.test.ts

@@ -352,9 +352,7 @@ describe('init command failure output', () => {
     }))
     jest.doMock('../lib/generators', () => ({
       generateEntityIds: jest.fn().mockResolvedValue(undefined),
-      generateModuleRegistry: jest.fn().mockResolvedValue(undefined),
-      generateModuleRegistryApp: jest.fn().mockResolvedValue(undefined),
-      generateModuleRegistryCli: jest.fn().mockResolvedValue(undefined),
+      generateModuleRegistries: jest.fn().mockResolvedValue(undefined),
       generateModuleEntities: jest.fn().mockResolvedValue(undefined),
       generateModuleDi: jest.fn().mockResolvedValue(undefined),
       generateModulePackageSources: jest.fn().mockResolvedValue(undefined),
@@ -400,9 +398,7 @@ describe('init command failure output', () => {
     }))
     jest.doMock('../lib/generators', () => ({
       generateEntityIds: jest.fn().mockResolvedValue(undefined),
-      generateModuleRegistry: jest.fn().mockResolvedValue(undefined),
-      generateModuleRegistryApp: jest.fn().mockResolvedValue(undefined),
-      generateModuleRegistryCli: jest.fn().mockResolvedValue(undefined),
+      generateModuleRegistries: jest.fn().mockResolvedValue(undefined),
       generateModuleEntities: jest.fn().mockResolvedValue(undefined),
       generateModuleDi: jest.fn().mockResolvedValue(undefined),
       generateModulePackageSources: jest.fn().mockResolvedValue(undefined),
@@ -451,9 +447,7 @@ describe('init command failure output', () => {
     }))
     jest.doMock('../lib/generators', () => ({
       generateEntityIds: jest.fn().mockResolvedValue(undefined),
-      generateModuleRegistry: jest.fn().mockResolvedValue(undefined),
-      generateModuleRegistryApp: jest.fn().mockResolvedValue(undefined),
-      generateModuleRegistryCli: jest.fn().mockResolvedValue(undefined),
+      generateModuleRegistries: jest.fn().mockResolvedValue(undefined),
       generateModuleEntities: jest.fn().mockResolvedValue(undefined),
       generateModuleDi: jest.fn().mockResolvedValue(undefined),
       generateModulePackageSources: jest.fn().mockResolvedValue(undefined),
@@ -553,9 +547,7 @@ describe('generate post-step structural invalidation', () => {
       filesUnchanged: [],
       errors: [],
     })
-    const generateModuleRegistry = jest.fn().mockResolvedValue(undefined)
-    const generateModuleRegistryApp = jest.fn().mockResolvedValue(undefined)
-    const generateModuleRegistryCli = jest.fn().mockResolvedValue(undefined)
+    const generateModuleRegistries = jest.fn().mockResolvedValue([])
     const generateModuleEntities = jest.fn().mockResolvedValue(undefined)
     const generateModuleDi = jest.fn().mockResolvedValue(undefined)
     const generateModulePackageSources = jest.fn().mockResolvedValue(undefined)
@@ -569,9 +561,7 @@ describe('generate post-step structural invalidation', () => {
 
     jest.doMock('../lib/generators', () => ({
       generateEntityIds,
-      generateModuleRegistry,
-      generateModuleRegistryApp,
-      generateModuleRegistryCli,
+      generateModuleRegistries,
       generateModuleEntities,
       generateModuleDi,
       generateModulePackageSources,
@@ -595,6 +585,7 @@ describe('generate post-step structural invalidation', () => {
 
     expect(exitCode).toBe(0)
     expect(generateEntityIds).toHaveBeenCalled()
+    expect(generateModuleRegistries).toHaveBeenCalledTimes(1)
     expect(invalidate).toHaveBeenCalledWith('/tmp/test-app')
 
     consoleErrorSpy.mockRestore()
@@ -611,9 +602,7 @@ describe('generate post-step structural invalidation', () => {
     }
     const generators = {
       generateEntityIds: jest.fn().mockResolvedValue(unchangedResult),
-      generateModuleRegistry: jest.fn().mockResolvedValue(unchangedResult),
-      generateModuleRegistryApp: jest.fn().mockResolvedValue(unchangedResult),
-      generateModuleRegistryCli: jest.fn().mockResolvedValue(unchangedResult),
+      generateModuleRegistries: jest.fn().mockResolvedValue([unchangedResult, unchangedResult, unchangedResult]),
       generateModuleEntities: jest.fn().mockResolvedValue(unchangedResult),
       generateModuleDi: jest.fn().mockResolvedValue(unchangedResult),
       generateModulePackageSources: jest.fn().mockResolvedValue(unchangedResult),
@@ -653,9 +642,7 @@ describe('generate post-step structural invalidation', () => {
       filesUnchanged: [],
       errors: [],
     })
-    const generateModuleRegistry = jest.fn().mockResolvedValue(undefined)
-    const generateModuleRegistryApp = jest.fn().mockResolvedValue(undefined)
-    const generateModuleRegistryCli = jest.fn().mockResolvedValue(undefined)
+    const generateModuleRegistries = jest.fn().mockResolvedValue([])
     const generateModuleEntities = jest.fn().mockResolvedValue(undefined)
     const generateModuleDi = jest.fn().mockResolvedValue(undefined)
     const generateModulePackageSources = jest.fn().mockResolvedValue(undefined)
@@ -664,9 +651,7 @@ describe('generate post-step structural invalidation', () => {
 
     jest.doMock('../lib/generators', () => ({
       generateEntityIds,
-      generateModuleRegistry,
-      generateModuleRegistryApp,
-      generateModuleRegistryCli,
+      generateModuleRegistries,
       generateModuleEntities,
       generateModuleDi,
       generateModulePackageSources,
@@ -687,6 +672,7 @@ describe('generate post-step structural invalidation', () => {
 
     expect(exitCode).toBe(0)
     expect(generateEntityIds).toHaveBeenCalled()
+    expect(generateModuleRegistries).toHaveBeenCalledTimes(1)
     expect(invalidate).toHaveBeenCalledWith('/tmp/test-app')
 
     consoleErrorSpy.mockRestore()
@@ -697,12 +683,11 @@ describe('generate post-step structural invalidation', () => {
     const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation()
     const consoleLogSpy = jest.spyOn(console, 'log').mockImplementation()
     const generate = jest.fn().mockResolvedValue(undefined)
+    const generateModuleRegistries = jest.fn().mockResolvedValue([])
 
     jest.doMock('../lib/generators', () => ({
       generateEntityIds: generate,
-      generateModuleRegistry: generate,
-      generateModuleRegistryApp: generate,
-      generateModuleRegistryCli: generate,
+      generateModuleRegistries,
       generateModuleEntities: generate,
       generateModuleDi: generate,
       generateModulePackageSources: generate,
@@ -723,6 +708,7 @@ describe('generate post-step structural invalidation', () => {
 
     expect(exitCode).toBe(0)
     expect(generate).toHaveBeenCalled()
+    expect(generateModuleRegistries).toHaveBeenCalledTimes(1)
 
     consoleErrorSpy.mockRestore()
     consoleLogSpy.mockRestore()

package/src/lib/generators/__tests__/generators.test.ts

@@ -19,6 +19,11 @@ describe('generators', () => {
       expect(typeof module.generateModuleRegistryApp).toBe('function')
     })
 
+    it('should export generateModuleRegistries', async () => {
+      const module = await import('../module-registry')
+      expect(typeof module.generateModuleRegistries).toBe('function')
+    })
+
     it('should export generateModuleEntities', async () => {
       const module = await import('../module-entities')
       expect(typeof module.generateModuleEntities).toBe('function')

package/src/lib/generators/__tests__/output-snapshots.test.ts

@@ -13,7 +13,12 @@ import fs from 'node:fs'
 import path from 'node:path'
 import os from 'node:os'
 import type { PackageResolver, ModuleEntry } from '../../resolver'
-import { generateModuleRegistry, generateModuleRegistryApp, generateModuleRegistryCli } from '../module-registry'
+import {
+  generateModuleRegistries,
+  generateModuleRegistry,
+  generateModuleRegistryApp,
+  generateModuleRegistryCli,
+} from '../module-registry'
 import { generateModuleDi } from '../module-di'
 import { generateModuleEntities } from '../module-entities'
 import { generateEntityIds } from '../entity-ids'
@@ -751,6 +756,37 @@ describe('generator output compatibility', () => {
     expect(secondRun).toEqual(firstRun)
   })
 
+  it('shares one discovery snapshot across all registry renderers without changing output', async () => {
+    const enabled = scaffoldFixture()
+    const baselineResolver = createMockResolver(enabled)
+
+    await generateModuleRegistry({ resolver: baselineResolver, quiet: true })
+    await generateModuleRegistryApp({ resolver: baselineResolver, quiet: true })
+    await generateModuleRegistryCli({ resolver: baselineResolver, quiet: true })
+    const baseline = captureGeneratedFiles()
+
+    fs.rmSync(outputDir, { recursive: true, force: true })
+    fs.mkdirSync(outputDir, { recursive: true })
+
+    const delegate = createMockResolver(enabled)
+    const loadEnabledModules = jest.fn(delegate.loadEnabledModules)
+    const getModulePaths = jest.fn(delegate.getModulePaths)
+    const getModuleImportBase = jest.fn(delegate.getModuleImportBase)
+    const resolver: PackageResolver = {
+      ...delegate,
+      loadEnabledModules,
+      getModulePaths,
+      getModuleImportBase,
+    }
+
+    await generateModuleRegistries({ resolver, quiet: true })
+
+    expect(captureGeneratedFiles()).toEqual(baseline)
+    expect(loadEnabledModules).toHaveBeenCalledTimes(1)
+    expect(getModulePaths).toHaveBeenCalledTimes(enabled.length)
+    expect(getModuleImportBase).toHaveBeenCalledTimes(enabled.length)
+  })
+
   it('includes app-level workers with variable-referenced queue names in generated output', async () => {
     const enabled = scaffoldFixture()
     const resolver = createMockResolver(enabled)

package/src/lib/generators/index.ts

@@ -1,5 +1,11 @@
 export { generateEntityIds, type EntityIdsOptions } from './entity-ids'
-export { generateModuleRegistry, generateModuleRegistryApp, generateModuleRegistryCli, type ModuleRegistryOptions } from './module-registry'
+export {
+  generateModuleRegistry,
+  generateModuleRegistryApp,
+  generateModuleRegistryCli,
+  generateModuleRegistries,
+  type ModuleRegistryOptions,
+} from './module-registry'
 export { generateModuleEntities, type ModuleEntitiesOptions } from './module-entities'
 export { generateModuleDi, type ModuleDiOptions } from './module-di'
 export { generateModulePackageSources, type ModulePackageSourcesOptions } from './module-package-sources'