@open-mercato/cli 0.6.3-develop.3602.1.8287bc577d → 0.6.3-develop.3609.1.01983ef87a

package/dist/lib/generators/module-registry.js

@@ -630,8 +630,9 @@ function requiresRuntimePageMetadataFromSourceFile(sourceFile) {
 function toLiteral(value) {
   return JSON.stringify(value).replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
 }
-const GENERATED_MODULE_SPECIFIER_PREFIXES = ["@/", "@open-mercato/", "../../src/modules/", "./"];
+const GENERATED_MODULE_RELATIVE_PREFIXES = ["@/", "../../src/modules/", "./"];
 const GENERATED_MODULE_SPECIFIER_SEGMENT = /^[A-Za-z0-9_.\-[\]()']+$/;
+const NPM_PACKAGE_NAME_SEGMENT = /^[A-Za-z0-9~][A-Za-z0-9_.~-]*$/;
 function sanitizeGeneratedModuleSpecifierSegment(segment, importPath) {
   const match = GENERATED_MODULE_SPECIFIER_SEGMENT.exec(segment);
   if (!match || segment === "." || segment === "..") {
@@ -639,17 +640,64 @@ function sanitizeGeneratedModuleSpecifierSegment(segment, importPath) {
   }
   return match[0];
 }
-function sanitizeGeneratedModuleSpecifier(importPath) {
-  const prefix = GENERATED_MODULE_SPECIFIER_PREFIXES.find((candidate) => importPath.startsWith(candidate));
-  if (!prefix) {
-    throw new Error(`Unsafe generated module specifier prefix: ${importPath}`);
+function sanitizeNpmPackageNameSegment(segment, importPath) {
+  if (!NPM_PACKAGE_NAME_SEGMENT.test(segment) || segment === "." || segment === "..") {
+    throw new Error(`Unsafe generated module specifier: ${importPath}`);
   }
-  const suffix = importPath.slice(prefix.length);
-  if (!suffix) {
+}
+function sanitizeGeneratedModuleSpecifier(importPath) {
+  if (!importPath) {
     throw new Error(`Unsafe generated module specifier: ${importPath}`);
   }
-  const segments = suffix.split("/").map((segment) => sanitizeGeneratedModuleSpecifierSegment(segment, importPath));
-  return `${prefix}${segments.join("/")}`;
+  const relativePrefix = GENERATED_MODULE_RELATIVE_PREFIXES.find(
+    (candidate) => importPath.startsWith(candidate)
+  );
+  if (relativePrefix) {
+    const suffix = importPath.slice(relativePrefix.length);
+    if (!suffix) {
+      throw new Error(`Unsafe generated module specifier: ${importPath}`);
+    }
+    const segments2 = suffix.split("/").map((segment) => sanitizeGeneratedModuleSpecifierSegment(segment, importPath));
+    return `${relativePrefix}${segments2.join("/")}`;
+  }
+  if (importPath.startsWith("@")) {
+    const firstSlash2 = importPath.indexOf("/");
+    if (firstSlash2 < 2) {
+      throw new Error(`Unsafe generated module specifier prefix: ${importPath}`);
+    }
+    const scope = importPath.slice(1, firstSlash2);
+    sanitizeNpmPackageNameSegment(scope, importPath);
+    const rest = importPath.slice(firstSlash2 + 1);
+    if (!rest) {
+      throw new Error(`Unsafe generated module specifier: ${importPath}`);
+    }
+    const secondSlash = rest.indexOf("/");
+    const name2 = secondSlash >= 0 ? rest.slice(0, secondSlash) : rest;
+    sanitizeNpmPackageNameSegment(name2, importPath);
+    const subpath2 = secondSlash >= 0 ? rest.slice(secondSlash + 1) : "";
+    if (!subpath2) {
+      return `@${scope}/${name2}`;
+    }
+    const segments2 = subpath2.split("/").map((segment) => sanitizeGeneratedModuleSpecifierSegment(segment, importPath));
+    return `@${scope}/${name2}/${segments2.join("/")}`;
+  }
+  const firstSlash = importPath.indexOf("/");
+  const name = firstSlash >= 0 ? importPath.slice(0, firstSlash) : importPath;
+  sanitizeNpmPackageNameSegment(name, importPath);
+  const subpath = firstSlash >= 0 ? importPath.slice(firstSlash + 1) : "";
+  if (!subpath) {
+    return name;
+  }
+  const segments = subpath.split("/").map((segment) => sanitizeGeneratedModuleSpecifierSegment(segment, importPath));
+  return `${name}/${segments.join("/")}`;
+}
+function verifyThirdPartyModuleShape(entry, pkgBase) {
+  const from = entry.from;
+  if (!from || from === "@app" || from.startsWith("@open-mercato/")) return;
+  if (fs.existsSync(pkgBase)) return;
+  throw new Error(
+    `Module '${entry.id}' is registered with from: '${from}' but no Open Mercato module shape was found at '${pkgBase}'. Ensure the package ships a 'modules/${entry.id}' subtree (either under 'dist/modules/' or 'src/modules/'), or correct the 'from' value in src/modules.ts.`
+  );
 }
 function buildImportStatement(importClause, importPath) {
   return `import ${importClause} from ${toLiteral(sanitizeGeneratedModuleSpecifier(importPath))}`;
@@ -1937,6 +1985,9 @@ async function generateModuleRegistry(options) {
   const legacySubscribersOutFile = path.join(outputDir, "subscribers.generated.ts");
   const legacySubscribersChecksumFile = path.join(outputDir, "subscribers.generated.checksum");
   const enabled = resolver.loadEnabledModules();
+  for (const entry of enabled) {
+    verifyThirdPartyModuleShape(entry, resolver.getModulePaths(entry).pkgBase);
+  }
   const extensions = loadGeneratorExtensions();
   const pluginRegistry = /* @__PURE__ */ new Map();
   const pluginState = /* @__PURE__ */ new Map();
@@ -2475,6 +2526,9 @@ async function generateModuleRegistryApp(options) {
   const enabledIdsOutFile = path.join(outputDir, "enabled-module-ids.generated.ts");
   const enabledIdsChecksumFile = path.join(outputDir, "enabled-module-ids.generated.checksum");
   const enabled = resolver.loadEnabledModules();
+  for (const entry of enabled) {
+    verifyThirdPartyModuleShape(entry, resolver.getModulePaths(entry).pkgBase);
+  }
   const imports = [];
   const moduleDecls = [];
   const importIdRef = { value: 0 };
@@ -2767,6 +2821,9 @@ async function generateModuleRegistryCli(options) {
   const legacyOutFile = path.join(outputDir, "cli-modules.generated.ts");
   const legacyChecksumFile = path.join(outputDir, "cli-modules.generated.checksum");
   const enabled = resolver.loadEnabledModules();
+  for (const entry of enabled) {
+    verifyThirdPartyModuleShape(entry, resolver.getModulePaths(entry).pkgBase);
+  }
   const imports = [];
   const moduleDecls = [];
   const importIdRef = { value: 0 };