@open-mercato/cli 0.8.1-develop.7206.1.45a3cee87f → 0.8.1-develop.7215.1.60786cf836

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cli",
-  "version": "0.8.1-develop.7206.1.45a3cee87f",
+  "version": "0.8.1-develop.7215.1.60786cf836",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,9 +60,9 @@
     "@mikro-orm/decorators": "^7.1.14",
     "@mikro-orm/migrations": "^7.1.14",
     "@mikro-orm/postgresql": "^7.1.14",
-    "@open-mercato/queue": "0.8.1-develop.7206.1.45a3cee87f",
-    "@open-mercato/shared": "0.8.1-develop.7206.1.45a3cee87f",
-    "@open-mercato/telemetry": "0.8.1-develop.7206.1.45a3cee87f",
+    "@open-mercato/queue": "0.8.1-develop.7215.1.60786cf836",
+    "@open-mercato/shared": "0.8.1-develop.7215.1.60786cf836",
+    "@open-mercato/telemetry": "0.8.1-develop.7215.1.60786cf836",
     "cross-spawn": "^7.0.6",
     "pg": "8.23.0",
     "semver": "^7.8.5",
@@ -73,10 +73,10 @@
     "typescript-js": "npm:typescript@6.0.3"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.8.1-develop.7206.1.45a3cee87f"
+    "@open-mercato/shared": "0.8.1-develop.7215.1.60786cf836"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.8.1-develop.7206.1.45a3cee87f",
+    "@open-mercato/shared": "0.8.1-develop.7215.1.60786cf836",
     "@types/jest": "^30.0.0",
     "jest": "^30.4.2",
     "ts-jest": "^29.4.12"

package/src/__tests__/mercato.test.ts

@@ -531,6 +531,85 @@ describe('init command failure output', () => {
   })
 })
 
+describe('seed:defaults command', () => {
+  const originalDatabaseUrl = process.env.DATABASE_URL
+
+  beforeEach(() => {
+    jest.restoreAllMocks()
+    jest.resetModules()
+    process.env.DATABASE_URL = 'postgres://postgres:secret@127.0.0.1:5432/open_mercato'
+  })
+
+  afterEach(() => {
+    jest.dontMock('../lib/resolver')
+    jest.dontMock('@open-mercato/shared/lib/bootstrap/dynamicLoader')
+    jest.dontMock('@open-mercato/shared/lib/di/container')
+    jest.dontMock('@open-mercato/core/modules/directory/data/entities')
+    jest.dontMock('@open-mercato/core/modules/auth/lib/setup-app')
+    jest.resetModules()
+  })
+
+  afterAll(() => {
+    process.env.DATABASE_URL = originalDatabaseUrl
+  })
+
+  it('honors an overrides.setup.seedDefaults: false entry instead of seeding from the raw bootstrap array', async () => {
+    const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation()
+    const consoleLogSpy = jest.spyOn(console, 'log').mockImplementation()
+
+    const { applyModuleOverridesFromEnabledModules } = await import('@open-mercato/shared/modules/overrides')
+    applyModuleOverridesFromEnabledModules([
+      { id: 'workflows', overrides: { setup: { seedDefaults: false } } },
+    ])
+
+    const workflowsSeedDefaults = jest.fn().mockResolvedValue(undefined)
+    const catalogSeedDefaults = jest.fn().mockResolvedValue(undefined)
+
+    jest.doMock('../lib/resolver', () => ({
+      createResolver: () => ({
+        getAppDir: () => '/tmp/test-app',
+      }),
+    }))
+    jest.doMock('@open-mercato/shared/lib/bootstrap/dynamicLoader', () => ({
+      bootstrapFromAppRoot: jest.fn().mockResolvedValue({
+        modules: [
+          { id: 'workflows', setup: { seedDefaults: workflowsSeedDefaults } },
+          { id: 'catalog', setup: { seedDefaults: catalogSeedDefaults } },
+        ],
+      }),
+    }))
+    jest.doMock('@open-mercato/shared/lib/di/container', () => ({
+      createRequestContainer: jest.fn().mockResolvedValue({
+        resolve: jest.fn().mockReturnValue({
+          find: jest.fn().mockResolvedValue([{ id: 'org-1', tenant: { id: 'tenant-1' } }]),
+        }),
+      }),
+    }))
+    jest.doMock(
+      '@open-mercato/core/modules/directory/data/entities',
+      () => ({ Organization: class Organization {} }),
+      { virtual: true },
+    )
+    jest.doMock(
+      '@open-mercato/core/modules/auth/lib/setup-app',
+      () => ({ ensureCustomRoleAcls: jest.fn().mockResolvedValue(undefined) }),
+      { virtual: true },
+    )
+
+    const mercato = await import('../mercato')
+    const exitCode = await mercato.run(['node', 'mercato', 'seed:defaults'])
+
+    expect(exitCode).toBe(0)
+    expect(workflowsSeedDefaults).not.toHaveBeenCalled()
+    expect(catalogSeedDefaults).toHaveBeenCalledWith(
+      expect.objectContaining({ tenantId: 'tenant-1', organizationId: 'org-1' }),
+    )
+
+    consoleErrorSpy.mockRestore()
+    consoleLogSpy.mockRestore()
+  })
+})
+
 describe('generate post-step structural invalidation', () => {
   beforeEach(() => {
     jest.restoreAllMocks()

package/src/lib/generators/__tests__/module-extension-facts.test.ts

@@ -76,6 +76,41 @@ describe('module extension facts', () => {
     expect(hostOrder).toEqual([...hostOrder].sort((left, right) => left.localeCompare(right)))
   })
 
+  it('captures extra mount points from an array-form host source, keeping the first entry as the primary path', () => {
+    write(moduleRoot, 'extension-points.ts', `
+      import { defineModuleExtensionPoints, dataTableExtensionHost, crudFormExtensionHost } from 'x'
+      export const extensionPoints = defineModuleExtensionPoints({
+        moduleId: 'alpha',
+        hosts: {
+          records: dataTableExtensionHost({ tableId: 'alpha.records.list', source: ['Records.tsx', 'Extra.tsx'] }),
+          editor: crudFormExtensionHost({ entityId: 'alpha.record', source: 'Edit.tsx' }),
+        },
+      })
+    `)
+    write(moduleRoot, 'Records.tsx', 'export const tableId = extensionPoints.hosts.records.tableId')
+    write(moduleRoot, 'Extra.tsx', 'export const extra = true')
+    write(moduleRoot, 'Edit.tsx', 'export const entityId = extensionPoints.hosts.editor.entityId')
+
+    const facts = extractModuleExtensionFacts({
+      moduleId: 'alpha',
+      moduleRoot,
+      sourceRoot: 'node_modules/pkg/src/modules/alpha',
+      entities: [],
+      events: [],
+      apiRoutes: [],
+      searchEntities: [],
+    })
+
+    const header = facts.hosts.find((host) => host.id === 'data-table:alpha.records.list:header')
+    expect(header?.bound).toBe(true)
+    expect(header?.source).toMatchObject({ kind: 'declaration', symbol: 'extensionPoints.hosts.records' })
+    expect(header?.additionalSources).toEqual(['Extra.tsx'])
+
+    const editorFields = facts.hosts.find((host) => host.id === 'crud-form:alpha.record:fields')
+    expect(editorFields?.bound).toBe(true)
+    expect(editorFields?.additionalSources).toBeUndefined()
+  })
+
   it('extracts outgoing mechanisms with kind-specific contracts and correlates targets', () => {
     write(moduleRoot, 'extension-points.ts', `
       import { defineModuleExtensionPoints, dataTableExtensionHost } from 'x'

package/src/lib/generators/module-extension-facts.ts

@@ -439,6 +439,20 @@ function stringValue(value: StaticValue | undefined): string | undefined {
   return typeof value === 'string' ? value : undefined
 }
 
+/**
+ * Normalizes a `source` declaration (single string or array of strings) into
+ * an ordered list. The first entry stays the authoritative provenance path;
+ * any remaining entries are additional mount points.
+ */
+function sourceEntries(value: StaticValue | undefined): string[] {
+  if (typeof value === 'string') return [value]
+  return strings(value)
+}
+
+function primarySource(value: StaticValue | undefined): string | undefined {
+  return sourceEntries(value)[0]
+}
+
 function numberValue(value: StaticValue | undefined): number | undefined {
   if (typeof value === 'number') return value
   if (typeof value === 'string' && /^\d+$/.test(value)) return Number(value)
@@ -560,7 +574,7 @@ function hasDeclarationBinding(
   hostKey: string,
   declaration: StaticObject,
 ): boolean {
-  const relativeSource = stringValue(declaration.source)
+  const relativeSource = primarySource(declaration.source)
   if (!relativeSource) return false
   const bindingFile = sourceFile(path.join(moduleRoot, relativeSource))
   if (!bindingFile) return false
@@ -588,6 +602,7 @@ function baseHost(options: {
   const { declaration } = options
   const aliases = strings(declaration.aliases)
   const fallbacks = strings(declaration.fallbacks)
+  const additionalSources = sourceEntries(declaration.source).slice(1)
   const fact: ModuleExtensionHostFact = {
     key: options.key,
     id: options.id,
@@ -611,6 +626,7 @@ function baseHost(options: {
   if (activation) fact.activation = activation
   if (aliases.length > 0) fact.aliases = aliases
   if (fallbacks.length > 0) fact.fallbacks = fallbacks
+  if (additionalSources.length > 0) fact.additionalSources = additionalSources
   return fact
 }
 
@@ -645,7 +661,7 @@ function extractDeclaredHosts(options: ExtractModuleExtensionFactsOptions): {
       unresolved.push({
         key: `${options.moduleId}.${hostKey}`,
         source: {
-          path: stringValue(host.source) ?? portablePath(options.moduleRoot, options.sourceRoot, filePath),
+          path: primarySource(host.source) ?? portablePath(options.moduleRoot, options.sourceRoot, filePath),
           symbol: `extensionPoints.hosts.${hostKey}`,
         },
         reason: 'unbound-declaration',

package/src/mercato.ts

@@ -1489,7 +1489,7 @@ export async function run(argv = process.argv) {
       const resolver = createResolver()
       const data = await bootstrapFromAppRoot(resolver.getAppDir())
       registerCliModules(data.modules)
-      const allModules = data.modules
+      const allModules = getCliModules()
 
       const modulesToSeed = moduleFilter
         ? allModules.filter((mod) => mod.id === moduleFilter)