@dudousxd/nestjs-codegen 0.16.0 → 0.17.1

package/dist/cli/main.js

@@ -514,9 +514,10 @@ function inferExpressionType(node) {
 
 // src/emit/emit-api.ts
 import { mkdir, writeFile } from "fs/promises";
-import { isAbsolute as isAbsolute2, join as join4, relative as relative3 } from "path";
+import { isAbsolute as isAbsolute2, join as join4, relative as relative4 } from "path";
 
 // src/extension/registry.ts
+import { relative as relative3, resolve as resolve2 } from "path";
 import { Project as Project2 } from "ts-morph";
 function resolveApiSlots(extensions) {
   let layer;
@@ -549,7 +550,7 @@ function mergeExclusive(target, incoming, {
     target.set(key, { value, owner });
   }
 }
-function createExtensionContext(config, getRoutes) {
+function createExtensionContext(config, getRoutes, trackedInputs) {
   let project;
   return {
     cwd: config.codegen.cwd,
@@ -558,6 +559,13 @@ function createExtensionContext(config, getRoutes) {
     get routes() {
       return getRoutes();
     },
+    trackInput(...paths) {
+      if (!trackedInputs) return;
+      for (const path of paths) {
+        if (!path) continue;
+        trackedInputs.add(relative3(config.codegen.cwd, resolve2(config.codegen.cwd, path)));
+      }
+    },
     project() {
       if (!project) {
         project = new Project2({
@@ -725,7 +733,7 @@ function rawResponseType(c, outDir) {
     return c.contractSource.response;
   }
   if (c.controllerRef) {
-    let relPath = relative3(outDir, c.controllerRef.filePath).replace(/\.ts$/, "");
+    let relPath = relative4(outDir, c.controllerRef.filePath).replace(/\.ts$/, "");
     if (!relPath.startsWith(".")) relPath = `./${relPath}`;
     return `Awaited<ReturnType<import('${relPath}').${c.controllerRef.className}['${c.controllerRef.methodName}']>>`;
   }
@@ -1051,6 +1059,11 @@ function buildApiFile(routes, outDir, opts = {}) {
     config: {},
     project: () => {
       throw new Error("ExtensionContext.project() is unavailable in standalone emitApi.");
+    },
+    // No manifest is written on the standalone path, so there is nothing for
+    // tracked dependencies to be recorded into — accept and discard them
+    // rather than making every caller supply a sink.
+    trackInput: () => {
     }
   };
   const importsByFile = /* @__PURE__ */ new Map();
@@ -1107,7 +1120,7 @@ function buildApiFile(routes, outDir, opts = {}) {
     for (const [filePath, names] of importsByFile) {
       let relPath;
       if (isAbsolute2(filePath)) {
-        relPath = relative3(outDir, filePath).replace(/\.ts$/, "");
+        relPath = relative4(outDir, filePath).replace(/\.ts$/, "");
         if (!relPath.startsWith(".")) relPath = `./${relPath}`;
       } else {
         relPath = filePath;
@@ -1221,7 +1234,7 @@ async function emitCache(pages, outDir) {
 
 // src/emit/emit-forms.ts
 import { mkdir as mkdir3, writeFile as writeFile3 } from "fs/promises";
-import { join as join6, relative as relative4 } from "path";
+import { join as join6, relative as relative5 } from "path";
 async function emitForms(routes, outDir, config, adapter) {
   if (config && config.enabled === false) return false;
   const content = buildFormsFileWithAdapter(routes, outDir, adapter, config);
@@ -1240,7 +1253,7 @@ function deriveBaseName(routeName) {
   return { method, full };
 }
 function relImport(outDir, filePath) {
-  let relPath = relative4(outDir, filePath).replace(/\.ts$/, "");
+  let relPath = relative5(outDir, filePath).replace(/\.ts$/, "");
   if (!relPath.startsWith(".")) relPath = `./${relPath}`;
   return relPath;
 }
@@ -1988,7 +2001,7 @@ async function emitOpenApi(routes, outDir, opts = {}) {
 
 // src/emit/emit-pages.ts
 import { mkdir as mkdir7, writeFile as writeFile7 } from "fs/promises";
-import { join as join10, relative as relative5 } from "path";
+import { join as join10, relative as relative6 } from "path";
 async function emitPages(pages, outDir, _options = {}) {
   await mkdir7(outDir, { recursive: true });
   const pageNameUnion = pages.length > 0 ? pages.map((p) => JSON.stringify(p.name)).join(" | ") : "never";
@@ -2028,7 +2041,7 @@ ${propsBody}
 `;
 }
 function buildAugmentationType(page, outDir) {
-  let importPath = relative5(outDir, page.absolutePath).replace(/\.(tsx?|vue|svelte)$/, "");
+  let importPath = relative6(outDir, page.absolutePath).replace(/\.(tsx?|vue|svelte)$/, "");
   if (!importPath.startsWith(".")) {
     importPath = `./${importPath}`;
   }
@@ -2159,7 +2172,7 @@ function buildEmpty() {
 // src/generate-manifest.ts
 import { createHash } from "crypto";
 import { readFile as readFile2, readdir, writeFile as writeFile9 } from "fs/promises";
-import { join as join12, relative as relative6 } from "path";
+import { join as join12, relative as relative7 } from "path";
 import fg2 from "fast-glob";
 var MANIFEST_FILE = ".codegen-manifest.json";
 var LOCK_FILE = ".watcher.lock";
@@ -2182,6 +2195,9 @@ function isManifestShape(value) {
   if (candidate.configKeyHashes !== void 0 && !isStringRecord(candidate.configKeyHashes)) {
     return false;
   }
+  if (candidate.extraInputs !== void 0 && (!Array.isArray(candidate.extraInputs) || !candidate.extraInputs.every((entry) => typeof entry === "string"))) {
+    return false;
+  }
   if (!Array.isArray(candidate.files)) return false;
   return candidate.files.every((entry) => typeof entry === "string");
 }
@@ -2221,21 +2237,30 @@ async function discoverInputFiles(config) {
   const matched = await fg2(globs, { cwd, absolute: true, onlyFiles: true });
   return [...new Set(matched)].sort();
 }
-async function computeInputsHash(config) {
+async function computeInputsHash(config, extraInputs = []) {
   const hash = createHash("sha256");
   hash.update(`version:${VERSION}
 `);
   hash.update(`config:${serializeConfig(config)}
 `);
-  const inputFiles = await discoverInputFiles(config);
   const cwd = config.codegen.cwd;
-  for (const file of inputFiles) {
+  const globbed = await discoverInputFiles(config);
+  const globbedRelative = new Set(globbed.map((file) => relative7(cwd, file)));
+  const extra = [...new Set(extraInputs)].filter((file) => !globbedRelative.has(file)).sort();
+  for (const file of globbed) {
     const contents = await readFile2(file, "utf8");
-    hash.update(`file:${relative6(cwd, file)}
+    hash.update(`file:${relative7(cwd, file)}
 `);
     hash.update(contents);
     hash.update("\n");
   }
+  for (const file of extra) {
+    const contents = await readFile2(join12(cwd, file), "utf8").catch(() => null);
+    hash.update(`extra:${file}
+`);
+    hash.update(contents ?? "\0missing");
+    hash.update("\n");
+  }
   return hash.digest("hex");
 }
 async function readManifest(outDir) {
@@ -2249,6 +2274,7 @@ async function readManifest(outDir) {
       ...parsed.entryPoint ? { entryPoint: parsed.entryPoint } : {},
       ...parsed.configHash ? { configHash: parsed.configHash } : {},
       ...parsed.configKeyHashes ? { configKeyHashes: parsed.configKeyHashes } : {},
+      ...parsed.extraInputs ? { extraInputs: parsed.extraInputs } : {},
       files: parsed.files
     };
   } catch {
@@ -2271,7 +2297,7 @@ async function listOutputFiles(outDir) {
       if (entry.isDirectory()) {
         await walk(abs);
       } else if (entry.isFile()) {
-        const rel = relative6(outDir, abs);
+        const rel = relative7(outDir, abs);
         if (rel === MANIFEST_FILE || rel === LOCK_FILE) continue;
         found.push(rel);
       }
@@ -2308,8 +2334,8 @@ function driftGuardMessage(outDir, previousEntryPoint, currentEntryPoint, differ
 }
 async function generate(config, inputRoutes = [], entryPoint = "cli") {
   setCodegenDebug(config.debug);
-  const inputsHash = await computeInputsHash(config);
   const manifest = await readManifest(config.codegen.outDir);
+  const inputsHash = await computeInputsHash(config, manifest?.extraInputs ?? []);
   if (await isManifestFresh(config.codegen.outDir, manifest, inputsHash)) {
     console.log(`[nestjs-codegen] ${config.codegen.outDir} up to date, skipped`);
     return;
@@ -2330,7 +2356,8 @@ async function generate(config, inputRoutes = [], entryPoint = "cli") {
   }
   const extensions = config.extensions ?? [];
   let routes = inputRoutes;
-  const ctx = createExtensionContext(config, () => routes);
+  const trackedInputs = /* @__PURE__ */ new Set();
+  const ctx = createExtensionContext(config, () => routes, trackedInputs);
   if (extensions.length > 0) {
     routes = await applyTransformRoutes(routes, extensions, ctx);
   }
@@ -2390,13 +2417,16 @@ async function generate(config, inputRoutes = [], entryPoint = "cli") {
     }
   }
   const outputFiles = await listOutputFiles(config.codegen.outDir);
+  const extraInputs = [...trackedInputs].sort();
+  const recordedHash = extraInputs.length > 0 ? await computeInputsHash(config, extraInputs) : inputsHash;
   await writeManifest(config.codegen.outDir, {
     version: VERSION,
-    hash: inputsHash,
+    hash: recordedHash,
     entryPoint,
     configHash,
     configKeyHashes,
-    files: outputFiles
+    files: outputFiles,
+    ...extraInputs.length > 0 ? { extraInputs } : {}
   });
 }
 
@@ -2406,7 +2436,7 @@ import { join as join16 } from "path";
 import chokidar from "chokidar";
 
 // src/discovery/contracts-fast.ts
-import { join as join14, resolve as resolve3 } from "path";
+import { join as join14, resolve as resolve4 } from "path";
 import fg3 from "fast-glob";
 import {
   Node as Node9,
@@ -2426,7 +2456,7 @@ import {
 
 // src/discovery/type-ref-resolution.ts
 import { readFileSync } from "fs";
-import { dirname as dirname3, resolve as resolve2 } from "path";
+import { dirname as dirname3, resolve as resolve3 } from "path";
 import {
   Node as Node2
 } from "ts-morph";
@@ -2483,9 +2513,9 @@ function resolveModuleSpecifier(moduleSpecifier, sourceFile, project) {
     const dir = dirname3(sourceFile.getFilePath());
     const noExt = moduleSpecifier.replace(/\.(js|ts)$/, "");
     return [
-      resolve2(dir, `${noExt}.ts`),
-      resolve2(dir, `${moduleSpecifier}.ts`),
-      resolve2(dir, moduleSpecifier, "index.ts")
+      resolve3(dir, `${noExt}.ts`),
+      resolve3(dir, `${moduleSpecifier}.ts`),
+      resolve3(dir, moduleSpecifier, "index.ts")
     ];
   }
   const ctx = _ctxFor(project);
@@ -2506,8 +2536,8 @@ function resolveModuleSpecifier(moduleSpecifier, sourceFile, project) {
         const rest = moduleSpecifier.slice(prefix.length);
         const candidates = [];
         for (const mapping of mappings) {
-          const resolved = resolve2(baseUrl, mapping.replace("*", rest));
-          candidates.push(`${resolved}.ts`, resolve2(resolved, "index.ts"));
+          const resolved = resolve3(baseUrl, mapping.replace("*", rest));
+          candidates.push(`${resolved}.ts`, resolve3(resolved, "index.ts"));
         }
         dbg("  resolved candidates:", candidates);
         return candidates;
@@ -4154,6 +4184,19 @@ function resolveParamClass(method, decoratorName, sourceFile, project) {
 
 // src/discovery/heritage.ts
 import { Node as Node7, Project as Project3 } from "ts-morph";
+function resolveHeritageCall(node) {
+  if (!node) return void 0;
+  const expr = unwrapExpression(node);
+  if (Node7.isCallExpression(expr)) return expr;
+  if (!Node7.isIdentifier(expr)) return void 0;
+  const decl = expr.getDefinitions().map((d) => d.getDeclarationNode()).find(
+    (n) => n !== void 0 && Node7.isVariableDeclaration(n)
+  );
+  const init = decl?.getInitializer();
+  if (!init) return void 0;
+  const unwrapped = unwrapExpression(init);
+  return Node7.isCallExpression(unwrapped) ? unwrapped : void 0;
+}
 function unwrapExpression(node) {
   let current = node;
   while (Node7.isAsExpression(current) || Node7.isSatisfiesExpression(current) || Node7.isParenthesizedExpression(current) || Node7.isTypeAssertion(current)) {
@@ -4181,8 +4224,8 @@ function resolveReturnedClass(factoryDecl) {
   return void 0;
 }
 function resolveInheritedMethods(cls) {
-  const expr = cls.getExtends()?.getExpression();
-  if (!expr || !Node7.isCallExpression(expr)) return void 0;
+  const expr = resolveHeritageCall(cls.getExtends()?.getExpression());
+  if (!expr) return void 0;
   const callee = expr.getExpression();
   if (!Node7.isIdentifier(callee)) return void 0;
   const factoryDecl = callee.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => Node7.isFunctionDeclaration(n));
@@ -4371,7 +4414,7 @@ async function discoverContractsFast(opts) {
   return extractAllRoutes(project);
 }
 function resolveTsconfigPath(cwd, tsconfig) {
-  return tsconfig ? resolve3(tsconfig) : join14(cwd, "tsconfig.json");
+  return tsconfig ? resolve4(tsconfig) : join14(cwd, "tsconfig.json");
 }
 function createDiscoveryProject(tsconfigPath) {
   try {
@@ -4457,7 +4500,7 @@ var PersistentDiscovery = class _PersistentDiscovery {
   async rediscover(changedPaths) {
     if (changedPaths) {
       for (const p of changedPaths) {
-        const abs = resolve3(p);
+        const abs = resolve4(p);
         const sf = this.project.getSourceFile(abs);
         if (sf) {
           await sf.refreshFromFileSystem();
@@ -4737,9 +4780,11 @@ function extractFromSourceFile(sourceFile, project) {
       factoryFilePath: inherited.factoryFilePath,
       classArgs: inherited.classArgs
     } : void 0;
+    const ownMethods = cls.getMethods();
+    const ownNames = new Set(ownMethods.map((m) => m.getName()));
     const methods = [
-      ...cls.getMethods().map((method) => ({ method })),
-      ...(inherited?.methods ?? []).map((method) => ({ method, mixin: mixinBinding }))
+      ...ownMethods.map((method) => ({ method, mixin: mixinBinding })),
+      ...(inherited?.methods ?? []).filter((method) => !ownNames.has(method.getName())).map((method) => ({ method, mixin: mixinBinding }))
     ];
     for (const { method, mixin } of methods) {
       const verb = resolveVerb(method);
@@ -4965,7 +5010,7 @@ async function watch(config, onChange, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "0.16.0";
+var VERSION = "0.17.1";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {
@@ -4973,9 +5018,9 @@ async function runCodegen(opts = {}) {
   const config = await loadConfig(cwd);
   if (opts.watch) {
     const watcher = await watch(config, void 0, { entryPoint: "cli" });
-    await new Promise((resolve4) => {
+    await new Promise((resolve5) => {
       function onSignal() {
-        watcher.close().then(resolve4).catch(resolve4);
+        watcher.close().then(resolve5).catch(resolve5);
       }
       process.once("SIGINT", onSignal);
       process.once("SIGTERM", onSignal);
@@ -5105,16 +5150,16 @@ async function detectPackageManager(cwd) {
 }
 async function promptFramework() {
   if (!process.stdin.isTTY) return "react";
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     const rl = createInterface({ input: process.stdin, output: process.stdout });
     rl.question(
       "[nestjs-codegen] Which frontend framework? (react/vue/svelte) [react]: ",
       (answer) => {
         rl.close();
         const trimmed = answer.trim().toLowerCase();
-        if (trimmed === "vue") resolve4("vue");
-        else if (trimmed === "svelte") resolve4("svelte");
-        else resolve4("react");
+        if (trimmed === "vue") resolve5("vue");
+        else if (trimmed === "svelte") resolve5("svelte");
+        else resolve5("react");
       }
     );
   });