@open-mercato/cli 0.6.8-develop.6931.1.4a1e1c786b → 0.6.8-develop.6940.1.177ea30c6e

package/dist/lib/generators/module-facts-discovery.js

@@ -73,7 +73,30 @@ function discoverPackageModuleSources(resolver) {
   }
   return resolveDuplicateModuleIds(sources, resolver);
 }
+const LOCAL_MODULES_DIRECTORY = path.posix.join("src", "modules");
+function discoverLocalReferenceModuleSource(options) {
+  const moduleRoot = path.join(options.appRoot, "src", "modules", options.moduleId);
+  if (!hasReadableModuleSource(moduleRoot)) return null;
+  return {
+    moduleId: options.moduleId,
+    moduleRoot,
+    portableSourceRoot: path.posix.join(LOCAL_MODULES_DIRECTORY, options.moduleId),
+    sourceKind: "local-reference"
+  };
+}
+function appendLocalReferenceModuleSource(packageSources, reference) {
+  const conflict = packageSources.find((source) => source.moduleId === reference.moduleId);
+  if (conflict) {
+    throw new Error(
+      `[module-facts] local reference module "${reference.moduleId}" collides with the module provided by ${conflict.from ?? "<unknown package>"}. Rename the app-local module or remove the package providing it.`
+    );
+  }
+  return [...packageSources, reference];
+}
 export {
+  LOCAL_MODULES_DIRECTORY,
+  appendLocalReferenceModuleSource,
+  discoverLocalReferenceModuleSource,
   discoverPackageModuleSources,
   hasReadableModuleSource
 };

package/dist/lib/generators/module-facts-discovery.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/generators/module-facts-discovery.ts"],
-  "sourcesContent": ["import fs from 'node:fs'\nimport path from 'node:path'\nimport type { PackageResolver } from '../resolver'\nimport { discoverModulesInPackage } from '../module-package'\nimport type { ModuleFactSource } from './module-facts'\n\nconst READABLE_CONVENTION_FILES = [\n  'index',\n  'acl',\n  'events',\n  'di',\n  path.join('data', 'entities'),\n  path.join('db', 'entities'),\n]\n\n/**\n * True when the module directory exposes at least one recognised convention file as\n * TypeScript source. This is the auto-discovery boundary that skips `.js`-only\n * installs (standalone `node_modules/@open-mercato/<pkg>/dist/modules`) \u2014 the extractor's\n * ts-morph reader only parses `.ts`/`.tsx`, so a `.js`-only root would yield empty facts.\n */\nexport function hasReadableModuleSource(moduleRoot: string): boolean {\n  if (!fs.existsSync(moduleRoot)) return false\n  for (const basename of READABLE_CONVENTION_FILES) {\n    for (const extension of ['.ts', '.tsx']) {\n      if (fs.existsSync(path.join(moduleRoot, `${basename}${extension}`))) return true\n    }\n  }\n  return false\n}\n\nfunction resolveDuplicateModuleIds(\n  sources: ModuleFactSource[],\n  resolver: PackageResolver,\n): ModuleFactSource[] {\n  const sourcesByModule = new Map<string, ModuleFactSource[]>()\n  for (const source of sources) {\n    const matches = sourcesByModule.get(source.moduleId) ?? []\n    matches.push(source)\n    sourcesByModule.set(source.moduleId, matches)\n  }\n\n  const duplicates = [...sourcesByModule.entries()].filter(([, matches]) => matches.length > 1)\n  if (duplicates.length === 0) return sources\n\n  const selectedProviders = new Map<string, Set<string>>()\n  const implicitCoreSelections = new Set<string>()\n  for (const entry of resolver.loadEnabledModules()) {\n    const providers = selectedProviders.get(entry.id) ?? new Set<string>()\n    providers.add(entry.from ?? '@open-mercato/core')\n    selectedProviders.set(entry.id, providers)\n    if (entry.from === undefined) implicitCoreSelections.add(entry.id)\n  }\n\n  const selectedSources = new Map<string, ModuleFactSource>()\n  for (const [moduleId, matches] of duplicates) {\n    const providers = [...new Set(matches.map((source) => source.from ?? '<unknown>'))]\n      .sort((left, right) => left.localeCompare(right))\n    const configuredProviders = [...(selectedProviders.get(moduleId) ?? [])]\n      .sort((left, right) => left.localeCompare(right))\n    const selected = configuredProviders.length === 1\n      ? matches.filter((source) => source.from === configuredProviders[0])\n      : []\n\n    if (selected.length !== 1) {\n      const configured = configuredProviders.length > 0\n        ? implicitCoreSelections.has(moduleId)\n          ? '; src/modules.ts omits \"from\", which defaults to @open-mercato/core'\n          : `; src/modules.ts selects ${configuredProviders.join(', ')}`\n        : '; src/modules.ts does not select a provider'\n      throw new Error(\n        `[module-facts] duplicate module id \"${moduleId}\" is provided by ${providers.join(', ')}${configured}. `\n        + 'Select exactly one matching provider in src/modules.ts.',\n      )\n    }\n    selectedSources.set(moduleId, selected[0])\n  }\n\n  const emitted = new Set<string>()\n  const result: ModuleFactSource[] = []\n  for (const source of sources) {\n    if (emitted.has(source.moduleId)) continue\n    emitted.add(source.moduleId)\n    result.push(selectedSources.get(source.moduleId) ?? source)\n  }\n  return result\n}\n\n/**\n * Package-scan discovery for the create-app build: every package-provided module\n * across `@open-mercato/*` workspace packages (core plus others), never `apps/*`\n * demo modules. Routes through the resolver rather than hardcoded paths.\n */\nexport function discoverPackageModuleSources(resolver: PackageResolver): ModuleFactSource[] {\n  const sources: ModuleFactSource[] = []\n  for (const pkg of resolver.discoverPackages()) {\n    for (const discovered of discoverModulesInPackage(pkg.path)) {\n      const moduleRoot = path.join(pkg.modulesPath, discovered.moduleId)\n      if (!hasReadableModuleSource(moduleRoot)) continue\n      sources.push({\n        moduleId: discovered.moduleId,\n        moduleRoot,\n        from: pkg.name,\n        packageVersion: pkg.version ?? null,\n      })\n    }\n  }\n  return resolveDuplicateModuleIds(sources, resolver)\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import fs from 'node:fs'\nimport path from 'node:path'\nimport type { PackageResolver } from '../resolver'\nimport { discoverModulesInPackage } from '../module-package'\nimport type { ModuleFactSource } from './module-facts'\n\nconst READABLE_CONVENTION_FILES = [\n  'index',\n  'acl',\n  'events',\n  'di',\n  path.join('data', 'entities'),\n  path.join('db', 'entities'),\n]\n\n/**\n * True when the module directory exposes at least one recognised convention file as\n * TypeScript source. This is the auto-discovery boundary that skips `.js`-only\n * installs (standalone `node_modules/@open-mercato/<pkg>/dist/modules`) \u2014 the extractor's\n * ts-morph reader only parses `.ts`/`.tsx`, so a `.js`-only root would yield empty facts.\n */\nexport function hasReadableModuleSource(moduleRoot: string): boolean {\n  if (!fs.existsSync(moduleRoot)) return false\n  for (const basename of READABLE_CONVENTION_FILES) {\n    for (const extension of ['.ts', '.tsx']) {\n      if (fs.existsSync(path.join(moduleRoot, `${basename}${extension}`))) return true\n    }\n  }\n  return false\n}\n\nfunction resolveDuplicateModuleIds(\n  sources: ModuleFactSource[],\n  resolver: PackageResolver,\n): ModuleFactSource[] {\n  const sourcesByModule = new Map<string, ModuleFactSource[]>()\n  for (const source of sources) {\n    const matches = sourcesByModule.get(source.moduleId) ?? []\n    matches.push(source)\n    sourcesByModule.set(source.moduleId, matches)\n  }\n\n  const duplicates = [...sourcesByModule.entries()].filter(([, matches]) => matches.length > 1)\n  if (duplicates.length === 0) return sources\n\n  const selectedProviders = new Map<string, Set<string>>()\n  const implicitCoreSelections = new Set<string>()\n  for (const entry of resolver.loadEnabledModules()) {\n    const providers = selectedProviders.get(entry.id) ?? new Set<string>()\n    providers.add(entry.from ?? '@open-mercato/core')\n    selectedProviders.set(entry.id, providers)\n    if (entry.from === undefined) implicitCoreSelections.add(entry.id)\n  }\n\n  const selectedSources = new Map<string, ModuleFactSource>()\n  for (const [moduleId, matches] of duplicates) {\n    const providers = [...new Set(matches.map((source) => source.from ?? '<unknown>'))]\n      .sort((left, right) => left.localeCompare(right))\n    const configuredProviders = [...(selectedProviders.get(moduleId) ?? [])]\n      .sort((left, right) => left.localeCompare(right))\n    const selected = configuredProviders.length === 1\n      ? matches.filter((source) => source.from === configuredProviders[0])\n      : []\n\n    if (selected.length !== 1) {\n      const configured = configuredProviders.length > 0\n        ? implicitCoreSelections.has(moduleId)\n          ? '; src/modules.ts omits \"from\", which defaults to @open-mercato/core'\n          : `; src/modules.ts selects ${configuredProviders.join(', ')}`\n        : '; src/modules.ts does not select a provider'\n      throw new Error(\n        `[module-facts] duplicate module id \"${moduleId}\" is provided by ${providers.join(', ')}${configured}. `\n        + 'Select exactly one matching provider in src/modules.ts.',\n      )\n    }\n    selectedSources.set(moduleId, selected[0])\n  }\n\n  const emitted = new Set<string>()\n  const result: ModuleFactSource[] = []\n  for (const source of sources) {\n    if (emitted.has(source.moduleId)) continue\n    emitted.add(source.moduleId)\n    result.push(selectedSources.get(source.moduleId) ?? source)\n  }\n  return result\n}\n\n/**\n * Package-scan discovery for the create-app build: every package-provided module\n * across `@open-mercato/*` workspace packages (core plus others), never `apps/*`\n * demo modules. Routes through the resolver rather than hardcoded paths.\n */\nexport function discoverPackageModuleSources(resolver: PackageResolver): ModuleFactSource[] {\n  const sources: ModuleFactSource[] = []\n  for (const pkg of resolver.discoverPackages()) {\n    for (const discovered of discoverModulesInPackage(pkg.path)) {\n      const moduleRoot = path.join(pkg.modulesPath, discovered.moduleId)\n      if (!hasReadableModuleSource(moduleRoot)) continue\n      sources.push({\n        moduleId: discovered.moduleId,\n        moduleRoot,\n        from: pkg.name,\n        packageVersion: pkg.version ?? null,\n      })\n    }\n  }\n  return resolveDuplicateModuleIds(sources, resolver)\n}\n\n/** App-local modules always live under this app-root-relative directory. */\nexport const LOCAL_MODULES_DIRECTORY = path.posix.join('src', 'modules')\n\n/**\n * Locates an app-local module that is projected into the reference bundle rather than the\n * normal package outputs. `appRoot` is the directory containing `src/modules` \u2014 the\n * create-app template root at build time, the generated app root at scaffold and\n * `agentic:init` time \u2014 so the same module yields the same portable `src/modules/<id>`\n * provenance from every root. Returns `null` when the module is absent or is not readable\n * TypeScript source, because a reference bundle built from an unreadable root would claim\n * an empty surface rather than fail.\n */\nexport function discoverLocalReferenceModuleSource(options: {\n  appRoot: string\n  moduleId: string\n}): ModuleFactSource | null {\n  const moduleRoot = path.join(options.appRoot, 'src', 'modules', options.moduleId)\n  if (!hasReadableModuleSource(moduleRoot)) return null\n  return {\n    moduleId: options.moduleId,\n    moduleRoot,\n    portableSourceRoot: path.posix.join(LOCAL_MODULES_DIRECTORY, options.moduleId),\n    sourceKind: 'local-reference',\n  }\n}\n\n/**\n * Appends the local reference source to the package batch, rejecting a duplicate module\n * id *before* assignment. A package that already provides the same id would otherwise be\n * silently replaced by (or silently replace) the app-local projection, and the emitted\n * bundle would attribute one module's surfaces to the other's source tree.\n */\nexport function appendLocalReferenceModuleSource(\n  packageSources: readonly ModuleFactSource[],\n  reference: ModuleFactSource,\n): ModuleFactSource[] {\n  const conflict = packageSources.find((source) => source.moduleId === reference.moduleId)\n  if (conflict) {\n    throw new Error(\n      `[module-facts] local reference module \"${reference.moduleId}\" collides with the module provided by `\n      + `${conflict.from ?? '<unknown package>'}. Rename the app-local module or remove the package providing it.`,\n    )\n  }\n  return [...packageSources, reference]\n}\n"],
+  "mappings": "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",
   "names": []
 }