@open-mercato/cli 0.10.1-develop.7983.1.fd91207efe → 0.10.1-develop.7994.1.c9f31972aa

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

@@ -1,8 +1,11 @@
+import { sourceHasDefaultExport, sourceExportedHttpMethods } from "./source-exports.js";
 import fs from "node:fs";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { VariableDeclarationKind } from "ts-morph";
 import ts from "typescript-js";
+import { getEnabledModuleIdentities } from "../module-identity.js";
+import { getModuleRequirementHint, resolveModuleRequirement } from "@open-mercato/shared/modules/module-locators";
 import {
   DEV_SUPERVISOR_MANIFEST_FILE,
   DEV_SUPERVISOR_MANIFEST_VERSION
@@ -738,34 +741,11 @@ function inferScriptKind(filePath) {
   return ts.ScriptKind.TS;
 }
 function hasDefaultExport(sourceFile) {
-  let source = "";
   try {
-    source = fs.readFileSync(sourceFile, "utf8");
+    return sourceHasDefaultExport(sourceFile, fs.readFileSync(sourceFile, "utf8"));
   } catch {
     return false;
   }
-  const parsed = ts.createSourceFile(
-    sourceFile,
-    source,
-    ts.ScriptTarget.Latest,
-    true,
-    inferScriptKind(sourceFile)
-  );
-  for (const statement of parsed.statements) {
-    if (ts.isExportAssignment(statement) && !statement.isExportEquals) {
-      return true;
-    }
-    if (ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause) && statement.exportClause.elements.some(
-      (element) => element.name.text === "default" || element.propertyName?.text === "default"
-    )) {
-      return true;
-    }
-    const modifiers = ts.canHaveModifiers(statement) ? ts.getModifiers(statement) : void 0;
-    if (modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.DefaultKeyword)) {
-      return true;
-    }
-  }
-  return false;
 }
 function requiresRuntimePageMetadataFromSourceFile(sourceFile) {
   const literal = extractNamedObjectLiteralSource(sourceFile, "metadata");
@@ -1172,53 +1152,11 @@ async function resolveModuleRequiresFromIndexFile(indexFileAbsolutePath) {
   return resolveModuleRequiresFromMetadata(metadata);
 }
 function detectExportedHttpMethods(sourceFile) {
-  let source = "";
   try {
-    source = fs.readFileSync(sourceFile, "utf8");
+    return sourceExportedHttpMethods(fs.readFileSync(sourceFile, "utf8"));
   } catch {
     return [];
   }
-  const knownMethods = ["GET", "POST", "PUT", "PATCH", "DELETE"];
-  const exportedMethods = /* @__PURE__ */ new Set();
-  const collectKnownMethods = (rawSpecifiers, opts) => {
-    for (const specifier of rawSpecifiers) {
-      const trimmed = specifier.trim();
-      if (!trimmed) continue;
-      let candidate = trimmed;
-      if (opts?.useExportedAlias) {
-        candidate = trimmed.split(/\s+as\s+/i).pop()?.trim() ?? trimmed;
-      }
-      if (opts?.useDestructuredProperty) {
-        candidate = trimmed.split(":")[0]?.trim() ?? trimmed;
-      }
-      if (knownMethods.includes(candidate)) {
-        exportedMethods.add(candidate);
-      }
-    }
-  };
-  for (const method of knownMethods) {
-    const pattern = new RegExp(`export\\s+(?:async\\s+)?function\\s+${method}\\b|export\\s+(?:const|let|var)\\s+${method}\\b`);
-    if (pattern.test(source)) {
-      exportedMethods.add(method);
-    }
-  }
-  const reExportPattern = /export\s*{([^}]+)}/g;
-  for (const match of source.matchAll(reExportPattern)) {
-    const exportBlock = match[1] ?? "";
-    collectKnownMethods(
-      exportBlock.split(",").map((part) => part.trim()).filter((part) => part.length > 0),
-      { useExportedAlias: true }
-    );
-  }
-  const destructuredExportPattern = /export\s+(?:const|let|var)\s*{([^}]+)}/g;
-  for (const match of source.matchAll(destructuredExportPattern)) {
-    const exportBlock = match[1] ?? "";
-    collectKnownMethods(
-      exportBlock.split(",").map((part) => part.trim()).filter((part) => part.length > 0),
-      { useDestructuredProperty: true }
-    );
-  }
-  return knownMethods.filter((method) => exportedMethods.has(method));
 }
 function buildPageRouteProps(metaExpr, routePath) {
   return `pattern: ${toLiteral(routePath || "/")}, requireAuth: (${metaExpr})?.requireAuth, requireRoles: (${metaExpr})?.requireRoles, requireFeatures: (${metaExpr})?.requireFeatures, requireCustomerAuth: (${metaExpr})?.requireCustomerAuth, requireCustomerFeatures: (${metaExpr})?.requireCustomerFeatures, nav: (${metaExpr})?.nav, title: (${metaExpr})?.pageTitle ?? (${metaExpr})?.title, titleKey: (${metaExpr})?.pageTitleKey ?? (${metaExpr})?.titleKey, group: (${metaExpr})?.pageGroup ?? (${metaExpr})?.group, groupKey: (${metaExpr})?.pageGroupKey ?? (${metaExpr})?.groupKey, icon: (${metaExpr})?.icon, order: (${metaExpr})?.pageOrder ?? (${metaExpr})?.order, priority: (${metaExpr})?.pagePriority ?? (${metaExpr})?.priority, navHidden: (${metaExpr})?.navHidden, visible: (${metaExpr})?.visible, enabled: (${metaExpr})?.enabled, breadcrumb: (${metaExpr})?.breadcrumb, pageContext: (${metaExpr})?.pageContext, placement: (${metaExpr})?.placement`;
@@ -1447,11 +1385,21 @@ function discoverTranslations(roots) {
 async function createModuleRegistryDiscovery(resolver, quiet = false) {
   resetConventionWarnings();
   const enabled = resolver.loadEnabledModules();
+  const rootsByEntry = /* @__PURE__ */ new Map();
+  const getModulePaths = (entry) => {
+    let roots = rootsByEntry.get(entry);
+    if (!roots) {
+      roots = resolver.getModulePaths(entry);
+      rootsByEntry.set(entry, roots);
+    }
+    return roots;
+  };
+  const identities = getEnabledModuleIdentities({ ...resolver, getModulePaths }, enabled);
   const modules = [];
   const trackedRoots = /* @__PURE__ */ new Set();
   for (const entry of enabled) {
     const modId = entry.id;
-    const roots = resolver.getModulePaths(entry);
+    const roots = getModulePaths(entry);
     verifyThirdPartyModuleShape(entry, roots.pkgBase);
     const rawImps = resolver.getModuleImportBase(entry);
     const appImportBase = entry.from === "@app" ? `../../src/modules/${modId}` : rawImps.appBase;
@@ -1492,6 +1440,7 @@ async function createModuleRegistryDiscovery(resolver, quiet = false) {
   return {
     enabled,
     modules,
+    identities,
     getStructureChecksum: () => structureChecksum ??= calculateStructureChecksum(Array.from(trackedRoots))
   };
 }
@@ -3280,10 +3229,12 @@ async function generateModuleRegistryFromDiscovery(options) {
     ])
   });
   {
-    const enabledIds = new Set(enabled.map((e) => e.id));
+    const identities = discovery.identities;
     const problems = [];
+    const missingRequirements = /* @__PURE__ */ new Set();
     for (const [modId, reqs] of requiresByModule.entries()) {
-      const missing = reqs.filter((r) => !enabledIds.has(r));
+      const missing = reqs.filter((requirement) => !resolveModuleRequirement(requirement, identities));
+      for (const requirement of missing) missingRequirements.add(requirement);
       if (missing.length) {
         problems.push(`- Module "${modId}" requires: ${missing.join(", ")}`);
       }
@@ -3291,10 +3242,7 @@ async function generateModuleRegistryFromDiscovery(options) {
     if (problems.length) {
       console.error("\nModule dependency check failed:");
       for (const p of problems) console.error(p);
-      console.error("\nFix: Enable required module(s) in src/modules.ts. Example:");
-      console.error(
-        "  export const enabledModules = [ { id: '" + Array.from(new Set(requiresByModule.values()).values()).join("' }, { id: '") + "' } ]"
-      );
+      for (const requirement of missingRequirements) console.error(`Fix: ${getModuleRequirementHint(requirement)}`);
       process.exit(1);
     }
   }
@@ -3720,10 +3668,12 @@ async function generateModuleRegistryAppFromDiscovery(options) {
     initializer: identifier("modules")
   });
   {
-    const enabledIds = new Set(enabled.map((e) => e.id));
+    const identities = discovery.identities;
     const problems = [];
+    const missingRequirements = /* @__PURE__ */ new Set();
     for (const [modId, reqs] of requiresByModule.entries()) {
-      const missing = reqs.filter((r) => !enabledIds.has(r));
+      const missing = reqs.filter((requirement) => !resolveModuleRequirement(requirement, identities));
+      for (const requirement of missing) missingRequirements.add(requirement);
       if (missing.length) {
         problems.push(`- Module "${modId}" requires: ${missing.join(", ")}`);
       }
@@ -3731,10 +3681,7 @@ async function generateModuleRegistryAppFromDiscovery(options) {
     if (problems.length) {
       console.error("\nModule dependency check failed:");
       for (const p of problems) console.error(p);
-      console.error("\nFix: Enable required module(s) in src/modules.ts. Example:");
-      console.error(
-        "  export const enabledModules = [ { id: '" + Array.from(new Set(requiresByModule.values()).values()).join("' }, { id: '") + "' } ]"
-      );
+      for (const requirement of missingRequirements) console.error(`Fix: ${getModuleRequirementHint(requirement)}`);
       process.exit(1);
     }
   }
@@ -4052,10 +3999,12 @@ async function generateModuleRegistryCliFromDiscovery(options) {
     ])
   });
   {
-    const enabledIds = new Set(enabled.map((e) => e.id));
+    const identities = discovery.identities;
     const problems = [];
+    const missingRequirements = /* @__PURE__ */ new Set();
     for (const [modId, reqs] of requiresByModule.entries()) {
-      const missing = reqs.filter((r) => !enabledIds.has(r));
+      const missing = reqs.filter((requirement) => !resolveModuleRequirement(requirement, identities));
+      for (const requirement of missing) missingRequirements.add(requirement);
       if (missing.length) {
         problems.push(`- Module "${modId}" requires: ${missing.join(", ")}`);
       }
@@ -4063,10 +4012,7 @@ async function generateModuleRegistryCliFromDiscovery(options) {
     if (problems.length) {
       console.error("\nModule dependency check failed:");
       for (const p of problems) console.error(p);
-      console.error("\nFix: Enable required module(s) in src/modules.ts. Example:");
-      console.error(
-        "  export const enabledModules = [ { id: '" + Array.from(new Set(requiresByModule.values()).values()).join("' }, { id: '") + "' } ]"
-      );
+      for (const requirement of missingRequirements) console.error(`Fix: ${getModuleRequirementHint(requirement)}`);
       process.exit(1);
     }
   }