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

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

@@ -121,7 +121,7 @@ function propertyName(node) {
   if (ts.isIdentifier(node) || ts.isStringLiteralLike(node) || ts.isNumericLiteral(node)) return node.text;
   return null;
 }
-function buildStaticContext(file) {
+function buildStaticContext(file, factsContractVersion = 2) {
   const initializers = /* @__PURE__ */ new Map();
   const visit = (node) => {
     if (ts.isVariableDeclaration(node) && ts.isIdentifier(node.name) && node.initializer) {
@@ -133,7 +133,7 @@ function buildStaticContext(file) {
     node.forEachChild(visit);
   };
   file.forEachChild(visit);
-  return { initializers, sourceFile: file, resolving: /* @__PURE__ */ new Set() };
+  return { initializers, sourceFile: file, resolving: /* @__PURE__ */ new Set(), factsContractVersion };
 }
 function entityRegistryValue(expression) {
   const parts = [];
@@ -153,6 +153,16 @@ function staticTemplate(expression, context) {
   }
   return value;
 }
+function isFunctionLikeInitializer(expression, context) {
+  const current = unwrap(expression);
+  if (ts.isArrowFunction(current) || ts.isFunctionExpression(current)) return true;
+  if (!ts.isIdentifier(current)) return false;
+  const initializer = context.initializers.get(current.text);
+  if (!initializer) return false;
+  if (ts.isFunctionDeclaration(initializer)) return true;
+  const resolved = unwrap(initializer);
+  return ts.isArrowFunction(resolved) || ts.isFunctionExpression(resolved);
+}
 function staticObject(expression, context) {
   const result = {};
   for (const property of expression.properties) {
@@ -161,6 +171,7 @@ function staticObject(expression, context) {
       if (!name) continue;
       const value = staticValue(property.initializer, context);
       if (value !== void 0) result[name] = value;
+      else if (context.factsContractVersion === 2 && isFunctionLikeInitializer(property.initializer, context)) result[name] = true;
       continue;
     }
     if (ts.isShorthandPropertyAssignment(property)) {
@@ -212,6 +223,12 @@ function staticValue(expression, context) {
     return value;
   }
   if (ts.isCallExpression(current)) {
+    const handle = componentReplacementHandle(current, context);
+    if (handle) {
+      if (context.factsContractVersion === 2) return handle.resolved;
+      const firstArgument2 = current.arguments[0];
+      return firstArgument2 ? staticValue(firstArgument2, context) : void 0;
+    }
     if (ts.isIdentifier(current.expression)) {
       const callable = context.initializers.get(current.expression.text);
       if (callable && (ts.isArrowFunction(callable) || ts.isFunctionExpression(callable) || ts.isFunctionDeclaration(callable))) {
@@ -224,7 +241,8 @@ function staticValue(expression, context) {
         const childContext = {
           initializers,
           sourceFile: context.sourceFile,
-          resolving: new Set(context.resolving)
+          resolving: new Set(context.resolving),
+          factsContractVersion: context.factsContractVersion
         };
         if (callable.body && ts.isExpression(callable.body)) return staticValue(callable.body, childContext);
         const returnStatement = callable.body?.statements.find(ts.isReturnStatement);
@@ -232,7 +250,7 @@ function staticValue(expression, context) {
       }
     }
     const firstArgument = current.arguments[0];
-    if (firstArgument) {
+    if (firstArgument && (context.factsContractVersion === 1 || ts.isIdentifier(current.expression))) {
       const value = staticValue(firstArgument, context);
       if (!isStaticObject(value) || !ts.isIdentifier(current.expression)) return value;
       if (current.expression.text === "dataTableExtensionHost") return { family: "data-table", ...value };
@@ -248,6 +266,21 @@ function staticValue(expression, context) {
   }
   return void 0;
 }
+const COMPONENT_REPLACEMENT_HANDLE_BUILDERS = {
+  page: ([routePath]) => routePath ? `page:${routePath}` : void 0,
+  dataTable: ([tableId]) => tableId ? `data-table:${tableId}` : void 0,
+  crudForm: ([entityId]) => entityId ? `crud-form:${entityId}` : void 0,
+  section: ([scope, sectionId]) => scope && sectionId ? `section:${scope}.${sectionId}` : void 0
+};
+function componentReplacementHandle(expression, context) {
+  if (!ts.isPropertyAccessExpression(expression.expression)) return null;
+  const callee = expression.expression;
+  if (!ts.isIdentifier(callee.expression) || callee.expression.text !== "ComponentReplacementHandles") return null;
+  const builder = COMPONENT_REPLACEMENT_HANDLE_BUILDERS[callee.name.text];
+  if (!builder) return { resolved: void 0 };
+  const args = expression.arguments.map((argument) => stringValue(staticValue(argument, context)));
+  return { resolved: builder(args) };
+}
 function isStaticObject(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
@@ -277,19 +310,22 @@ function conventionPath(moduleRoot, relativePath) {
   }
   return null;
 }
-function readConventionObjectArray(filePath, exportName) {
+function readConventionObjectArrayForContract(filePath, exportName, factsContractVersion) {
   const file = sourceFile(filePath);
   if (!file) return [];
-  const context = buildStaticContext(file);
+  const context = buildStaticContext(file, factsContractVersion);
   const initializer = context.initializers.get(exportName);
   if (!initializer || ts.isFunctionDeclaration(initializer)) return [];
   const value = staticValue(initializer, context);
   return Array.isArray(value) ? value.filter(isStaticObject) : [];
 }
-function readRootObject(filePath, variableName) {
+function readConventionObjectArray(filePath, exportName) {
+  return readConventionObjectArrayForContract(filePath, exportName, 2);
+}
+function readRootObject(filePath, variableName, factsContractVersion = 2) {
   const file = sourceFile(filePath);
   if (!file) return null;
-  const context = buildStaticContext(file);
+  const context = buildStaticContext(file, factsContractVersion);
   const initializer = context.initializers.get(variableName);
   if (!initializer || ts.isFunctionDeclaration(initializer)) return null;
   const value = staticValue(initializer, context);
@@ -776,27 +812,33 @@ function contributionBase(id, sourcePath, sourceSymbol) {
     source: { path: sourcePath, ...sourceSymbol ? { symbol: sourceSymbol } : {} }
   };
 }
+function injectionTableSlots(value) {
+  if (value === void 0) return [];
+  return Array.isArray(value) ? value : [value];
+}
 function extractInjectionTable(options) {
   const filePath = conventionPath(options.moduleRoot, "widgets/injection-table.ts");
   if (!filePath) return [];
-  const table = readRootObject(filePath, "injectionTable");
+  const table = readRootObject(filePath, "injectionTable", options.factsContractVersion ?? 2);
   if (!table) return [];
   const sourcePath = portablePath(options.moduleRoot, options.sourceRoot, filePath);
   const facts = [];
   for (const targetId of Object.keys(table).sort((left, right) => left.localeCompare(right))) {
-    const entries = table[targetId];
-    if (!Array.isArray(entries)) continue;
+    const entries = options.factsContractVersion === 1 ? Array.isArray(table[targetId]) ? table[targetId] : [] : injectionTableSlots(table[targetId]);
     for (const entry of entries) {
-      if (!isStaticObject(entry)) continue;
-      const widgetId = stringValue(entry.widgetId);
+      if (options.factsContractVersion === 1 && !isStaticObject(entry)) continue;
+      const slot = isStaticObject(entry) ? entry : null;
+      const widgetId = typeof entry === "string" ? entry : slot ? stringValue(slot.widgetId) : void 0;
       if (!widgetId) continue;
+      const features = slot ? strings(slot.features) : [];
+      const priority = slot ? numberValue(slot.priority) : void 0;
       const payload = targetId.endsWith(":columns") ? "column" : targetId.endsWith(":row-actions") ? "row-action" : targetId.endsWith(":bulk-actions") ? "bulk-action" : targetId.endsWith(":filters") ? "filter" : targetId.endsWith(":fields") ? "field" : "render";
       const base = contributionBase(`${widgetId}@${targetId}`, sourcePath, "injectionTable");
       const shared = {
         ...base,
         targets: [target(targetId)],
-        features: strings(entry.features),
-        placement: numberValue(entry.priority) !== void 0 ? { priority: numberValue(entry.priority) } : void 0
+        features,
+        placement: priority !== void 0 ? { priority } : void 0
       };
       if (targetId.startsWith("data-table:")) {
         facts.push({
@@ -805,7 +847,7 @@ function extractInjectionTable(options) {
           details: {
             payload: payload === "field" ? "render" : payload,
             tableId: targetId.replace(/^data-table:/, "").replace(/:(?:columns|row-actions|bulk-actions|filters|toolbar|header|footer|search-trailing)$/, ""),
-            executionGuard: strings(entry.features).length > 0 ? "both" : "host"
+            executionGuard: features.length > 0 ? "both" : "host"
           }
         });
       } else if (targetId.startsWith("crud-form:")) {
@@ -825,7 +867,7 @@ function extractInjectionTable(options) {
           details: {
             payload: "render",
             registryKey: widgetId,
-            executionGuard: strings(entry.features).length > 0 ? "both" : "host"
+            executionGuard: features.length > 0 ? "both" : "host"
           }
         });
       }
@@ -837,7 +879,7 @@ function extractObjectConvention(options) {
   const filePath = conventionPath(options.module.moduleRoot, options.relativePath);
   if (!filePath) return [];
   const exportNames = [options.exportName, ...options.exportAliases ?? []];
-  const entries = exportNames.reduce((found, exportName) => found.length > 0 ? found : readConventionObjectArray(filePath, exportName), []);
+  const entries = exportNames.reduce((found, exportName) => found.length > 0 ? found : readConventionObjectArrayForContract(filePath, exportName, options.module.factsContractVersion ?? 2), []);
   const sourcePath = portablePath(options.module.moduleRoot, options.module.sourceRoot, filePath);
   return entries.flatMap((entry, index) => options.build(entry, sourcePath, index) ?? []);
 }
@@ -1075,7 +1117,7 @@ function extractComponentOverrides(options) {
       const targetDefinition = isStaticObject(entry.target) ? entry.target : null;
       const handle = targetDefinition ? stringValue(targetDefinition.componentId) : void 0;
       if (!handle) return null;
-      const mode = entry.wrapper !== void 0 ? "wrapper" : entry.props !== void 0 ? "props" : "replace";
+      const mode = options.factsContractVersion === 1 ? entry.wrapper !== void 0 ? "wrapper" : entry.props !== void 0 ? "props" : "replace" : entry.wrapper !== void 0 ? "wrapper" : entry.propsTransform !== void 0 ? "props" : "replace";
       const id = `${options.moduleId}.component-override.${index}:${handle}`;
       const contribution = contributionBase(id, sourcePath, "componentOverrides");
       return {
@@ -1378,6 +1420,20 @@ function targetModuleId(targetId) {
   const match = /^([a-z][a-z0-9_]*)[.:]/.exec(withoutPrefix);
   return match?.[1] ?? null;
 }
+function normalizedEntityId(value) {
+  return value.replace(/^([a-z][a-z0-9_]*):/, "$1.");
+}
+function entityFactKeyForTarget(targetId, entityIds) {
+  const normalizedTarget = normalizedEntityId(targetId);
+  for (const entityId of entityIds) {
+    const normalizedEntity = normalizedEntityId(entityId);
+    if (normalizedTarget === normalizedEntity) return entityId;
+    if (normalizedTarget.startsWith(`${normalizedEntity}.`) && /\.(?:creating|created|updating|updated|deleting|deleted)$/.test(normalizedTarget)) {
+      return entityId;
+    }
+  }
+  return null;
+}
 function correlateExtensionTarget(targetFact, options) {
   if (targetFact.resolution !== "unresolved") return targetFact;
   const allHosts = Object.values(options.surfacesByModule).flatMap((surface) => surface.hosts);
@@ -1401,8 +1457,9 @@ function correlateExtensionTarget(targetFact, options) {
   if (patterned) return { id: targetFact.id, resolution: "pattern" };
   const framework = allFrameworkHosts().find((host) => patternMatches(host.id, targetFact.id)) ?? (FRAMEWORK_PREFIXES.some((prefix) => targetFact.id.startsWith(prefix)) ? FRAMEWORK_HOSTS[0] : void 0);
   if (framework) return { id: targetFact.id, resolution: "framework" };
-  if (options.entityIds.has(targetFact.id)) {
-    return { id: targetFact.id, resolution: "fact-ref", factRef: { factSection: "entities", factKey: targetFact.id } };
+  const entityFactKey = options.factsContractVersion === 1 ? options.entityIds.has(targetFact.id) ? targetFact.id : null : entityFactKeyForTarget(targetFact.id, options.entityIds);
+  if (entityFactKey) {
+    return { id: targetFact.id, resolution: "fact-ref", factRef: { factSection: "entities", factKey: entityFactKey } };
   }
   if (options.eventIds.has(targetFact.id)) {
     return { id: targetFact.id, resolution: "fact-ref", factRef: { factSection: "events", factKey: targetFact.id } };
@@ -1789,15 +1846,24 @@ function assertNoUnresolvedExtensionTargets(surfacesByModule) {
     throw new Error(`[module-facts] unresolved first-party extension targets: ${unresolved.join(", ")}`);
   }
 }
-function getFrameworkOverrideModes() {
+function getFrameworkOverrideModes(hosts = FRAMEWORK_OVERRIDE_HOSTS) {
   const modes = {};
-  for (const host of FRAMEWORK_OVERRIDE_HOSTS) {
-    const dotted = host.key.replace(/^framework\.module-override\./, "");
-    const mode = host.operations?.[0];
-    if (mode === "disable-replace" || mode === "replace" || mode === "additive") modes[dotted] = mode;
+  for (const [dotted, operation] of Object.entries(getFrameworkOverrideHostOperations(hosts))) {
+    if (operation === "disable-replace" || operation === "replace" || operation === "additive") {
+      modes[dotted] = operation;
+    }
   }
   return modes;
 }
+function getFrameworkOverrideHostOperations(hosts = FRAMEWORK_OVERRIDE_HOSTS) {
+  const operations = {};
+  for (const host of hosts) {
+    const dotted = host.key.replace(/^framework\.module-override\./, "");
+    const operation = host.operations?.[0];
+    if (typeof operation === "string") operations[dotted] = operation;
+  }
+  return operations;
+}
 function getFrameworkExtensionHosts() {
   return sortHosts(allFrameworkHosts().map((host) => ({
     ...host,
@@ -1832,6 +1898,7 @@ export {
   extractKnownCommandIds,
   extractModuleExtensionFacts,
   getFrameworkExtensionHosts,
+  getFrameworkOverrideHostOperations,
   getFrameworkOverrideModes,
   readConventionObjectArray,
   renderFrameworkExtensionPointsMarkdown,