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

package/dist/lib/module-install.js

@@ -68,15 +68,11 @@ async function runModuleGenerators(resolver, quiet = true) {
     generateModuleDi,
     generateModuleEntities,
     generateModulePackageSources,
-    generateModuleRegistry,
-    generateModuleRegistryApp,
-    generateModuleRegistryCli,
+    generateModuleRegistries,
     generateOpenApi
   } = await import("./generators/index.js");
   await generateEntityIds({ resolver, quiet });
-  await generateModuleRegistry({ resolver, quiet });
-  await generateModuleRegistryApp({ resolver, quiet });
-  await generateModuleRegistryCli({ resolver, quiet });
+  await generateModuleRegistries({ resolver, quiet });
   await generateModuleEntities({ resolver, quiet });
   await generateModuleDi({ resolver, quiet });
   await generateModulePackageSources({ resolver, quiet });

package/dist/lib/module-install.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/module-install.ts"],
-  "sourcesContent": ["import fs from 'node:fs'\nimport path from 'node:path'\nimport spawn from 'cross-spawn'\nimport { copyDirRecursive, rewriteCrossModuleImports } from './eject'\nimport {\n  parsePackageNameFromSpec,\n  resolveInstalledOfficialModulePackage,\n  validateEjectBoundaries,\n  type ValidatedOfficialModulePackage,\n} from './module-package'\nimport { ensureModuleRegistration } from './modules-config'\nimport type { PackageResolver } from './resolver'\nimport { resolveSpawnCommand } from './spawn'\n\ntype ModuleCommandResult = {\n  moduleId: string\n  packageName: string\n  from: string\n  registrationChanged: boolean\n}\n\ntype InstallTarget = {\n  cwd: string\n  args: string[]\n}\n\nconst OFFICIAL_PACKAGE_SCOPE = '@open-mercato/'\nconst SAFE_PACKAGE_SPEC_PATTERN = /^(?:@[a-z0-9][a-z0-9._-]*\\/)?[a-z0-9][a-z0-9._-]*(?:@.+)?$/i\nconst SAFE_PACKAGE_TAG_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]*$/\nconst SAFE_PACKAGE_FILE_LOCATOR_PATTERN = /^file:[A-Za-z0-9_./: \\\\-]+$/\n\nfunction resolveYarnBinary(): string {\n  return process.platform === 'win32' ? 'yarn.cmd' : 'yarn'\n}\n\nfunction readAppPackageName(appDir: string): string {\n  const packageJsonPath = path.join(appDir, 'package.json')\n  if (!fs.existsSync(packageJsonPath)) {\n    throw new Error(`App package.json not found at ${packageJsonPath}.`)\n  }\n\n  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')) as { name?: string }\n  if (!packageJson.name) {\n    throw new Error(`App package.json at ${packageJsonPath} is missing the \"name\" field.`)\n  }\n\n  return packageJson.name\n}\n\nfunction resolveInstallTarget(resolver: PackageResolver): InstallTarget {\n  if (!resolver.isMonorepo()) {\n    return {\n      cwd: resolver.getAppDir(),\n      args: ['add'],\n    }\n  }\n\n  return {\n    cwd: resolver.getRootDir(),\n    args: ['workspace', readAppPackageName(resolver.getAppDir()), 'add'],\n  }\n}\n\nfunction runCommand(\n  command: string,\n  args: string[],\n  cwd: string,\n): Promise<void> {\n  return new Promise((resolve, reject) => {\n    const resolvedSpawn = resolveSpawnCommand(command, args)\n    const child = spawn(resolvedSpawn.command, resolvedSpawn.args, {\n      cwd,\n      env: process.env,\n      stdio: 'inherit',\n      ...resolvedSpawn.spawnOptions,\n    })\n\n    child.on('error', reject)\n    child.on('exit', (code) => {\n      if (code === 0) {\n        resolve()\n        return\n      }\n\n      reject(new Error(`Command failed: ${command} ${args.join(' ')} (exit ${code ?? 'unknown'}).`))\n    })\n  })\n}\n\nasync function installPackageSpec(\n  resolver: PackageResolver,\n  packageSpec: string,\n): Promise<void> {\n  const target = resolveInstallTarget(resolver)\n  await runCommand(resolveYarnBinary(), [...target.args, packageSpec], target.cwd)\n}\n\nexport async function runModuleGenerators(\n  resolver: PackageResolver,\n  quiet = true,\n): Promise<void> {\n  const {\n    generateEntityIds,\n    generateModuleDi,\n    generateModuleEntities,\n    generateModulePackageSources,\n    generateModuleRegistry,\n    generateModuleRegistryApp,\n    generateModuleRegistryCli,\n    generateOpenApi,\n  } = await import('./generators')\n\n  await generateEntityIds({ resolver, quiet })\n  await generateModuleRegistry({ resolver, quiet })\n  await generateModuleRegistryApp({ resolver, quiet })\n  await generateModuleRegistryCli({ resolver, quiet })\n  await generateModuleEntities({ resolver, quiet })\n  await generateModuleDi({ resolver, quiet })\n  await generateModulePackageSources({ resolver, quiet })\n  await generateOpenApi({ resolver, quiet })\n}\n\nasync function runGeneratorsWithRegistrationNotice(\n  resolver: PackageResolver,\n  moduleId: string,\n): Promise<void> {\n  try {\n    await runModuleGenerators(resolver)\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error)\n    throw new Error(\n      `Module \"${moduleId}\" is enabled, but generated artifacts are stale because generation failed. Rerun \"yarn mercato generate\" after fixing the underlying error. ${message}`,\n    )\n  }\n}\n\nfunction isOfficialPackage(packageName: string): boolean {\n  return packageName.startsWith(OFFICIAL_PACKAGE_SCOPE)\n}\n\nfunction assertPackageName(packageName: string | null): asserts packageName is string {\n  if (!packageName) {\n    throw new Error('Could not determine a package name from the provided spec.')\n  }\n}\n\nfunction assertThirdPartyAllowed(packageName: string, allowThirdParty: boolean): void {\n  if (isOfficialPackage(packageName) || allowThirdParty) {\n    return\n  }\n\n  throw new Error(\n    `Package \"${packageName}\" is outside the ${OFFICIAL_PACKAGE_SCOPE}* scope. Re-run with --allow-third-party to install third-party module packages.`,\n  )\n}\n\nfunction assertSupportedPackageSpec(packageSpec: string, allowThirdParty: boolean): string {\n  const trimmed = packageSpec.trim()\n\n  if (!SAFE_PACKAGE_SPEC_PATTERN.test(trimmed)) {\n    throw new Error('Unsupported package spec. Provide a valid npm package name with an optional tag/version or file: locator.')\n  }\n\n  const packageName = parsePackageNameFromSpec(trimmed)\n  assertPackageName(packageName)\n  assertThirdPartyAllowed(packageName, allowThirdParty)\n\n  if (trimmed === packageName) {\n    return trimmed\n  }\n\n  const suffix = trimmed.slice(packageName.length + 1)\n  if (SAFE_PACKAGE_TAG_PATTERN.test(suffix) || SAFE_PACKAGE_FILE_LOCATOR_PATTERN.test(suffix)) {\n    return trimmed\n  }\n\n  throw new Error('Unsupported package spec suffix. Use a tag/version token or a file: locator.')\n}\n\nfunction validateBeforeRegistration(\n  modulePackage: ValidatedOfficialModulePackage,\n  resolver: PackageResolver,\n  eject: boolean,\n): string {\n  const appModuleDir = path.join(resolver.getAppDir(), 'src', 'modules', modulePackage.metadata.moduleId)\n\n  if (eject && fs.existsSync(appModuleDir)) {\n    throw new Error(`Destination directory already exists: ${appModuleDir}. Remove it first or rerun without --eject.`)\n  }\n\n  return appModuleDir\n}\n\nfunction prepareRegistrationSource(\n  modulePackage: ValidatedOfficialModulePackage,\n  resolver: PackageResolver,\n  packageName: string,\n  eject: boolean,\n): string {\n  const appModuleDir = validateBeforeRegistration(modulePackage, resolver, eject)\n\n  if (!eject) {\n    return packageName\n  }\n\n  if (!modulePackage.metadata.ejectable) {\n    throw new Error(`Package \"${packageName}\" is not ejectable. --eject requires open-mercato.ejectable === true.`)\n  }\n\n  validateEjectBoundaries(modulePackage)\n  copyDirRecursive(modulePackage.sourceModuleDir, appModuleDir)\n  rewriteCrossModuleImports(\n    modulePackage.sourceModuleDir,\n    appModuleDir,\n    modulePackage.metadata.moduleId,\n    packageName,\n  )\n\n  return '@app'\n}\n\nasync function registerResolvedOfficialModule(\n  resolver: PackageResolver,\n  modulePackage: ValidatedOfficialModulePackage,\n  packageName: string,\n  eject: boolean,\n): Promise<ModuleCommandResult> {\n  const from = prepareRegistrationSource(modulePackage, resolver, packageName, eject)\n\n  const registration = ensureModuleRegistration(\n    resolver.getModulesConfigPath(),\n    {\n      id: modulePackage.metadata.moduleId,\n      from,\n    },\n  )\n\n  if (!registration.changed) {\n    throw new Error(\n      `Module \"${modulePackage.metadata.moduleId}\" from \"${from}\" is already enabled in modules.ts.`,\n    )\n  }\n\n  await runGeneratorsWithRegistrationNotice(resolver, modulePackage.metadata.moduleId)\n\n  return {\n    moduleId: modulePackage.metadata.moduleId,\n    packageName,\n    from,\n    registrationChanged: registration.changed,\n  }\n}\n\nexport async function addOfficialModule(\n  resolver: PackageResolver,\n  packageSpec: string,\n  eject: boolean,\n  moduleId?: string,\n  allowThirdParty = false,\n): Promise<ModuleCommandResult> {\n  const safePackageSpec = assertSupportedPackageSpec(packageSpec, allowThirdParty)\n  const packageName = parsePackageNameFromSpec(safePackageSpec)\n  assertPackageName(packageName)\n\n  await installPackageSpec(resolver, safePackageSpec)\n\n  const modulePackage = resolveInstalledOfficialModulePackage(resolver, packageName, moduleId)\n  return registerResolvedOfficialModule(resolver, modulePackage, packageName, eject)\n}\n\nexport async function enableOfficialModule(\n  resolver: PackageResolver,\n  packageName: string,\n  moduleId?: string,\n  eject = false,\n  allowThirdParty = false,\n): Promise<ModuleCommandResult> {\n  assertThirdPartyAllowed(packageName, allowThirdParty)\n\n  const modulePackage = resolveInstalledOfficialModulePackage(resolver, packageName, moduleId)\n  return registerResolvedOfficialModule(resolver, modulePackage, packageName, eject)\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import fs from 'node:fs'\nimport path from 'node:path'\nimport spawn from 'cross-spawn'\nimport { copyDirRecursive, rewriteCrossModuleImports } from './eject'\nimport {\n  parsePackageNameFromSpec,\n  resolveInstalledOfficialModulePackage,\n  validateEjectBoundaries,\n  type ValidatedOfficialModulePackage,\n} from './module-package'\nimport { ensureModuleRegistration } from './modules-config'\nimport type { PackageResolver } from './resolver'\nimport { resolveSpawnCommand } from './spawn'\n\ntype ModuleCommandResult = {\n  moduleId: string\n  packageName: string\n  from: string\n  registrationChanged: boolean\n}\n\ntype InstallTarget = {\n  cwd: string\n  args: string[]\n}\n\nconst OFFICIAL_PACKAGE_SCOPE = '@open-mercato/'\nconst SAFE_PACKAGE_SPEC_PATTERN = /^(?:@[a-z0-9][a-z0-9._-]*\\/)?[a-z0-9][a-z0-9._-]*(?:@.+)?$/i\nconst SAFE_PACKAGE_TAG_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]*$/\nconst SAFE_PACKAGE_FILE_LOCATOR_PATTERN = /^file:[A-Za-z0-9_./: \\\\-]+$/\n\nfunction resolveYarnBinary(): string {\n  return process.platform === 'win32' ? 'yarn.cmd' : 'yarn'\n}\n\nfunction readAppPackageName(appDir: string): string {\n  const packageJsonPath = path.join(appDir, 'package.json')\n  if (!fs.existsSync(packageJsonPath)) {\n    throw new Error(`App package.json not found at ${packageJsonPath}.`)\n  }\n\n  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')) as { name?: string }\n  if (!packageJson.name) {\n    throw new Error(`App package.json at ${packageJsonPath} is missing the \"name\" field.`)\n  }\n\n  return packageJson.name\n}\n\nfunction resolveInstallTarget(resolver: PackageResolver): InstallTarget {\n  if (!resolver.isMonorepo()) {\n    return {\n      cwd: resolver.getAppDir(),\n      args: ['add'],\n    }\n  }\n\n  return {\n    cwd: resolver.getRootDir(),\n    args: ['workspace', readAppPackageName(resolver.getAppDir()), 'add'],\n  }\n}\n\nfunction runCommand(\n  command: string,\n  args: string[],\n  cwd: string,\n): Promise<void> {\n  return new Promise((resolve, reject) => {\n    const resolvedSpawn = resolveSpawnCommand(command, args)\n    const child = spawn(resolvedSpawn.command, resolvedSpawn.args, {\n      cwd,\n      env: process.env,\n      stdio: 'inherit',\n      ...resolvedSpawn.spawnOptions,\n    })\n\n    child.on('error', reject)\n    child.on('exit', (code) => {\n      if (code === 0) {\n        resolve()\n        return\n      }\n\n      reject(new Error(`Command failed: ${command} ${args.join(' ')} (exit ${code ?? 'unknown'}).`))\n    })\n  })\n}\n\nasync function installPackageSpec(\n  resolver: PackageResolver,\n  packageSpec: string,\n): Promise<void> {\n  const target = resolveInstallTarget(resolver)\n  await runCommand(resolveYarnBinary(), [...target.args, packageSpec], target.cwd)\n}\n\nexport async function runModuleGenerators(\n  resolver: PackageResolver,\n  quiet = true,\n): Promise<void> {\n  const {\n    generateEntityIds,\n    generateModuleDi,\n    generateModuleEntities,\n    generateModulePackageSources,\n    generateModuleRegistries,\n    generateOpenApi,\n  } = await import('./generators')\n\n  await generateEntityIds({ resolver, quiet })\n  await generateModuleRegistries({ resolver, quiet })\n  await generateModuleEntities({ resolver, quiet })\n  await generateModuleDi({ resolver, quiet })\n  await generateModulePackageSources({ resolver, quiet })\n  await generateOpenApi({ resolver, quiet })\n}\n\nasync function runGeneratorsWithRegistrationNotice(\n  resolver: PackageResolver,\n  moduleId: string,\n): Promise<void> {\n  try {\n    await runModuleGenerators(resolver)\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error)\n    throw new Error(\n      `Module \"${moduleId}\" is enabled, but generated artifacts are stale because generation failed. Rerun \"yarn mercato generate\" after fixing the underlying error. ${message}`,\n    )\n  }\n}\n\nfunction isOfficialPackage(packageName: string): boolean {\n  return packageName.startsWith(OFFICIAL_PACKAGE_SCOPE)\n}\n\nfunction assertPackageName(packageName: string | null): asserts packageName is string {\n  if (!packageName) {\n    throw new Error('Could not determine a package name from the provided spec.')\n  }\n}\n\nfunction assertThirdPartyAllowed(packageName: string, allowThirdParty: boolean): void {\n  if (isOfficialPackage(packageName) || allowThirdParty) {\n    return\n  }\n\n  throw new Error(\n    `Package \"${packageName}\" is outside the ${OFFICIAL_PACKAGE_SCOPE}* scope. Re-run with --allow-third-party to install third-party module packages.`,\n  )\n}\n\nfunction assertSupportedPackageSpec(packageSpec: string, allowThirdParty: boolean): string {\n  const trimmed = packageSpec.trim()\n\n  if (!SAFE_PACKAGE_SPEC_PATTERN.test(trimmed)) {\n    throw new Error('Unsupported package spec. Provide a valid npm package name with an optional tag/version or file: locator.')\n  }\n\n  const packageName = parsePackageNameFromSpec(trimmed)\n  assertPackageName(packageName)\n  assertThirdPartyAllowed(packageName, allowThirdParty)\n\n  if (trimmed === packageName) {\n    return trimmed\n  }\n\n  const suffix = trimmed.slice(packageName.length + 1)\n  if (SAFE_PACKAGE_TAG_PATTERN.test(suffix) || SAFE_PACKAGE_FILE_LOCATOR_PATTERN.test(suffix)) {\n    return trimmed\n  }\n\n  throw new Error('Unsupported package spec suffix. Use a tag/version token or a file: locator.')\n}\n\nfunction validateBeforeRegistration(\n  modulePackage: ValidatedOfficialModulePackage,\n  resolver: PackageResolver,\n  eject: boolean,\n): string {\n  const appModuleDir = path.join(resolver.getAppDir(), 'src', 'modules', modulePackage.metadata.moduleId)\n\n  if (eject && fs.existsSync(appModuleDir)) {\n    throw new Error(`Destination directory already exists: ${appModuleDir}. Remove it first or rerun without --eject.`)\n  }\n\n  return appModuleDir\n}\n\nfunction prepareRegistrationSource(\n  modulePackage: ValidatedOfficialModulePackage,\n  resolver: PackageResolver,\n  packageName: string,\n  eject: boolean,\n): string {\n  const appModuleDir = validateBeforeRegistration(modulePackage, resolver, eject)\n\n  if (!eject) {\n    return packageName\n  }\n\n  if (!modulePackage.metadata.ejectable) {\n    throw new Error(`Package \"${packageName}\" is not ejectable. --eject requires open-mercato.ejectable === true.`)\n  }\n\n  validateEjectBoundaries(modulePackage)\n  copyDirRecursive(modulePackage.sourceModuleDir, appModuleDir)\n  rewriteCrossModuleImports(\n    modulePackage.sourceModuleDir,\n    appModuleDir,\n    modulePackage.metadata.moduleId,\n    packageName,\n  )\n\n  return '@app'\n}\n\nasync function registerResolvedOfficialModule(\n  resolver: PackageResolver,\n  modulePackage: ValidatedOfficialModulePackage,\n  packageName: string,\n  eject: boolean,\n): Promise<ModuleCommandResult> {\n  const from = prepareRegistrationSource(modulePackage, resolver, packageName, eject)\n\n  const registration = ensureModuleRegistration(\n    resolver.getModulesConfigPath(),\n    {\n      id: modulePackage.metadata.moduleId,\n      from,\n    },\n  )\n\n  if (!registration.changed) {\n    throw new Error(\n      `Module \"${modulePackage.metadata.moduleId}\" from \"${from}\" is already enabled in modules.ts.`,\n    )\n  }\n\n  await runGeneratorsWithRegistrationNotice(resolver, modulePackage.metadata.moduleId)\n\n  return {\n    moduleId: modulePackage.metadata.moduleId,\n    packageName,\n    from,\n    registrationChanged: registration.changed,\n  }\n}\n\nexport async function addOfficialModule(\n  resolver: PackageResolver,\n  packageSpec: string,\n  eject: boolean,\n  moduleId?: string,\n  allowThirdParty = false,\n): Promise<ModuleCommandResult> {\n  const safePackageSpec = assertSupportedPackageSpec(packageSpec, allowThirdParty)\n  const packageName = parsePackageNameFromSpec(safePackageSpec)\n  assertPackageName(packageName)\n\n  await installPackageSpec(resolver, safePackageSpec)\n\n  const modulePackage = resolveInstalledOfficialModulePackage(resolver, packageName, moduleId)\n  return registerResolvedOfficialModule(resolver, modulePackage, packageName, eject)\n}\n\nexport async function enableOfficialModule(\n  resolver: PackageResolver,\n  packageName: string,\n  moduleId?: string,\n  eject = false,\n  allowThirdParty = false,\n): Promise<ModuleCommandResult> {\n  assertThirdPartyAllowed(packageName, allowThirdParty)\n\n  const modulePackage = resolveInstalledOfficialModulePackage(resolver, packageName, moduleId)\n  return registerResolvedOfficialModule(resolver, modulePackage, packageName, eject)\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/mercato.js

@@ -556,9 +556,7 @@ async function runGeneratorSuite(quiet) {
   const { createResolver } = await import("./lib/resolver.js");
   const {
     generateEntityIds,
-    generateModuleRegistry,
-    generateModuleRegistryApp,
-    generateModuleRegistryCli,
+    generateModuleRegistries,
     generateModuleEntities,
     generateModuleDi,
     generateModulePackageSources,
@@ -567,9 +565,7 @@ async function runGeneratorSuite(quiet) {
   const resolver = createResolver();
   const results = [
     await generateEntityIds({ resolver, quiet }),
-    await generateModuleRegistry({ resolver, quiet }),
-    await generateModuleRegistryApp({ resolver, quiet }),
-    await generateModuleRegistryCli({ resolver, quiet }),
+    ...await generateModuleRegistries({ resolver, quiet }),
     await generateModuleEntities({ resolver, quiet }),
     await generateModuleDi({ resolver, quiet }),
     await generateModulePackageSources({ resolver, quiet }),
@@ -827,12 +823,10 @@ async function run(argv = process.argv) {
       }
       console.log("\u{1F527} Preparing modules (registry, entities, DI)...");
       const { createResolver } = await import("./lib/resolver.js");
-      const { generateEntityIds, generateModuleRegistry, generateModuleRegistryApp, generateModuleRegistryCli, generateModuleEntities, generateModuleDi, generateModulePackageSources, generateOpenApi } = await import("./lib/generators/index.js");
+      const { generateEntityIds, generateModuleRegistries, generateModuleEntities, generateModuleDi, generateModulePackageSources, generateOpenApi } = await import("./lib/generators/index.js");
       const resolver = createResolver();
       await generateEntityIds({ resolver, quiet: true });
-      await generateModuleRegistry({ resolver, quiet: true });
-      await generateModuleRegistryApp({ resolver, quiet: true });
-      await generateModuleRegistryCli({ resolver, quiet: true });
+      await generateModuleRegistries({ resolver, quiet: true });
       await generateModuleEntities({ resolver, quiet: true });
       await generateModuleDi({ resolver, quiet: true });
       await generateModulePackageSources({ resolver, quiet: true });
@@ -1528,11 +1522,9 @@ async function run(argv = process.argv) {
         command: "registry",
         run: async (args) => {
           const { createResolver } = await import("./lib/resolver.js");
-          const { generateModulePackageSources, generateModuleRegistry, generateModuleRegistryApp, generateModuleRegistryCli } = await import("./lib/generators/index.js");
+          const { generateModulePackageSources, generateModuleRegistries } = await import("./lib/generators/index.js");
           const resolver = createResolver();
-          await generateModuleRegistry({ resolver, quiet: args.includes("--quiet") });
-          await generateModuleRegistryApp({ resolver, quiet: args.includes("--quiet") });
-          await generateModuleRegistryCli({ resolver, quiet: args.includes("--quiet") });
+          await generateModuleRegistries({ resolver, quiet: args.includes("--quiet") });
           await generateModulePackageSources({ resolver, quiet: args.includes("--quiet") });
         }
       },