@open-mercato/cli 0.7.1-develop.7191.1.3c9346566b → 0.7.1-develop.7194.1.ab4fc81f82

package/dist/lib/generators/route-collisions.js

@@ -0,0 +1,35 @@
+function detectBackendRouteCollisions(registrations) {
+  const byPath = /* @__PURE__ */ new Map();
+  for (const registration of registrations) {
+    const existing = byPath.get(registration.routePath);
+    if (existing) existing.push(registration);
+    else byPath.set(registration.routePath, [registration]);
+  }
+  const errors = [];
+  const notes = [];
+  for (const [routePath, entries] of byPath) {
+    const moduleIds = new Set(entries.map((entry) => entry.moduleId));
+    if (moduleIds.size < 2) continue;
+    const packageModuleIds = Array.from(
+      new Set(entries.filter((entry) => entry.packageSourced).map((entry) => entry.moduleId))
+    ).sort((a, b) => a.localeCompare(b));
+    if (packageModuleIds.length >= 2) {
+      errors.push(
+        `Backend route "${routePath}" is registered by ${packageModuleIds.length} package modules: ${packageModuleIds.map((id) => `"${id}"`).join(", ")}. Duplicate backend paths between package modules are always a bug \u2014 rename one module's page directory.`
+      );
+      continue;
+    }
+    const appModuleIds = Array.from(
+      new Set(entries.filter((entry) => !entry.packageSourced).map((entry) => entry.moduleId))
+    ).sort((a, b) => a.localeCompare(b));
+    const shadowedId = packageModuleIds[0];
+    notes.push(
+      shadowedId ? `Backend route "${routePath}" from package module "${shadowedId}" is shadowed by app module(s) ${appModuleIds.map((id) => `"${id}"`).join(", ")} (intentional override mechanism).` : `Backend route "${routePath}" is registered by multiple app modules: ${appModuleIds.map((id) => `"${id}"`).join(", ")}.`
+    );
+  }
+  return { errors, notes };
+}
+export {
+  detectBackendRouteCollisions
+};
+//# sourceMappingURL=route-collisions.js.map

package/dist/lib/generators/route-collisions.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/lib/generators/route-collisions.ts"],
+  "sourcesContent": ["export type BackendRouteRegistration = {\n  routePath: string\n  moduleId: string\n  packageSourced: boolean\n}\n\nexport type BackendRouteCollisionResult = {\n  errors: string[]\n  notes: string[]\n}\n\nexport function detectBackendRouteCollisions(\n  registrations: BackendRouteRegistration[],\n): BackendRouteCollisionResult {\n  const byPath = new Map<string, BackendRouteRegistration[]>()\n  for (const registration of registrations) {\n    const existing = byPath.get(registration.routePath)\n    if (existing) existing.push(registration)\n    else byPath.set(registration.routePath, [registration])\n  }\n\n  const errors: string[] = []\n  const notes: string[] = []\n  for (const [routePath, entries] of byPath) {\n    const moduleIds = new Set(entries.map((entry) => entry.moduleId))\n    if (moduleIds.size < 2) continue\n\n    const packageModuleIds = Array.from(\n      new Set(entries.filter((entry) => entry.packageSourced).map((entry) => entry.moduleId)),\n    ).sort((a, b) => a.localeCompare(b))\n\n    if (packageModuleIds.length >= 2) {\n      errors.push(\n        `Backend route \"${routePath}\" is registered by ${packageModuleIds.length} package modules: ${packageModuleIds\n          .map((id) => `\"${id}\"`)\n          .join(', ')}. Duplicate backend paths between package modules are always a bug \u2014 rename one module's page directory.`,\n      )\n      continue\n    }\n\n    const appModuleIds = Array.from(\n      new Set(entries.filter((entry) => !entry.packageSourced).map((entry) => entry.moduleId)),\n    ).sort((a, b) => a.localeCompare(b))\n    const shadowedId = packageModuleIds[0]\n    notes.push(\n      shadowedId\n        ? `Backend route \"${routePath}\" from package module \"${shadowedId}\" is shadowed by app module(s) ${appModuleIds\n            .map((id) => `\"${id}\"`)\n            .join(', ')} (intentional override mechanism).`\n        : `Backend route \"${routePath}\" is registered by multiple app modules: ${appModuleIds\n            .map((id) => `\"${id}\"`)\n            .join(', ')}.`,\n    )\n  }\n\n  return { errors, notes }\n}\n"],
+  "mappings": "AAWO,SAAS,6BACd,eAC6B;AAC7B,QAAM,SAAS,oBAAI,IAAwC;AAC3D,aAAW,gBAAgB,eAAe;AACxC,UAAM,WAAW,OAAO,IAAI,aAAa,SAAS;AAClD,QAAI,SAAU,UAAS,KAAK,YAAY;AAAA,QACnC,QAAO,IAAI,aAAa,WAAW,CAAC,YAAY,CAAC;AAAA,EACxD;AAEA,QAAM,SAAmB,CAAC;AAC1B,QAAM,QAAkB,CAAC;AACzB,aAAW,CAAC,WAAW,OAAO,KAAK,QAAQ;AACzC,UAAM,YAAY,IAAI,IAAI,QAAQ,IAAI,CAAC,UAAU,MAAM,QAAQ,CAAC;AAChE,QAAI,UAAU,OAAO,EAAG;AAExB,UAAM,mBAAmB,MAAM;AAAA,MAC7B,IAAI,IAAI,QAAQ,OAAO,CAAC,UAAU,MAAM,cAAc,EAAE,IAAI,CAAC,UAAU,MAAM,QAAQ,CAAC;AAAA,IACxF,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,cAAc,CAAC,CAAC;AAEnC,QAAI,iBAAiB,UAAU,GAAG;AAChC,aAAO;AAAA,QACL,kBAAkB,SAAS,sBAAsB,iBAAiB,MAAM,qBAAqB,iBAC1F,IAAI,CAAC,OAAO,IAAI,EAAE,GAAG,EACrB,KAAK,IAAI,CAAC;AAAA,MACf;AACA;AAAA,IACF;AAEA,UAAM,eAAe,MAAM;AAAA,MACzB,IAAI,IAAI,QAAQ,OAAO,CAAC,UAAU,CAAC,MAAM,cAAc,EAAE,IAAI,CAAC,UAAU,MAAM,QAAQ,CAAC;AAAA,IACzF,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,cAAc,CAAC,CAAC;AACnC,UAAM,aAAa,iBAAiB,CAAC;AACrC,UAAM;AAAA,MACJ,aACI,kBAAkB,SAAS,0BAA0B,UAAU,kCAAkC,aAC9F,IAAI,CAAC,OAAO,IAAI,EAAE,GAAG,EACrB,KAAK,IAAI,CAAC,uCACb,kBAAkB,SAAS,4CAA4C,aACpE,IAAI,CAAC,OAAO,IAAI,EAAE,GAAG,EACrB,KAAK,IAAI,CAAC;AAAA,IACnB;AAAA,EACF;AAEA,SAAO,EAAE,QAAQ,MAAM;AACzB;",
+  "names": []
+}

package/dist/lib/generators/web-research-adapters.js

@@ -0,0 +1,95 @@
+import fs from "node:fs";
+import path from "node:path";
+import { calculateStructureChecksum, createGeneratorResult, writeGeneratedFile } from "../utils.js";
+const MANIFEST_NAMESPACE = "openMercato";
+const ADAPTER_MANIFEST_KEY = "webResearchAdapter";
+function readJson(file) {
+  try {
+    return JSON.parse(fs.readFileSync(file, "utf8"));
+  } catch {
+    return null;
+  }
+}
+function readManifest(packageJsonPath) {
+  const parsed = readJson(packageJsonPath);
+  if (typeof parsed !== "object" || parsed === null) return null;
+  const pkg = parsed;
+  const namespace = pkg[MANIFEST_NAMESPACE];
+  if (typeof namespace !== "object" || namespace === null) return null;
+  const manifest = namespace[ADAPTER_MANIFEST_KEY];
+  if (typeof manifest !== "object" || manifest === null) return null;
+  const adapterId = manifest.id;
+  const packageName = pkg.name;
+  if (typeof packageName !== "string" || packageName.length === 0) return null;
+  if (typeof adapterId !== "string" || adapterId.length === 0) return null;
+  return { packageName, adapterId, sourceRoot: path.dirname(packageJsonPath) };
+}
+function scanDirectory(root, results) {
+  if (!fs.existsSync(root)) return;
+  let entries;
+  try {
+    entries = fs.readdirSync(root, { withFileTypes: true });
+  } catch {
+    return;
+  }
+  for (const entry of entries) {
+    if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
+    if (entry.name === ".bin" || entry.name === ".cache") continue;
+    const child = path.join(root, entry.name);
+    if (entry.name.startsWith("@")) {
+      scanDirectory(child, results);
+      continue;
+    }
+    const discovered = readManifest(path.join(child, "package.json"));
+    if (discovered && !results.has(discovered.packageName)) results.set(discovered.packageName, discovered);
+  }
+}
+function identifierFor(index) {
+  return `adapter${index}`;
+}
+async function generateWebResearchAdapters(options) {
+  const { resolver, quiet } = options;
+  const result = createGeneratorResult();
+  const outputDir = resolver.getOutputDir();
+  const outFile = path.join(outputDir, "web-research-adapters.generated.ts");
+  const checksumFile = path.join(outputDir, "web-research-adapters.checksum");
+  const appDir = resolver.getAppDir();
+  const repoRoot = path.resolve(appDir, "..", "..");
+  const discovered = /* @__PURE__ */ new Map();
+  const scanRoots = [
+    path.join(repoRoot, "packages"),
+    path.join(repoRoot, "node_modules"),
+    path.join(appDir, "node_modules")
+  ];
+  for (const root of scanRoots) scanDirectory(root, discovered);
+  const adapters = [...discovered.values()].sort(
+    (left, right) => left.packageName.localeCompare(right.packageName)
+  );
+  const imports = adapters.map((adapter, index) => `import * as ${identifierFor(index)} from '${adapter.packageName}'`).join("\n");
+  const entries = adapters.map(
+    (adapter, index) => `  { packageName: '${adapter.packageName}', module: ${identifierFor(index)} },`
+  ).join("\n");
+  const content = `// AUTO-GENERATED \u2014 do not edit by hand.
+// Source: packages declaring \`${MANIFEST_NAMESPACE}.${ADAPTER_MANIFEST_KEY}\` in package.json.
+// Regenerate with: yarn generate
+import type { AdapterRegistryEntry } from '@open-mercato/web-research'
+${imports}
+
+export const webResearchAdapterEntries: AdapterRegistryEntry[] = [
+${entries}
+]
+`;
+  writeGeneratedFile({
+    outFile,
+    checksumFile,
+    content,
+    structureChecksum: calculateStructureChecksum(adapters.map((adapter) => adapter.sourceRoot)),
+    result,
+    quiet
+  });
+  return result;
+}
+export {
+  generateWebResearchAdapters
+};
+//# sourceMappingURL=web-research-adapters.js.map

package/dist/lib/generators/web-research-adapters.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/lib/generators/web-research-adapters.ts"],
+  "sourcesContent": ["import fs from 'node:fs'\nimport path from 'node:path'\nimport type { PackageResolver } from '../resolver'\nimport { calculateStructureChecksum, createGeneratorResult, type GeneratorResult, writeGeneratedFile } from '../utils'\n\nexport interface WebResearchAdaptersOptions {\n  resolver: PackageResolver\n  quiet?: boolean\n}\n\n/**\n * Mirrors `openMercato.webResearchAdapter` in `@open-mercato/web-research`. It is\n * duplicated rather than imported because the CLI must not depend on the engine\n * package to run its generators.\n */\nconst MANIFEST_NAMESPACE = 'openMercato'\nconst ADAPTER_MANIFEST_KEY = 'webResearchAdapter'\n\ntype DiscoveredAdapter = {\n  packageName: string\n  adapterId: string\n  sourceRoot: string\n}\n\nfunction readJson(file: string): unknown {\n  try {\n    return JSON.parse(fs.readFileSync(file, 'utf8'))\n  } catch {\n    return null\n  }\n}\n\nfunction readManifest(packageJsonPath: string): DiscoveredAdapter | null {\n  const parsed = readJson(packageJsonPath)\n  if (typeof parsed !== 'object' || parsed === null) return null\n  const pkg = parsed as Record<string, unknown>\n  const namespace = pkg[MANIFEST_NAMESPACE]\n  if (typeof namespace !== 'object' || namespace === null) return null\n  const manifest = (namespace as Record<string, unknown>)[ADAPTER_MANIFEST_KEY]\n  if (typeof manifest !== 'object' || manifest === null) return null\n  const adapterId = (manifest as Record<string, unknown>).id\n  const packageName = pkg.name\n  if (typeof packageName !== 'string' || packageName.length === 0) return null\n  if (typeof adapterId !== 'string' || adapterId.length === 0) return null\n  return { packageName, adapterId, sourceRoot: path.dirname(packageJsonPath) }\n}\n\nfunction scanDirectory(root: string, results: Map<string, DiscoveredAdapter>): void {\n  if (!fs.existsSync(root)) return\n  let entries: fs.Dirent[]\n  try {\n    entries = fs.readdirSync(root, { withFileTypes: true })\n  } catch {\n    return\n  }\n  for (const entry of entries) {\n    if (!entry.isDirectory() && !entry.isSymbolicLink()) continue\n    if (entry.name === '.bin' || entry.name === '.cache') continue\n    const child = path.join(root, entry.name)\n    // Scoped packages nest one level deeper (`@scope/name`).\n    if (entry.name.startsWith('@')) {\n      scanDirectory(child, results)\n      continue\n    }\n    const discovered = readManifest(path.join(child, 'package.json'))\n    if (discovered && !results.has(discovered.packageName)) results.set(discovered.packageName, discovered)\n  }\n}\n\nfunction identifierFor(index: number): string {\n  return `adapter${index}`\n}\n\n/**\n * Emits the statically imported adapter registry. Discovery happens here, at\n * build time, because a bundler cannot follow `import()` with a runtime-computed\n * specifier \u2014 a dynamic registry would resolve to nothing under Turbopack.\n */\nexport async function generateWebResearchAdapters(\n  options: WebResearchAdaptersOptions,\n): Promise<GeneratorResult> {\n  const { resolver, quiet } = options\n  const result = createGeneratorResult()\n  const outputDir = resolver.getOutputDir()\n  const outFile = path.join(outputDir, 'web-research-adapters.generated.ts')\n  const checksumFile = path.join(outputDir, 'web-research-adapters.checksum')\n\n  const appDir = resolver.getAppDir()\n  const repoRoot = path.resolve(appDir, '..', '..')\n  const discovered = new Map<string, DiscoveredAdapter>()\n  const scanRoots = [\n    path.join(repoRoot, 'packages'),\n    path.join(repoRoot, 'node_modules'),\n    path.join(appDir, 'node_modules'),\n  ]\n  for (const root of scanRoots) scanDirectory(root, discovered)\n\n  const adapters = [...discovered.values()].sort((left, right) =>\n    left.packageName.localeCompare(right.packageName),\n  )\n\n  const imports = adapters\n    .map((adapter, index) => `import * as ${identifierFor(index)} from '${adapter.packageName}'`)\n    .join('\\n')\n  const entries = adapters\n    .map(\n      (adapter, index) =>\n        `  { packageName: '${adapter.packageName}', module: ${identifierFor(index)} },`,\n    )\n    .join('\\n')\n\n  const content = `// AUTO-GENERATED \u2014 do not edit by hand.\n// Source: packages declaring \\`${MANIFEST_NAMESPACE}.${ADAPTER_MANIFEST_KEY}\\` in package.json.\n// Regenerate with: yarn generate\nimport type { AdapterRegistryEntry } from '@open-mercato/web-research'\n${imports}\n\nexport const webResearchAdapterEntries: AdapterRegistryEntry[] = [\n${entries}\n]\n`\n\n  writeGeneratedFile({\n    outFile,\n    checksumFile,\n    content,\n    structureChecksum: calculateStructureChecksum(adapters.map((adapter) => adapter.sourceRoot)),\n    result,\n    quiet,\n  })\n\n  return result\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/mercato.js

@@ -573,7 +573,8 @@ async function runGeneratorSuite(quiet) {
     generateModuleEntities,
     generateModuleDi,
     generateModulePackageSources,
-    generateOpenApi
+    generateOpenApi,
+    generateWebResearchAdapters
   } = await import("./lib/generators/index.js");
   const resolver = createResolver();
   const results = [
@@ -582,6 +583,7 @@ async function runGeneratorSuite(quiet) {
     await generateModuleEntities({ resolver, quiet }),
     await generateModuleDi({ resolver, quiet }),
     await generateModulePackageSources({ resolver, quiet }),
+    await generateWebResearchAdapters({ resolver, quiet }),
     await generateOpenApi({ resolver, quiet })
   ];
   return results.some((result) => (result?.filesWritten.length ?? 0) > 0);
@@ -841,13 +843,14 @@ async function run(argv = process.argv) {
       }
       console.log("\u{1F527} Preparing modules (registry, entities, DI)...");
       const { createResolver } = await import("./lib/resolver.js");
-      const { generateEntityIds, generateModuleRegistries, generateModuleEntities, generateModuleDi, generateModulePackageSources, generateOpenApi } = await import("./lib/generators/index.js");
+      const { generateEntityIds, generateModuleRegistries, generateModuleEntities, generateModuleDi, generateModulePackageSources, generateOpenApi, generateWebResearchAdapters } = await import("./lib/generators/index.js");
       const resolver = createResolver();
       await generateEntityIds({ resolver, quiet: true });
       await generateModuleRegistries({ resolver, quiet: true });
       await generateModuleEntities({ resolver, quiet: true });
       await generateModuleDi({ resolver, quiet: true });
       await generateModulePackageSources({ resolver, quiet: true });
+      await generateWebResearchAdapters({ resolver, quiet: true });
       await generateOpenApi({ resolver, quiet: true });
       console.log("\u2705 Modules prepared\n");
       console.log("\u{1F4CA} Applying database migrations...");