@open-mercato/cli 0.4.2-canary-eb5f87d5f9 → 0.4.2-canary-5035717565

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

@@ -10,15 +10,6 @@ import {
   logGenerationResult,
   createGeneratorResult
 } from "../utils.js";
-function findModuleFile(basePath, ...segments) {
-  const name = segments.pop();
-  const dir = segments.length ? path.join(basePath, ...segments) : basePath;
-  const tsPath = path.join(dir, `${name}.ts`);
-  if (fs.existsSync(tsPath)) return tsPath;
-  const jsPath = path.join(dir, `${name}.js`);
-  if (fs.existsSync(jsPath)) return jsPath;
-  return null;
-}
 async function generateModuleRegistry(options) {
   const { resolver, quiet = false } = options;
   const result = createGeneratorResult();
@@ -69,9 +60,9 @@ async function generateModuleRegistry(options) {
     const dashboardWidgets = [];
     const injectionWidgets = [];
     let injectionTableImportName = null;
-    const appIndex = findModuleFile(roots.appBase, "index");
-    const pkgIndex = findModuleFile(roots.pkgBase, "index");
-    const indexTs = appIndex ?? pkgIndex;
+    const appIndex = path.join(roots.appBase, "index.ts");
+    const pkgIndex = path.join(roots.pkgBase, "index.ts");
+    const indexTs = fs.existsSync(appIndex) ? appIndex : fs.existsSync(pkgIndex) ? pkgIndex : null;
     if (indexTs) {
       infoImportName = `I${importId++}_${toVar(modId)}`;
       const importPath = indexTs.startsWith(roots.appBase) ? `${appImportBase}/index` : `${imps.pkgBase}/index`;
@@ -170,10 +161,10 @@ async function generateModuleRegistry(options) {
       }
     }
     {
-      const appFile = findModuleFile(roots.appBase, "data", "extensions");
-      const pkgFile = findModuleFile(roots.pkgBase, "data", "extensions");
-      const hasApp = !!appFile;
-      const hasPkg = !!pkgFile;
+      const appFile = path.join(roots.appBase, "data", "extensions.ts");
+      const pkgFile = path.join(roots.pkgBase, "data", "extensions.ts");
+      const hasApp = fs.existsSync(appFile);
+      const hasPkg = fs.existsSync(pkgFile);
       if (hasApp || hasPkg) {
         const importName = `X_${toVar(modId)}_${importId++}`;
         const importPath = hasApp ? `${appImportBase}/data/extensions` : `${imps.pkgBase}/data/extensions`;
@@ -182,22 +173,22 @@ async function generateModuleRegistry(options) {
       }
     }
     {
-      const rootApp = findModuleFile(roots.appBase, "acl");
-      const rootPkg = findModuleFile(roots.pkgBase, "acl");
-      const hasRoot = rootApp || rootPkg;
+      const rootApp = path.join(roots.appBase, "acl.ts");
+      const rootPkg = path.join(roots.pkgBase, "acl.ts");
+      const hasRoot = fs.existsSync(rootApp) || fs.existsSync(rootPkg);
       if (hasRoot) {
         const importName = `ACL_${toVar(modId)}_${importId++}`;
-        const useApp = rootApp ?? rootPkg;
+        const useApp = fs.existsSync(rootApp) ? rootApp : rootPkg;
         const importPath = useApp.startsWith(roots.appBase) ? `${appImportBase}/acl` : `${imps.pkgBase}/acl`;
         imports.push(`import * as ${importName} from '${importPath}'`);
         featuresImportName = importName;
       }
     }
     {
-      const appFile = findModuleFile(roots.appBase, "ce");
-      const pkgFile = findModuleFile(roots.pkgBase, "ce");
-      const hasApp = !!appFile;
-      const hasPkg = !!pkgFile;
+      const appFile = path.join(roots.appBase, "ce.ts");
+      const pkgFile = path.join(roots.pkgBase, "ce.ts");
+      const hasApp = fs.existsSync(appFile);
+      const hasPkg = fs.existsSync(pkgFile);
       if (hasApp || hasPkg) {
         const importName = `CE_${toVar(modId)}_${importId++}`;
         const importPath = hasApp ? `${appImportBase}/ce` : `${imps.pkgBase}/ce`;
@@ -206,10 +197,10 @@ async function generateModuleRegistry(options) {
       }
     }
     {
-      const appFile = findModuleFile(roots.appBase, "search");
-      const pkgFile = findModuleFile(roots.pkgBase, "search");
-      const hasApp = !!appFile;
-      const hasPkg = !!pkgFile;
+      const appFile = path.join(roots.appBase, "search.ts");
+      const pkgFile = path.join(roots.pkgBase, "search.ts");
+      const hasApp = fs.existsSync(appFile);
+      const hasPkg = fs.existsSync(pkgFile);
       if (hasApp || hasPkg) {
         const importName = `SEARCH_${toVar(modId)}_${importId++}`;
         const importPath = hasApp ? `${appImportBase}/search` : `${imps.pkgBase}/search`;
@@ -220,10 +211,10 @@ async function generateModuleRegistry(options) {
       }
     }
     {
-      const appFile = findModuleFile(roots.appBase, "data", "fields");
-      const pkgFile = findModuleFile(roots.pkgBase, "data", "fields");
-      const hasApp = !!appFile;
-      const hasPkg = !!pkgFile;
+      const appFile = path.join(roots.appBase, "data", "fields.ts");
+      const pkgFile = path.join(roots.pkgBase, "data", "fields.ts");
+      const hasApp = fs.existsSync(appFile);
+      const hasPkg = fs.existsSync(pkgFile);
       if (hasApp || hasPkg) {
         const importName = `F_${toVar(modId)}_${importId++}`;
         const importPath = hasApp ? `${appImportBase}/data/fields` : `${imps.pkgBase}/data/fields`;
@@ -326,14 +317,12 @@ async function generateModuleRegistry(options) {
           if (e.isDirectory()) {
             if (e.name === "__tests__" || e.name === "__mocks__") continue;
             walk(path.join(dir, e.name), [...rel, e.name]);
-          } else if (e.isFile() && (e.name === "route.ts" || e.name === "route.js")) {
-            routeFiles.push([...rel, e.name].join("/"));
-          }
+          } else if (e.isFile() && e.name === "route.ts") routeFiles.push([...rel, e.name].join("/"));
         }
       };
       if (fs.existsSync(apiPkg)) walk(apiPkg);
       if (fs.existsSync(apiApp)) walk(apiApp);
-      const routeList = Array.from(new Set(routeFiles.map((f) => f.replace(/\.(ts|js)$/, ""))));
+      const routeList = Array.from(new Set(routeFiles));
       const isDynamicRoute = (p) => p.split("/").some((seg) => /\[|\[\[\.\.\./.test(seg));
       routeList.sort((a, b) => {
         const ad = isDynamicRoute(a) ? 1 : 0;
@@ -346,15 +335,12 @@ async function generateModuleRegistry(options) {
         segs.pop();
         const reqSegs = [modId, ...segs];
         const importName = `R${importId++}_${toVar(modId)}_${toVar(segs.join("_") || "index")}`;
-        const appFileTs = path.join(apiApp, ...segs, "route.ts");
-        const appFileJs = path.join(apiApp, ...segs, "route.js");
-        const fromApp = fs.existsSync(appFileTs) || fs.existsSync(appFileJs);
+        const appFile = path.join(apiApp, ...segs, "route.ts");
+        const fromApp = fs.existsSync(appFile);
         const apiSegPath = segs.join("/");
         const importPath = `${fromApp ? appImportBase : imps.pkgBase}/api${apiSegPath ? `/${apiSegPath}` : ""}/route`;
         const routePath = "/" + reqSegs.filter(Boolean).join("/");
-        const pkgFileTs = path.join(apiPkg, ...segs, "route.ts");
-        const pkgFileJs = path.join(apiPkg, ...segs, "route.js");
-        const sourceFile = fromApp ? fs.existsSync(appFileTs) ? appFileTs : appFileJs : fs.existsSync(pkgFileTs) ? pkgFileTs : pkgFileJs;
+        const sourceFile = fromApp ? appFile : path.join(apiPkg, ...segs, "route.ts");
         const hasOpenApi = await moduleHasExport(sourceFile, "openApi");
         const docsPart = hasOpenApi ? `, docs: ${importName}.openApi` : "";
         imports.push(`import * as ${importName} from '${importPath}'`);
@@ -368,30 +354,28 @@ async function generateModuleRegistry(options) {
             if (methodNames.has(e.name.toLowerCase())) continue;
             if (e.name === "__tests__" || e.name === "__mocks__") continue;
             walkPlain(path.join(dir, e.name), [...rel, e.name]);
-          } else if (e.isFile() && (e.name.endsWith(".ts") || e.name.endsWith(".js")) && !e.name.startsWith("route.")) {
-            if (/\.(test|spec)\.(ts|js)$/.test(e.name)) continue;
-            if (e.name.endsWith(".d.ts")) continue;
+          } else if (e.isFile() && e.name.endsWith(".ts") && e.name !== "route.ts") {
+            if (/\.(test|spec)\.ts$/.test(e.name)) continue;
             plainFiles.push([...rel, e.name].join("/"));
           }
         }
       };
       if (fs.existsSync(apiPkg)) walkPlain(apiPkg);
       if (fs.existsSync(apiApp)) walkPlain(apiApp);
-      const plainList = Array.from(new Set(plainFiles.map((f) => f.replace(/\.(ts|js)$/, ""))));
+      const plainList = Array.from(new Set(plainFiles));
       for (const rel of plainList) {
         const segs = rel.split("/");
-        const pathWithoutExt = segs.pop();
+        const file = segs.pop();
+        const pathWithoutExt = file.replace(/\.ts$/, "");
         const fullSegs = [...segs, pathWithoutExt];
         const routePath = "/" + [modId, ...fullSegs].filter(Boolean).join("/");
         const importName = `R${importId++}_${toVar(modId)}_${toVar(fullSegs.join("_") || "index")}`;
-        const appFileTs = path.join(apiApp, ...fullSegs) + ".ts";
-        const appFileJs = path.join(apiApp, ...fullSegs) + ".js";
-        const fromApp = fs.existsSync(appFileTs) || fs.existsSync(appFileJs);
+        const appFile = path.join(apiApp, ...fullSegs) + ".ts";
+        const fromApp = fs.existsSync(appFile);
         const plainSegPath = fullSegs.join("/");
         const importPath = `${fromApp ? appImportBase : imps.pkgBase}/api${plainSegPath ? `/${plainSegPath}` : ""}`;
-        const pkgFileTs = path.join(apiPkg, ...fullSegs) + ".ts";
-        const pkgFileJs = path.join(apiPkg, ...fullSegs) + ".js";
-        const sourceFile = fromApp ? fs.existsSync(appFileTs) ? appFileTs : appFileJs : fs.existsSync(pkgFileTs) ? pkgFileTs : pkgFileJs;
+        const pkgFile = path.join(apiPkg, ...fullSegs) + ".ts";
+        const sourceFile = fromApp ? appFile : pkgFile;
         const hasOpenApi = await moduleHasExport(sourceFile, "openApi");
         const docsPart = hasOpenApi ? `, docs: ${importName}.openApi` : "";
         imports.push(`import * as ${importName} from '${importPath}'`);
@@ -409,27 +393,25 @@ async function generateModuleRegistry(options) {
             if (e.isDirectory()) {
               if (e.name === "__tests__" || e.name === "__mocks__") continue;
               walk2(path.join(dir, e.name), [...rel, e.name]);
-            } else if (e.isFile() && (e.name.endsWith(".ts") || e.name.endsWith(".js"))) {
-              if (/\.(test|spec)\.(ts|js)$/.test(e.name)) continue;
-              if (e.name.endsWith(".d.ts")) continue;
+            } else if (e.isFile() && e.name.endsWith(".ts")) {
+              if (/\.(test|spec)\.ts$/.test(e.name)) continue;
               apiFiles.push([...rel, e.name].join("/"));
             }
           }
         };
         walk2(methodDir);
-        const methodList = Array.from(new Set(apiFiles.map((f) => f.replace(/\.(ts|js)$/, ""))));
+        const methodList = Array.from(new Set(apiFiles));
         for (const rel of methodList) {
           const segs = rel.split("/");
-          const pathWithoutExt = segs.pop();
+          const file = segs.pop();
+          const pathWithoutExt = file.replace(/\.ts$/, "");
           const fullSegs = [...segs, pathWithoutExt];
           const routePath = "/" + [modId, ...fullSegs].filter(Boolean).join("/");
           const importName = `H${importId++}_${toVar(modId)}_${toVar(method)}_${toVar(fullSegs.join("_"))}`;
           const fromApp = methodDir === appMethodDir;
           const importPath = `${fromApp ? appImportBase : imps.pkgBase}/api/${method.toLowerCase()}/${fullSegs.join("/")}`;
           const metaName = `RM${importId++}_${toVar(modId)}_${toVar(method)}_${toVar(fullSegs.join("_"))}`;
-          const sourceFileTs = path.join(methodDir, ...segs, `${pathWithoutExt}.ts`);
-          const sourceFileJs = path.join(methodDir, ...segs, `${pathWithoutExt}.js`);
-          const sourceFile = fs.existsSync(sourceFileTs) ? sourceFileTs : sourceFileJs;
+          const sourceFile = path.join(methodDir, ...segs, file);
           const hasOpenApi = await moduleHasExport(sourceFile, "openApi");
           const docsPart = hasOpenApi ? `, docs: ${metaName}.openApi` : "";
           imports.push(`import ${importName}, * as ${metaName} from '${importPath}'`);
@@ -437,9 +419,9 @@ async function generateModuleRegistry(options) {
         }
       }
     }
-    const cliApp = findModuleFile(roots.appBase, "cli");
-    const cliPkg = findModuleFile(roots.pkgBase, "cli");
-    const cliPath = cliApp ?? cliPkg;
+    const cliApp = path.join(roots.appBase, "cli.ts");
+    const cliPkg = path.join(roots.pkgBase, "cli.ts");
+    const cliPath = fs.existsSync(cliApp) ? cliApp : fs.existsSync(cliPkg) ? cliPkg : null;
     if (cliPath) {
       const importName = `CLI_${toVar(modId)}`;
       const importPath = cliPath.startsWith(roots.appBase) ? `${appImportBase}/cli` : `${imps.pkgBase}/cli`;
@@ -487,9 +469,8 @@ async function generateModuleRegistry(options) {
           if (e.isDirectory()) {
             if (e.name === "__tests__" || e.name === "__mocks__") continue;
             walk(path.join(dir, e.name), [...rel, e.name]);
-          } else if (e.isFile() && (e.name.endsWith(".ts") || e.name.endsWith(".js"))) {
-            if (/\.(test|spec)\.(ts|js)$/.test(e.name)) continue;
-            if (e.name.endsWith(".d.ts")) continue;
+          } else if (e.isFile() && e.name.endsWith(".ts")) {
+            if (/\.(test|spec)\.ts$/.test(e.name)) continue;
             found.push([...rel, e.name].join("/"));
           }
         }
@@ -500,12 +481,11 @@ async function generateModuleRegistry(options) {
       for (const rel of files) {
         const segs = rel.split("/");
         const file = segs.pop();
-        const name = file.replace(/\.(ts|js)$/, "");
+        const name = file.replace(/\.ts$/, "");
         const importName = `Subscriber${importId++}_${toVar(modId)}_${toVar([...segs, name].join("_") || "index")}`;
         const metaName = `SubscriberMeta${importId++}_${toVar(modId)}_${toVar([...segs, name].join("_") || "index")}`;
-        const appFileTs = path.join(subApp, ...segs, `${name}.ts`);
-        const appFileJs = path.join(subApp, ...segs, `${name}.js`);
-        const fromApp = fs.existsSync(appFileTs) || fs.existsSync(appFileJs);
+        const appFile = path.join(subApp, ...segs, `${name}.ts`);
+        const fromApp = fs.existsSync(appFile);
         const importPath = `${fromApp ? appImportBase : imps.pkgBase}/subscribers/${[...segs, name].join("/")}`;
         imports.push(`import ${importName}, * as ${metaName} from '${importPath}'`);
         const sid = [modId, ...segs, name].filter(Boolean).join(":");
@@ -524,9 +504,8 @@ async function generateModuleRegistry(options) {
             if (e.isDirectory()) {
               if (e.name === "__tests__" || e.name === "__mocks__") continue;
               walk(path.join(dir, e.name), [...rel, e.name]);
-            } else if (e.isFile() && (e.name.endsWith(".ts") || e.name.endsWith(".js"))) {
-              if (/\.(test|spec)\.(ts|js)$/.test(e.name)) continue;
-              if (e.name.endsWith(".d.ts")) continue;
+            } else if (e.isFile() && e.name.endsWith(".ts")) {
+              if (/\.(test|spec)\.ts$/.test(e.name)) continue;
               found.push([...rel, e.name].join("/"));
             }
           }
@@ -537,10 +516,9 @@ async function generateModuleRegistry(options) {
         for (const rel of files) {
           const segs = rel.split("/");
           const file = segs.pop();
-          const name = file.replace(/\.(ts|js)$/, "");
-          const appFileTs = path.join(wrkApp, ...segs, `${name}.ts`);
-          const appFileJs = path.join(wrkApp, ...segs, `${name}.js`);
-          const fromApp = fs.existsSync(appFileTs) || fs.existsSync(appFileJs);
+          const name = file.replace(/\.ts$/, "");
+          const appFile = path.join(wrkApp, ...segs, `${name}.ts`);
+          const fromApp = fs.existsSync(appFile);
           const importPath = `${fromApp ? appImportBase : imps.pkgBase}/workers/${[...segs, name].join("/")}`;
           if (!await moduleHasExport(importPath, "metadata")) continue;
           const importName = `Worker${importId++}_${toVar(modId)}_${toVar([...segs, name].join("_") || "index")}`;
@@ -841,9 +819,9 @@ async function generateModuleRegistryCli(options) {
     let customEntitiesImportName = null;
     let vectorImportName = null;
     let customFieldSetsExpr = "[]";
-    const appIndex = findModuleFile(roots.appBase, "index");
-    const pkgIndex = findModuleFile(roots.pkgBase, "index");
-    const indexTs = appIndex ?? pkgIndex;
+    const appIndex = path.join(roots.appBase, "index.ts");
+    const pkgIndex = path.join(roots.pkgBase, "index.ts");
+    const indexTs = fs.existsSync(appIndex) ? appIndex : fs.existsSync(pkgIndex) ? pkgIndex : null;
     if (indexTs) {
       infoImportName = `I${importId++}_${toVar(modId)}`;
       const importPath = indexTs.startsWith(roots.appBase) ? `${appImportBase}/index` : `${imps.pkgBase}/index`;
@@ -856,10 +834,10 @@ async function generateModuleRegistryCli(options) {
       }
     }
     {
-      const appFile = findModuleFile(roots.appBase, "data", "extensions");
-      const pkgFile = findModuleFile(roots.pkgBase, "data", "extensions");
-      const hasApp = !!appFile;
-      const hasPkg = !!pkgFile;
+      const appFile = path.join(roots.appBase, "data", "extensions.ts");
+      const pkgFile = path.join(roots.pkgBase, "data", "extensions.ts");
+      const hasApp = fs.existsSync(appFile);
+      const hasPkg = fs.existsSync(pkgFile);
       if (hasApp || hasPkg) {
         const importName = `X_${toVar(modId)}_${importId++}`;
         const importPath = hasApp ? `${appImportBase}/data/extensions` : `${imps.pkgBase}/data/extensions`;
@@ -868,22 +846,22 @@ async function generateModuleRegistryCli(options) {
       }
     }
     {
-      const rootApp = findModuleFile(roots.appBase, "acl");
-      const rootPkg = findModuleFile(roots.pkgBase, "acl");
-      const hasRoot = rootApp || rootPkg;
+      const rootApp = path.join(roots.appBase, "acl.ts");
+      const rootPkg = path.join(roots.pkgBase, "acl.ts");
+      const hasRoot = fs.existsSync(rootApp) || fs.existsSync(rootPkg);
       if (hasRoot) {
         const importName = `ACL_${toVar(modId)}_${importId++}`;
-        const useApp = rootApp ?? rootPkg;
+        const useApp = fs.existsSync(rootApp) ? rootApp : rootPkg;
         const importPath = useApp.startsWith(roots.appBase) ? `${appImportBase}/acl` : `${imps.pkgBase}/acl`;
         imports.push(`import * as ${importName} from '${importPath}'`);
         featuresImportName = importName;
       }
     }
     {
-      const appFile = findModuleFile(roots.appBase, "ce");
-      const pkgFile = findModuleFile(roots.pkgBase, "ce");
-      const hasApp = !!appFile;
-      const hasPkg = !!pkgFile;
+      const appFile = path.join(roots.appBase, "ce.ts");
+      const pkgFile = path.join(roots.pkgBase, "ce.ts");
+      const hasApp = fs.existsSync(appFile);
+      const hasPkg = fs.existsSync(pkgFile);
       if (hasApp || hasPkg) {
         const importName = `CE_${toVar(modId)}_${importId++}`;
         const importPath = hasApp ? `${appImportBase}/ce` : `${imps.pkgBase}/ce`;
@@ -892,10 +870,10 @@ async function generateModuleRegistryCli(options) {
       }
     }
     {
-      const appFile = findModuleFile(roots.appBase, "vector");
-      const pkgFile = findModuleFile(roots.pkgBase, "vector");
-      const hasApp = !!appFile;
-      const hasPkg = !!pkgFile;
+      const appFile = path.join(roots.appBase, "vector.ts");
+      const pkgFile = path.join(roots.pkgBase, "vector.ts");
+      const hasApp = fs.existsSync(appFile);
+      const hasPkg = fs.existsSync(pkgFile);
       if (hasApp || hasPkg) {
         const importName = `VECTOR_${toVar(modId)}_${importId++}`;
         const importPath = hasApp ? `${appImportBase}/vector` : `${imps.pkgBase}/vector`;
@@ -904,10 +882,10 @@ async function generateModuleRegistryCli(options) {
       }
     }
     {
-      const appFile = findModuleFile(roots.appBase, "data", "fields");
-      const pkgFile = findModuleFile(roots.pkgBase, "data", "fields");
-      const hasApp = !!appFile;
-      const hasPkg = !!pkgFile;
+      const appFile = path.join(roots.appBase, "data", "fields.ts");
+      const pkgFile = path.join(roots.pkgBase, "data", "fields.ts");
+      const hasApp = fs.existsSync(appFile);
+      const hasPkg = fs.existsSync(pkgFile);
       if (hasApp || hasPkg) {
         const importName = `F_${toVar(modId)}_${importId++}`;
         const importPath = hasApp ? `${appImportBase}/data/fields` : `${imps.pkgBase}/data/fields`;
@@ -915,9 +893,9 @@ async function generateModuleRegistryCli(options) {
         fieldsImportName = importName;
       }
     }
-    const cliApp = findModuleFile(roots.appBase, "cli");
-    const cliPkg = findModuleFile(roots.pkgBase, "cli");
-    const cliPath = cliApp ?? cliPkg;
+    const cliApp = path.join(roots.appBase, "cli.ts");
+    const cliPkg = path.join(roots.pkgBase, "cli.ts");
+    const cliPath = fs.existsSync(cliApp) ? cliApp : fs.existsSync(cliPkg) ? cliPkg : null;
     if (cliPath) {
       const importName = `CLI_${toVar(modId)}`;
       const importPath = cliPath.startsWith(roots.appBase) ? `${appImportBase}/cli` : `${imps.pkgBase}/cli`;
@@ -965,9 +943,8 @@ async function generateModuleRegistryCli(options) {
           if (e.isDirectory()) {
             if (e.name === "__tests__" || e.name === "__mocks__") continue;
             walk(path.join(dir, e.name), [...rel, e.name]);
-          } else if (e.isFile() && (e.name.endsWith(".ts") || e.name.endsWith(".js"))) {
-            if (/\.(test|spec)\.(ts|js)$/.test(e.name)) continue;
-            if (e.name.endsWith(".d.ts")) continue;
+          } else if (e.isFile() && e.name.endsWith(".ts")) {
+            if (/\.(test|spec)\.ts$/.test(e.name)) continue;
             found.push([...rel, e.name].join("/"));
           }
         }
@@ -978,12 +955,11 @@ async function generateModuleRegistryCli(options) {
       for (const rel of files) {
         const segs = rel.split("/");
         const file = segs.pop();
-        const name = file.replace(/\.(ts|js)$/, "");
+        const name = file.replace(/\.ts$/, "");
         const importName = `Subscriber${importId++}_${toVar(modId)}_${toVar([...segs, name].join("_") || "index")}`;
         const metaName = `SubscriberMeta${importId++}_${toVar(modId)}_${toVar([...segs, name].join("_") || "index")}`;
-        const appFileTs = path.join(subApp, ...segs, `${name}.ts`);
-        const appFileJs = path.join(subApp, ...segs, `${name}.js`);
-        const fromApp = fs.existsSync(appFileTs) || fs.existsSync(appFileJs);
+        const appFile = path.join(subApp, ...segs, `${name}.ts`);
+        const fromApp = fs.existsSync(appFile);
         const importPath = `${fromApp ? appImportBase : imps.pkgBase}/subscribers/${[...segs, name].join("/")}`;
         imports.push(`import ${importName}, * as ${metaName} from '${importPath}'`);
         const sid = [modId, ...segs, name].filter(Boolean).join(":");
@@ -1002,9 +978,8 @@ async function generateModuleRegistryCli(options) {
             if (e.isDirectory()) {
               if (e.name === "__tests__" || e.name === "__mocks__") continue;
               walk(path.join(dir, e.name), [...rel, e.name]);
-            } else if (e.isFile() && (e.name.endsWith(".ts") || e.name.endsWith(".js"))) {
-              if (/\.(test|spec)\.(ts|js)$/.test(e.name)) continue;
-              if (e.name.endsWith(".d.ts")) continue;
+            } else if (e.isFile() && e.name.endsWith(".ts")) {
+              if (/\.(test|spec)\.ts$/.test(e.name)) continue;
               found.push([...rel, e.name].join("/"));
             }
           }
@@ -1015,10 +990,9 @@ async function generateModuleRegistryCli(options) {
         for (const rel of files) {
           const segs = rel.split("/");
           const file = segs.pop();
-          const name = file.replace(/\.(ts|js)$/, "");
-          const appFileTs = path.join(wrkApp, ...segs, `${name}.ts`);
-          const appFileJs = path.join(wrkApp, ...segs, `${name}.js`);
-          const fromApp = fs.existsSync(appFileTs) || fs.existsSync(appFileJs);
+          const name = file.replace(/\.ts$/, "");
+          const appFile = path.join(wrkApp, ...segs, `${name}.ts`);
+          const fromApp = fs.existsSync(appFile);
           const importPath = `${fromApp ? appImportBase : imps.pkgBase}/workers/${[...segs, name].join("/")}`;
           if (!await moduleHasExport(importPath, "metadata")) continue;
           const importName = `Worker${importId++}_${toVar(modId)}_${toVar([...segs, name].join("_") || "index")}`;