@open-mercato/cli 0.6.8-develop.7016.1.4ed7b1e49d → 0.6.8-develop.7020.1.d14d757582

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

@@ -320,6 +320,38 @@ function extractObjectPropertiesFromAst(sourceFile, exportName) {
   }
   return Object.keys(result).length > 0 ? result : null;
 }
+function namedObjectLiteralDeclaresProperty(sourceFile, exportName, propertyName) {
+  let source = "";
+  try {
+    source = fs.readFileSync(sourceFile, "utf8");
+  } catch {
+    return false;
+  }
+  const parsed = ts.createSourceFile(sourceFile, source, ts.ScriptTarget.Latest, true, inferScriptKind(sourceFile));
+  const exportedNames = /* @__PURE__ */ new Set();
+  for (const statement of parsed.statements) {
+    if (ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause) && !statement.moduleSpecifier) {
+      for (const element of statement.exportClause.elements) exportedNames.add(element.name.text);
+    }
+  }
+  for (const statement of parsed.statements) {
+    if (!ts.isVariableStatement(statement)) continue;
+    const exportsDirectly = (ts.canHaveModifiers(statement) ? ts.getModifiers(statement) : void 0)?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword);
+    for (const declaration of statement.declarationList.declarations) {
+      if (!ts.isIdentifier(declaration.name) || declaration.name.text !== exportName) continue;
+      if (!exportsDirectly && !exportedNames.has(exportName)) continue;
+      const objectLiteral2 = unwrapObjectLiteralExpression(declaration.initializer);
+      if (!objectLiteral2) return false;
+      return objectLiteral2.properties.some((property) => {
+        const name = property.name;
+        if (!name) return false;
+        const key = ts.isIdentifier(name) ? name.text : ts.isStringLiteral(name) ? name.text : null;
+        return key === propertyName;
+      });
+    }
+  }
+  return false;
+}
 function extractNamedObjectLiteralExport(sourceFile, exportName) {
   const literal = extractNamedObjectLiteralSource(sourceFile, exportName);
   if (literal) {
@@ -1238,6 +1270,7 @@ function normalizeWorkerMetadata(raw) {
   if (typeof source.concurrency === "number") normalized.concurrency = source.concurrency;
   if (typeof source.lockDuration === "number") normalized.lockDuration = source.lockDuration;
   if (typeof source.maxStalledCount === "number") normalized.maxStalledCount = source.maxStalledCount;
+  if (typeof source.onJobAbandoned === "function") normalized.hasJobAbandonedHook = true;
   return Object.keys(normalized).length > 0 ? normalized : null;
 }
 async function loadSubscriberMetadata(sourceFile) {
@@ -1246,7 +1279,12 @@ async function loadSubscriberMetadata(sourceFile) {
 }
 async function loadWorkerMetadata(sourceFile) {
   const sourceModule = await loadModuleExportsFromSource(sourceFile);
-  return normalizeWorkerMetadata(sourceModule?.metadata) ?? normalizeWorkerMetadata(extractNamedObjectLiteralExport(sourceFile, "metadata"));
+  const metadata = normalizeWorkerMetadata(sourceModule?.metadata) ?? normalizeWorkerMetadata(extractNamedObjectLiteralExport(sourceFile, "metadata"));
+  if (!metadata) return null;
+  if (!metadata.hasJobAbandonedHook && namedObjectLiteralDeclaresProperty(sourceFile, "metadata", "onJobAbandoned")) {
+    metadata.hasJobAbandonedHook = true;
+  }
+  return metadata;
 }
 async function discoverSubscribers(roots, imps, modId) {
   const subscribers = [];
@@ -1708,12 +1746,16 @@ function processSubscribers(discovered) {
   }
   return subscribers;
 }
+const ABANDON_HOOK_FACTORY = "createLazyModuleWorkerAbandonHook";
+function workersDeclareAbandonHook(discovered) {
+  return discovered.some(({ metadata }) => metadata.hasJobAbandonedHook === true);
+}
 function processWorkers(discovered) {
   const workers = [];
   for (const { id, importPath, metadata } of discovered) {
     const workerId = metadata.id ?? id;
     workers.push(
-      `{ id: ${toLiteral(workerId)}, queue: ${toLiteral(metadata.queue)}, concurrency: ${toLiteral(metadata.concurrency ?? 1)}${metadata.lockDuration === void 0 ? "" : `, lockDuration: ${toLiteral(metadata.lockDuration)}`}${metadata.maxStalledCount === void 0 ? "" : `, maxStalledCount: ${toLiteral(metadata.maxStalledCount)}`}, handler: createLazyModuleWorker(() => ${buildDynamicImportExpression(importPath)}, ${toLiteral(workerId)}) }`
+      `{ id: ${toLiteral(workerId)}, queue: ${toLiteral(metadata.queue)}, concurrency: ${toLiteral(metadata.concurrency ?? 1)}${metadata.lockDuration === void 0 ? "" : `, lockDuration: ${toLiteral(metadata.lockDuration)}`}${metadata.maxStalledCount === void 0 ? "" : `, maxStalledCount: ${toLiteral(metadata.maxStalledCount)}`}${metadata.hasJobAbandonedHook ? `, onJobAbandoned: ${ABANDON_HOOK_FACTORY}(() => ${buildDynamicImportExpression(importPath)}, ${toLiteral(workerId)})` : ""}, handler: createLazyModuleWorker(() => ${buildDynamicImportExpression(importPath)}, ${toLiteral(workerId)}) }`
     );
   }
   return workers;
@@ -1920,6 +1962,7 @@ function renderAstModuleRegistryFile(options) {
     namedImports: [
       { name: "createLazyModuleSubscriber" },
       { name: "createLazyModuleWorker" },
+      ...options.includeAbandonHookImport ? [{ name: ABANDON_HOOK_FACTORY }] : [],
       { name: "Module", isTypeOnly: true }
     ]
   });
@@ -2010,9 +2053,10 @@ function buildLazyRouteComponentExpression(importPath) {
   return `async (props: any) => { const mod = await ${buildDynamicImportExpression(importPath)}; const Component = (mod.default ?? mod) as any; return createElement(Component, props) }`;
 }
 function renderAstLegacyModuleRegistryOutput(options) {
+  const needsAbandonHookImport = options.includeAbandonHookImport || options.moduleEntries.some((entry) => entry.includes(ABANDON_HOOK_FACTORY));
   const importSection = [
     ...options.includeCreateElementImport ? ["import { createElement } from 'react'"] : [],
-    "import { createLazyModuleSubscriber, createLazyModuleWorker, type Module } from '@open-mercato/shared/modules/registry'",
+    needsAbandonHookImport ? "import { createLazyModuleSubscriber, createLazyModuleWorker, createLazyModuleWorkerAbandonHook, type Module } from '@open-mercato/shared/modules/registry'" : "import { createLazyModuleSubscriber, createLazyModuleWorker, type Module } from '@open-mercato/shared/modules/registry'",
     ...options.imports.map((entry) => serializeGeneratedImport(entry))
   ].join("\n");
   return `// AUTO-GENERATED by mercato generate registry
@@ -2279,6 +2323,13 @@ function processWorkersAst(discovered) {
         { name: "concurrency", value: metadata.concurrency ?? 1 },
         ...metadata.lockDuration === void 0 ? [] : [{ name: "lockDuration", value: metadata.lockDuration }],
         ...metadata.maxStalledCount === void 0 ? [] : [{ name: "maxStalledCount", value: metadata.maxStalledCount }],
+        ...metadata.hasJobAbandonedHook ? [{
+          name: "onJobAbandoned",
+          value: callExpression(identifier(ABANDON_HOOK_FACTORY), [
+            arrowFunction({ body: importExpression(importPath) }),
+            workerId
+          ])
+        }] : [],
         {
           name: "handler",
           value: callExpression(identifier("createLazyModuleWorker"), [
@@ -2588,6 +2639,7 @@ async function generateModuleRegistryFromDiscovery(options) {
   const requiresByModule = /* @__PURE__ */ new Map();
   const commandLoaderEntries = [];
   let hasRouteComponents = false;
+  let hasAbandonHookWorkers = false;
   const umesConflictSources = [];
   const seenBackendRoutePatterns = /* @__PURE__ */ new Map();
   for (const discovered of discovery.modules) {
@@ -2791,7 +2843,9 @@ async function generateModuleRegistryFromDiscovery(options) {
       extraImports: runtimeImports
     }));
     subscribers.push(...processSubscribers(await discovered.getSubscribers()));
-    workers.push(...processWorkers(await discovered.getWorkers()));
+    const discoveredWorkersForModule = await discovered.getWorkers();
+    if (workersDeclareAbandonHook(discoveredWorkersForModule)) hasAbandonHookWorkers = true;
+    workers.push(...processWorkers(discoveredWorkersForModule));
     {
       const parts = [];
       if (fieldsImportName)
@@ -2943,13 +2997,15 @@ async function generateModuleRegistryFromDiscovery(options) {
     fileName: "modules.generated.ts",
     imports,
     moduleEntries: moduleDecls,
-    includeCreateElementImport: hasRouteComponents
+    includeCreateElementImport: hasRouteComponents,
+    includeAbandonHookImport: hasAbandonHookWorkers
   });
   const runtimeOutput = renderAstLegacyModuleRegistryOutput({
     fileName: "modules.runtime.generated.ts",
     imports: runtimeImports,
     moduleEntries: runtimeModuleDecls,
-    includeCreateElementImport: true
+    includeCreateElementImport: true,
+    includeAbandonHookImport: hasAbandonHookWorkers
   });
   const frontendRoutesOutput = renderAstLegacyManifestOutput({
     fileName: "frontend-routes.generated.ts",
@@ -3137,6 +3193,7 @@ async function generateModuleRegistryAppFromDiscovery(options) {
   const requiresByModule = /* @__PURE__ */ new Map();
   const commandLoaderEntries = [];
   let hasRouteComponents = false;
+  let hasAbandonHookWorkers = false;
   const seenBackendRoutePatterns = /* @__PURE__ */ new Map();
   for (const discovered of discovery.modules) {
     const { modId, roots, imps, appImportBase } = discovered;
@@ -3282,7 +3339,9 @@ async function generateModuleRegistryAppFromDiscovery(options) {
       i18nLocaleShards.set(locale, shard);
     }
     subscribers.push(...processSubscribersAst(await discovered.getSubscribers()));
-    workers.push(...processWorkersAst(await discovered.getWorkers()));
+    const discoveredWorkersForModule = await discovered.getWorkers();
+    if (workersDeclareAbandonHook(discoveredWorkersForModule)) hasAbandonHookWorkers = true;
+    workers.push(...processWorkersAst(discoveredWorkersForModule));
     {
       dashboardWidgetsValue = buildModuleDashboardWidgetsValue(discovered.dashboardWidgetEntries);
     }
@@ -3399,19 +3458,22 @@ async function generateModuleRegistryAppFromDiscovery(options) {
     generator: "registry (app version)",
     imports,
     moduleEntries: moduleDecls,
-    includeCreateElementImport: hasRouteComponents
+    includeCreateElementImport: hasRouteComponents,
+    includeAbandonHookImport: hasAbandonHookWorkers
   });
   const bootstrapOutput = renderAstModuleRegistryFile({
     fileName: "modules.bootstrap.generated.ts",
     generator: "registry (bootstrap version)",
     imports: bootstrapImports,
-    moduleEntries: bootstrapModuleDecls
+    moduleEntries: bootstrapModuleDecls,
+    includeAbandonHookImport: hasAbandonHookWorkers
   });
   const i18nOutput = renderAstModuleRegistryFile({
     fileName: "modules.i18n.generated.ts",
     generator: "registry (i18n version)",
     imports: i18nImports,
-    moduleEntries: i18nModuleDecls
+    moduleEntries: i18nModuleDecls,
+    includeAbandonHookImport: hasAbandonHookWorkers
   });
   const legacyOutput = renderAstLegacyAliasFile({
     fileName: "bootstrap-modules.generated.ts",
@@ -3486,6 +3548,7 @@ async function generateModuleRegistryAppFromDiscovery(options) {
   return result;
 }
 async function generateModuleRegistryCliFromDiscovery(options) {
+  let hasAbandonHookWorkers = false;
   const { resolver, quiet = false } = options;
   const { discovery } = options;
   const result = createGeneratorResult();
@@ -3604,6 +3667,7 @@ async function generateModuleRegistryCliFromDiscovery(options) {
     subscribers.push(...processSubscribersAst(await discovered.getSubscribers()));
     const discoveredWorkers = await discovered.getWorkers();
     const workerGenerationEntries = collectWorkerGenerationEntries(discoveredWorkers, modId);
+    if (workersDeclareAbandonHook(discoveredWorkers)) hasAbandonHookWorkers = true;
     workers.push(...processWorkersAst(discoveredWorkers));
     devSupervisorWorkers.push(...workerGenerationEntries.map(({ importPath: _importPath, ...worker }) => worker));
     {
@@ -3720,7 +3784,8 @@ async function generateModuleRegistryCliFromDiscovery(options) {
     fileName: "modules.cli.generated.ts",
     generator: "registry (CLI version)",
     imports,
-    moduleEntries: moduleDecls
+    moduleEntries: moduleDecls,
+    includeAbandonHookImport: hasAbandonHookWorkers
   });
   const legacyOutput = renderAstLegacyAliasFile({
     fileName: "cli-modules.generated.ts",
@@ -3806,6 +3871,7 @@ export {
   generateModuleRegistryApp,
   generateModuleRegistryCli,
   hasNamedExport,
+  namedObjectLiteralDeclaresProperty,
   resetConventionWarnings,
   resolveNamedObjectExport,
   warnIfPageMetaMissingMetadataExport,