@dudousxd/nestjs-codegen 0.26.0 → 0.27.1

package/dist/cli/main.js

@@ -83,12 +83,33 @@ function validateUserConfig(userConfig) {
       "validation adapter is required \u2014 install @dudousxd/nestjs-codegen-zod and pass zodAdapter, or use @dudousxd/nestjs-codegen-valibot / -arktype"
     );
   }
-  if (userConfig.pages && typeof userConfig.pages.glob !== "string") {
+  if (userConfig.pages && !isGlobInput(userConfig.pages.glob)) {
     throw new ConfigError(
-      "Config validation failed: `pages.glob` must be a string when `pages` is set"
+      "Config validation failed: `pages.glob` must be a string or a non-empty array of strings when `pages` is set"
+    );
+  }
+  for (const [scope, scopeConfig] of Object.entries(userConfig.pages?.scopes ?? {})) {
+    if (scope === "default") {
+      throw new ConfigError(
+        'Config validation failed: `pages.scopes` cannot declare "default" \u2014 the default app is `pages.glob` (InertiaModule.forRoot).'
+      );
+    }
+    if (!isGlobInput(scopeConfig?.glob)) {
+      throw new ConfigError(
+        `Config validation failed: \`pages.scopes.${scope}.glob\` must be a string or a non-empty array of strings`
+      );
+    }
+  }
+  if (userConfig.scopes && Object.keys(userConfig.scopes).length > 0) {
+    console.warn(
+      "[nestjs-codegen] The top-level `scopes` option has no effect and is deprecated. For several Inertia apps use `pages.scopes` (one entry per InertiaModule.forFeature scope); for several controller sets use one `contracts.glob` (e.g. a brace glob)."
     );
   }
 }
+function isGlobInput(value) {
+  if (typeof value === "string") return true;
+  return Array.isArray(value) && value.length > 0 && value.every((glob) => typeof glob === "string");
+}
 function applyDefaults(userConfig, cwd) {
   validateUserConfig(userConfig);
   const outDir = userConfig.codegen?.outDir ? resolveAbsolute(cwd, userConfig.codegen.outDir) : join(cwd, ".nestjs-codegen");
@@ -115,7 +136,17 @@ function applyDefaults(userConfig, cwd) {
     pages: userConfig.pages ? {
       glob: userConfig.pages.glob,
       propsExport: userConfig.pages.propsExport ?? "ComponentProps",
-      componentNameStrategy: userConfig.pages.componentNameStrategy ?? "relative-no-ext"
+      componentNameStrategy: userConfig.pages.componentNameStrategy ?? "relative-no-ext",
+      scopes: Object.fromEntries(
+        Object.entries(userConfig.pages.scopes ?? {}).map(([scope, scopeConfig]) => [
+          scope,
+          {
+            glob: scopeConfig.glob,
+            prefix: scopeConfig.prefix ?? `${scope}/`,
+            componentNameStrategy: scopeConfig.componentNameStrategy ?? userConfig.pages?.componentNameStrategy ?? "relative-no-ext"
+          }
+        ])
+      )
     } : null,
     contracts: {
       glob: userConfig.contracts?.glob ?? "src/**/*.controller.ts",
@@ -189,26 +220,84 @@ import { dirname as dirname4, join as join14 } from "path";
 
 // src/discovery/pages.ts
 import { readFile } from "fs/promises";
-import { join as join2, relative as relative2 } from "path";
+import { join as join2, relative as relative2, sep as sep2 } from "path";
 import fg from "fast-glob";
 var NON_PAGE_FILE_RE = /\.(?:test|spec|stories|story)\.(?:tsx?|jsx?|vue|svelte)$/i;
+var MAGIC_SEGMENT_RE = /[*?{}[\]()!]/;
+function globStaticBase(glob) {
+  const segments = glob.split("/");
+  const staticSegments = [];
+  for (const segment of segments.slice(0, -1)) {
+    if (MAGIC_SEGMENT_RE.test(segment)) break;
+    staticSegments.push(segment);
+  }
+  return staticSegments.join("/");
+}
 async function discoverPages(opts) {
-  const allFiles = await fg(opts.glob, { cwd: opts.cwd, absolute: true });
-  const files = allFiles.filter((f) => !NON_PAGE_FILE_RE.test(f));
-  files.sort();
-  const globStatic = opts.glob.split("*")[0]?.replace(/\/$/, "") ?? "";
-  const pagesBase = join2(opts.cwd, globStatic);
+  const globs = typeof opts.glob === "string" ? [opts.glob] : opts.glob;
+  const prefix = opts.prefix ?? "";
+  const scope = opts.scope ?? "default";
+  const seenFiles = /* @__PURE__ */ new Set();
   const out = [];
-  for (const file of files) {
-    const rel = relative2(opts.cwd, file);
-    const nameRel = relative2(pagesBase, file);
-    const name = computeName(nameRel, opts.componentNameStrategy);
-    const source = await readFile(file, "utf8");
-    const propsSource = extractPropsSource(source, opts.propsExport);
-    out.push({ name, absolutePath: file, relativePath: rel, propsSource });
+  for (const glob of globs) {
+    const files = (await fg(glob, { cwd: opts.cwd, absolute: true })).filter((f) => !NON_PAGE_FILE_RE.test(f) && !seenFiles.has(f)).sort();
+    const pagesBase = join2(opts.cwd, globStaticBase(glob));
+    for (const file of files) {
+      seenFiles.add(file);
+      const rel = relative2(opts.cwd, file);
+      const nameRel = relative2(pagesBase, file).split(sep2).join("/");
+      const name = `${prefix}${computeName(nameRel, opts.componentNameStrategy)}`;
+      const source = await readFile(file, "utf8");
+      const propsSource = extractPropsSource(source, opts.propsExport);
+      out.push({ name, absolutePath: file, relativePath: rel, propsSource, scope });
+    }
+  }
+  assertUniqueNames(out);
+  return out;
+}
+async function discoverPageScopes(config) {
+  const pages = config.pages;
+  if (!pages) return [];
+  const common = { cwd: config.codegen.cwd, propsExport: pages.propsExport };
+  const out = await discoverPages({
+    ...common,
+    glob: pages.glob,
+    componentNameStrategy: pages.componentNameStrategy
+  });
+  for (const [scope, scopeConfig] of Object.entries(pages.scopes ?? {})) {
+    out.push(
+      ...await discoverPages({
+        ...common,
+        glob: scopeConfig.glob,
+        componentNameStrategy: scopeConfig.componentNameStrategy,
+        prefix: scopeConfig.prefix,
+        scope
+      })
+    );
   }
+  assertUniqueNames(out);
   return out;
 }
+function allPageGlobs(config) {
+  if (!config.pages) return [];
+  const asList = (glob) => typeof glob === "string" ? [glob] : glob;
+  return [
+    ...asList(config.pages.glob),
+    ...Object.values(config.pages.scopes ?? {}).flatMap((scope) => asList(scope.glob))
+  ];
+}
+function assertUniqueNames(pages) {
+  const byName = /* @__PURE__ */ new Map();
+  for (const page of pages) {
+    const previous = byName.get(page.name);
+    if (previous) {
+      throw new Error(
+        `Two Inertia pages resolve to the component name "${page.name}": ${previous.relativePath} (scope "${previous.scope}") and ${page.relativePath} (scope "${page.scope}"). Give one of them another name, directory or scope prefix.`
+      );
+    }
+    byName.set(page.name, page);
+  }
+}
 function computeName(rel, strat) {
   if (typeof strat === "function") return strat(rel);
   const noExt = rel.replace(/\.(tsx?|vue|svelte)$/, "");
@@ -631,10 +720,11 @@ function resolveModuleSpecifier(moduleSpecifier, sourceFile, project) {
   }
   return [];
 }
-function resolveImportedType(name, sourceFile, project) {
+function resolveImportedType(name, sourceFile, project, seen = /* @__PURE__ */ new Set()) {
   for (const importDecl of sourceFile.getImportDeclarations()) {
-    const namedImport = importDecl.getNamedImports().find((n) => n.getName() === name);
+    const namedImport = importDecl.getNamedImports().find((n) => (n.getAliasNode()?.getText() ?? n.getName()) === name);
     if (!namedImport) continue;
+    const sourceName = namedImport.getName();
     const moduleSpecifier = importDecl.getModuleSpecifierValue();
     const candidates = resolveModuleSpecifier(moduleSpecifier, sourceFile, project);
     for (const candidate of candidates) {
@@ -646,17 +736,17 @@ function resolveImportedType(name, sourceFile, project) {
           continue;
         }
       }
-      const result = findTypeInFile(name, importedFile);
+      const result = findTypeInFile(sourceName, importedFile);
       if (result) return result;
-      const viaReExport = resolveReExportedType(name, importedFile, project, /* @__PURE__ */ new Set());
+      const viaReExport = resolveReExportedType(sourceName, importedFile, project, /* @__PURE__ */ new Set());
       if (viaReExport) return viaReExport;
     }
     if (candidates.length === 0) {
-      const viaCompiler = resolveBareSpecifierType(name, importDecl, project);
+      const viaCompiler = resolveBareSpecifierType(sourceName, importDecl, project);
       if (viaCompiler) return viaCompiler;
     }
   }
-  return resolveReExportedType(name, sourceFile, project, /* @__PURE__ */ new Set());
+  return resolveReExportedType(name, sourceFile, project, seen);
 }
 function resolveBareSpecifierType(name, importDecl, project) {
   let target;
@@ -671,9 +761,9 @@ function resolveBareSpecifierType(name, importDecl, project) {
   return resolveReExportedType(name, target, project, /* @__PURE__ */ new Set());
 }
 function resolveReExportedType(name, file, project, seen) {
-  const filePath = file.getFilePath();
-  if (seen.has(filePath)) return null;
-  seen.add(filePath);
+  const visit = `${file.getFilePath()}#${name}`;
+  if (seen.has(visit)) return null;
+  seen.add(visit);
   for (const exportDecl of file.getExportDeclarations()) {
     const moduleSpecifier = exportDecl.getModuleSpecifierValue();
     const namedExports = exportDecl.getNamedExports();
@@ -695,7 +785,7 @@ function resolveReExportedType(name, file, project, seen) {
     const sourceName = namedExports.find((n) => (n.getAliasNode()?.getText() ?? n.getName()) === name)?.getName() ?? name;
     const local = findTypeInFile(sourceName, file);
     if (local) return local;
-    const imported = resolveImportedType(sourceName, file, project);
+    const imported = resolveImportedType(sourceName, file, project, seen);
     if (imported) return imported;
   }
   return null;
@@ -4097,28 +4187,28 @@ function renderFetcherRequest(req, binaryResponse) {
 }
 function emitReqHelper() {
   return [
-    "/** Awaitable request handle. `await api.x.y({...})` runs the fetch; extensions add query/mutation helpers. */",
-    "type __Req<R> = {",
-    "  then<T1 = R, T2 = never>(",
+    "/** An awaitable request handle: a lazy, memoized `Promise` that also carries `fetch()` and the members extensions add. */",
+    "export type RequestHandle<R, M = {}> = Promise<R> & { fetch(): Promise<R> } & M;",
+    "class __Request<R> extends Promise<R> {",
+    "  static override get [Symbol.species](): PromiseConstructor {",
+    "    return Promise;",
+    "  }",
+    "  private __run: () => Promise<R>;",
+    "  private __p: Promise<R> | undefined;",
+    "  constructor(run: () => Promise<R>) {",
+    "    super(() => {});",
+    "    this.__run = run;",
+    "  }",
+    "  override then<T1 = R, T2 = never>(",
     "    onfulfilled?: ((value: R) => T1 | PromiseLike<T1>) | null,",
     "    onrejected?: ((reason: unknown) => T2 | PromiseLike<T2>) | null,",
-    "  ): Promise<T1 | T2>;",
-    "  catch<T = never>(onrejected?: ((reason: unknown) => T | PromiseLike<T>) | null): Promise<R | T>;",
-    "  finally(onfinally?: (() => void) | null): Promise<R>;",
-    "  fetch(): Promise<R>;",
-    "};",
-    "function __req<R>(run: () => Promise<R>): __Req<R> {",
-    "  let __p: Promise<R> | undefined;",
-    "  const __promise = () => {",
-    "    __p ??= run();",
-    "    return __p;",
-    "  };",
-    "  return {",
-    "    then: (onfulfilled, onrejected) => __promise().then(onfulfilled, onrejected),",
-    "    catch: (onrejected) => __promise().catch(onrejected),",
-    "    finally: (onfinally) => __promise().finally(onfinally),",
-    "    fetch: run,",
-    "  };",
+    "  ): Promise<T1 | T2> {",
+    "    this.__p ??= this.__run();",
+    "    return this.__p.then(onfulfilled, onrejected);",
+    "  }",
+    "}",
+    "function __req<R, M extends object = {}>(run: () => Promise<R>, members?: M): RequestHandle<R, M> {",
+    "  return Object.assign(new __Request<R>(run), { fetch: run }, members) as RequestHandle<R, M>;",
     "}",
     ""
   ];
@@ -4136,18 +4226,26 @@ function emitFilterFieldGuard() {
   ];
 }
 function renderLeaf(pad, objKey, req, requestExpr, members, streamExpr) {
-  const lines = [`${pad}${objKey}: (input?: ${req.inputType}) => ({`];
-  lines.push(`${pad}  ...__req<${req.responseType}>(() => ${requestExpr}),`);
+  const memberLines = [];
   if (req.filterFieldsExpr) {
-    lines.push(`${pad}  filterFields: ${req.filterFieldsExpr},`);
+    memberLines.push(`${pad}    filterFields: ${req.filterFieldsExpr},`);
   }
   if (streamExpr) {
-    lines.push(`${pad}  stream: () => ${streamExpr},`);
+    memberLines.push(`${pad}    stream: () => ${streamExpr},`);
   }
   for (const [name, value] of Object.entries(members)) {
-    lines.push(`${pad}  ${name}: ${value},`);
-  }
-  lines.push(`${pad}}),`);
+    memberLines.push(`${pad}    ${name}: ${value},`);
+  }
+  const body = [requestExpr, ...memberLines].join("\n");
+  const param = /\binput\b/.test(body) ? `input?: ${req.inputType}` : "";
+  const lines = [`${pad}${objKey}: (${param}) =>`];
+  if (memberLines.length === 0) {
+    lines.push(`${pad}  __req<${req.responseType}>(() => ${requestExpr}),`);
+    return lines;
+  }
+  lines.push(`${pad}  __req(() => ${requestExpr}, {`);
+  lines.push(...memberLines);
+  lines.push(`${pad}  }),`);
   return lines;
 }
 function renderStreamExpr(req) {
@@ -4281,6 +4379,23 @@ var EMPTY_PATH_NAMESPACE = [
 function isClientCallable(route) {
   return route.method.toUpperCase() !== "ALL";
 }
+var ROUTES_IMPORT_PLACEHOLDER = "/* @@routes-import@@ */";
+var ROUTES_EXPORTS = [
+  // Called, never mentioned in prose: match the call so a comment saying "route" doesn't count.
+  { name: "route", typeOnly: false },
+  { name: "ROUTES", typeOnly: false },
+  { name: "RouteName", typeOnly: true },
+  { name: "ExtractParams", typeOnly: true },
+  { name: "RouteParams", typeOnly: true }
+];
+function finishRoutesImport(lines) {
+  const body = lines.filter((l) => l !== ROUTES_IMPORT_PLACEHOLDER).join("\n");
+  const used = ROUTES_EXPORTS.filter(
+    ({ name }) => new RegExp(name === "route" ? "\\broute\\(" : `\\b${name}\\b`).test(body)
+  ).map(({ name, typeOnly }) => typeOnly ? `type ${name}` : name);
+  const importLine = used.length ? `import { ${used.join(", ")} } from './routes.js';` : null;
+  return lines.flatMap((l) => l === ROUTES_IMPORT_PLACEHOLDER ? importLine ? [importLine] : [] : [l]).join("\n");
+}
 function buildApiFile(routes, outDir, opts = {}) {
   const fetcherImportPath = opts.fetcherImportPath;
   const serialization = opts.serialization ?? "json";
@@ -4340,9 +4455,7 @@ function buildApiFile(routes, outDir, opts = {}) {
     for (const imp of ext.apiHeader?.(ctx)?.imports ?? []) pushImport(imp);
   }
   lines.push(...extImports);
-  lines.push(
-    "import { route, ROUTES, type RouteName, type ExtractParams, type RouteParams } from './routes.js';"
-  );
+  lines.push(ROUTES_IMPORT_PLACEHOLDER);
   const runtimeImport = fetcherImportPath ?? "@dudousxd/nestjs-client";
   lines.push(`import type { Fetcher } from '${runtimeImport}';`);
   if (serialization === "json" && contracted.length > 0) {
@@ -4393,7 +4506,7 @@ function buildApiFile(routes, outDir, opts = {}) {
         lines.push(...statements, "");
       }
     }
-    return lines.join("\n");
+    return finishRoutesImport(lines);
   }
   const tree = /* @__PURE__ */ new Map();
   for (const r of contracted) {
@@ -4446,7 +4559,7 @@ function buildApiFile(routes, outDir, opts = {}) {
       lines.push(...statements, "");
     }
   }
-  return lines.join("\n");
+  return finishRoutesImport(lines);
 }
 
 // src/emit/emit-cache.ts
@@ -4459,6 +4572,7 @@ async function emitCache(pages, outDir) {
       const s = await stat(p.absolutePath);
       return {
         name: p.name,
+        scope: p.scope ?? "default",
         relativePath: p.relativePath,
         mtime: s.mtime.toISOString()
       };
@@ -5250,10 +5364,11 @@ async function emitPages(pages, outDir, _options = {}) {
   }).join("\n");
   const propsHelper = "\nexport type InertiaProps<K extends InertiaPageName> = import('@dudousxd/nestjs-inertia').InertiaPages[K];\n";
   const sharedPropsBlock = buildSharedPropsBlock(_options.sharedProps ?? null);
+  const scopesBlock = buildScopesBlock(pages);
   const content = `// Generated by @dudousxd/nestjs-codegen. Do not edit.
 
 export type InertiaPageName = ${pageNameUnion};
-${propsHelper}
+${propsHelper}${scopesBlock}
 declare module '@dudousxd/nestjs-inertia' {
   interface InertiaPages {
 ${augBody}
@@ -5262,6 +5377,31 @@ ${sharedPropsBlock}}
 `;
   await writeFile7(join11(outDir, "pages.d.ts"), content, "utf8");
 }
+function buildScopesBlock(pages) {
+  const byScope = /* @__PURE__ */ new Map();
+  for (const page of pages) {
+    const scope = page.scope ?? "default";
+    const names = byScope.get(scope) ?? [];
+    names.push(JSON.stringify(page.name));
+    byScope.set(scope, names);
+  }
+  if (![...byScope.keys()].some((scope) => scope !== "default")) return "";
+  if (!byScope.has("default")) byScope.set("default", []);
+  const scopes = ["default", ...[...byScope.keys()].filter((s) => s !== "default")];
+  const body = scopes.map((scope) => {
+    const key = needsQuotes(scope) ? JSON.stringify(scope) : scope;
+    const names = byScope.get(scope) ?? [];
+    return `  ${key}: ${names.length ? names.join(" | ") : "never"};`;
+  }).join("\n");
+  return `
+/** The page names of each Inertia app: \`default\` (forRoot) and every \`pages.scopes\` entry. */
+export interface InertiaScopePages {
+${body}
+}
+
+export type InertiaScopePageName<S extends keyof InertiaScopePages> = InertiaScopePages[S];
+`;
+}
 function buildSharedPropsBlock(sharedProps) {
   if (!sharedProps) return "";
   if (sharedProps.isImportRef) {
@@ -5469,8 +5609,7 @@ function diffConfigKeyHashes(previous, current) {
   return [...keys].filter((key) => previous[key] !== current[key]).sort();
 }
 async function discoverInputFiles(config) {
-  const globs = [config.contracts.glob, config.forms.watch];
-  if (config.pages) globs.push(config.pages.glob);
+  const globs = [config.contracts.glob, config.forms.watch, ...allPageGlobs(config)];
   const cwd = config.codegen.cwd;
   const matched = await fg3(globs, { cwd, absolute: true, onlyFiles: true });
   return [...new Set(matched)].sort();
@@ -5601,12 +5740,7 @@ async function generate(config, inputRoutes = [], entryPoint = "cli") {
   }
   if (config.pages) {
     const pagesConfig = config.pages;
-    const pages = await discoverPages({
-      glob: pagesConfig.glob,
-      cwd: config.codegen.cwd,
-      propsExport: pagesConfig.propsExport,
-      componentNameStrategy: pagesConfig.componentNameStrategy
-    });
+    const pages = await discoverPageScopes(config);
     const sharedProps = discoverSharedPropsFromConfig(config);
     await emitPages(pages, config.codegen.outDir, {
       propsExport: pagesConfig.propsExport,
@@ -5781,12 +5915,17 @@ async function watch(config, onChange, options = {}) {
     await runInitialPass();
   }
   let pagesDebounceTimer;
-  const pagesGlob = config.pages?.glob ?? ".nestjs-codegen-no-pages";
-  const pagesWatcher = chokidar.watch(join16(config.codegen.cwd, pagesGlob), {
-    ignoreInitial: true,
-    persistent: true,
-    awaitWriteFinish: { stabilityThreshold: 80, pollInterval: 20 }
-  });
+  const pageGlobs = allPageGlobs(config);
+  const pagesWatcher = chokidar.watch(
+    (pageGlobs.length ? pageGlobs : [".nestjs-codegen-no-pages"]).map(
+      (glob) => join16(config.codegen.cwd, glob)
+    ),
+    {
+      ignoreInitial: true,
+      persistent: true,
+      awaitWriteFinish: { stabilityThreshold: 80, pollInterval: 20 }
+    }
+  );
   function schedulePagesRegenerate() {
     if (pagesDebounceTimer !== void 0) {
       clearTimeout(pagesDebounceTimer);
@@ -5866,7 +6005,7 @@ async function watch(config, onChange, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "0.26.0";
+var VERSION = "0.27.1";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {