@dudousxd/nestjs-codegen 0.15.0 → 0.17.0

package/dist/index.cjs

@@ -251,7 +251,7 @@ Run \`nestjs-codegen init\` to create a starter config.`
 
 // src/generate.ts
 var import_promises12 = require("fs/promises");
-var import_node_path13 = require("path");
+var import_node_path14 = require("path");
 
 // src/discovery/pages.ts
 var import_promises2 = require("fs/promises");
@@ -580,9 +580,10 @@ function inferExpressionType(node) {
 
 // src/emit/emit-api.ts
 var import_promises3 = require("fs/promises");
-var import_node_path4 = require("path");
+var import_node_path5 = require("path");
 
 // src/extension/registry.ts
+var import_node_path4 = require("path");
 var import_ts_morph2 = require("ts-morph");
 function resolveApiSlots(extensions) {
   let layer;
@@ -615,7 +616,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,
@@ -624,6 +625,13 @@ function createExtensionContext(config, getRoutes) {
     get routes() {
       return getRoutes();
     },
+    trackInput(...paths) {
+      if (!trackedInputs) return;
+      for (const path of paths) {
+        if (!path) continue;
+        trackedInputs.add((0, import_node_path4.relative)(config.codegen.cwd, (0, import_node_path4.resolve)(config.codegen.cwd, path)));
+      }
+    },
     project() {
       if (!project) {
         project = new import_ts_morph2.Project({
@@ -683,7 +691,7 @@ function requestShape(route) {
 async function emitApi(routes, outDir, opts = {}) {
   await (0, import_promises3.mkdir)(outDir, { recursive: true });
   const content = buildApiFile(routes, outDir, opts);
-  await (0, import_promises3.writeFile)((0, import_node_path4.join)(outDir, "api.ts"), content, "utf8");
+  await (0, import_promises3.writeFile)((0, import_node_path5.join)(outDir, "api.ts"), content, "utf8");
 }
 function splitName(name) {
   return name.split(".");
@@ -791,7 +799,7 @@ function rawResponseType(c, outDir) {
     return c.contractSource.response;
   }
   if (c.controllerRef) {
-    let relPath = (0, import_node_path4.relative)(outDir, c.controllerRef.filePath).replace(/\.ts$/, "");
+    let relPath = (0, import_node_path5.relative)(outDir, c.controllerRef.filePath).replace(/\.ts$/, "");
     if (!relPath.startsWith(".")) relPath = `./${relPath}`;
     return `Awaited<ReturnType<import('${relPath}').${c.controllerRef.className}['${c.controllerRef.methodName}']>>`;
   }
@@ -1117,6 +1125,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();
@@ -1172,8 +1185,8 @@ function buildApiFile(routes, outDir, opts = {}) {
     const emittedNames = /* @__PURE__ */ new Set();
     for (const [filePath, names] of importsByFile) {
       let relPath;
-      if ((0, import_node_path4.isAbsolute)(filePath)) {
-        relPath = (0, import_node_path4.relative)(outDir, filePath).replace(/\.ts$/, "");
+      if ((0, import_node_path5.isAbsolute)(filePath)) {
+        relPath = (0, import_node_path5.relative)(outDir, filePath).replace(/\.ts$/, "");
         if (!relPath.startsWith(".")) relPath = `./${relPath}`;
       } else {
         relPath = filePath;
@@ -1267,7 +1280,7 @@ function buildApiFile(routes, outDir, opts = {}) {
 
 // src/emit/emit-cache.ts
 var import_promises4 = require("fs/promises");
-var import_node_path5 = require("path");
+var import_node_path6 = require("path");
 async function emitCache(pages, outDir) {
   await (0, import_promises4.mkdir)(outDir, { recursive: true });
   const entries = await Promise.all(
@@ -1281,19 +1294,19 @@ async function emitCache(pages, outDir) {
     })
   );
   const cache = { pages: entries };
-  await (0, import_promises4.writeFile)((0, import_node_path5.join)(outDir, "components.json"), `${JSON.stringify(cache, null, 2)}
+  await (0, import_promises4.writeFile)((0, import_node_path6.join)(outDir, "components.json"), `${JSON.stringify(cache, null, 2)}
 `, "utf8");
 }
 
 // src/emit/emit-forms.ts
 var import_promises5 = require("fs/promises");
-var import_node_path6 = require("path");
+var import_node_path7 = require("path");
 async function emitForms(routes, outDir, config, adapter) {
   if (config && config.enabled === false) return false;
   const content = buildFormsFileWithAdapter(routes, outDir, adapter, config);
   if (content === null) return false;
   await (0, import_promises5.mkdir)(outDir, { recursive: true });
-  await (0, import_promises5.writeFile)((0, import_node_path6.join)(outDir, "forms.ts"), content, "utf8");
+  await (0, import_promises5.writeFile)((0, import_node_path7.join)(outDir, "forms.ts"), content, "utf8");
   return true;
 }
 function pascal(segment) {
@@ -1306,7 +1319,7 @@ function deriveBaseName(routeName) {
   return { method, full };
 }
 function relImport(outDir, filePath) {
-  let relPath = (0, import_node_path6.relative)(outDir, filePath).replace(/\.ts$/, "");
+  let relPath = (0, import_node_path7.relative)(outDir, filePath).replace(/\.ts$/, "");
   if (!relPath.startsWith(".")) relPath = `./${relPath}`;
   return relPath;
 }
@@ -1580,7 +1593,7 @@ function buildFormsFileWithAdapter(routes, outDir, adapter, config) {
 
 // src/emit/emit-index.ts
 var import_promises6 = require("fs/promises");
-var import_node_path7 = require("path");
+var import_node_path8 = require("path");
 async function emitIndex(outDir, hasContracts = false, hasForms = false) {
   await (0, import_promises6.mkdir)(outDir, { recursive: true });
   const exports2 = ["export * from './pages.js';", "export * from './routes.js';"];
@@ -1593,12 +1606,12 @@ async function emitIndex(outDir, hasContracts = false, hasForms = false) {
   const content = ["// Generated by @dudousxd/nestjs-codegen. Do not edit.", ...exports2, ""].join(
     "\n"
   );
-  await (0, import_promises6.writeFile)((0, import_node_path7.join)(outDir, "index.d.ts"), content, "utf8");
+  await (0, import_promises6.writeFile)((0, import_node_path8.join)(outDir, "index.d.ts"), content, "utf8");
 }
 
 // src/emit/emit-mocks.ts
 var import_promises7 = require("fs/promises");
-var import_node_path8 = require("path");
+var import_node_path9 = require("path");
 
 // src/ir/schema-node-to-json-schema.ts
 var DEFAULT_CTX = { refPrefix: "#/components/schemas/" };
@@ -1925,12 +1938,12 @@ async function emitMocks(routes, outDir, opts = {}) {
   await (0, import_promises7.mkdir)(outDir, { recursive: true });
   const content = buildMocksFile(routes, opts);
   const fileName = opts.fileName ?? "mocks.ts";
-  await (0, import_promises7.writeFile)((0, import_node_path8.join)(outDir, fileName), content, "utf8");
+  await (0, import_promises7.writeFile)((0, import_node_path9.join)(outDir, fileName), content, "utf8");
 }
 
 // src/emit/emit-openapi.ts
 var import_promises8 = require("fs/promises");
-var import_node_path9 = require("path");
+var import_node_path10 = require("path");
 var REF_PREFIX2 = "#/components/schemas/";
 function toOpenApiPath(path) {
   return path.replace(/:([^/]+)/g, "{$1}");
@@ -2051,13 +2064,13 @@ async function emitOpenApi(routes, outDir, opts = {}) {
   await (0, import_promises8.mkdir)(outDir, { recursive: true });
   const doc = buildOpenApiSpec(routes, opts);
   const fileName = opts.fileName ?? "openapi.json";
-  await (0, import_promises8.writeFile)((0, import_node_path9.join)(outDir, fileName), `${JSON.stringify(doc, null, 2)}
+  await (0, import_promises8.writeFile)((0, import_node_path10.join)(outDir, fileName), `${JSON.stringify(doc, null, 2)}
 `, "utf8");
 }
 
 // src/emit/emit-pages.ts
 var import_promises9 = require("fs/promises");
-var import_node_path10 = require("path");
+var import_node_path11 = require("path");
 async function emitPages(pages, outDir, _options = {}) {
   await (0, import_promises9.mkdir)(outDir, { recursive: true });
   const pageNameUnion = pages.length > 0 ? pages.map((p) => JSON.stringify(p.name)).join(" | ") : "never";
@@ -2078,7 +2091,7 @@ ${augBody}
   }
 ${sharedPropsBlock}}
 `;
-  await (0, import_promises9.writeFile)((0, import_node_path10.join)(outDir, "pages.d.ts"), content, "utf8");
+  await (0, import_promises9.writeFile)((0, import_node_path11.join)(outDir, "pages.d.ts"), content, "utf8");
 }
 function buildSharedPropsBlock(sharedProps) {
   if (!sharedProps) return "";
@@ -2097,7 +2110,7 @@ ${propsBody}
 `;
 }
 function buildAugmentationType(page, outDir) {
-  let importPath = (0, import_node_path10.relative)(outDir, page.absolutePath).replace(/\.(tsx?|vue|svelte)$/, "");
+  let importPath = (0, import_node_path11.relative)(outDir, page.absolutePath).replace(/\.(tsx?|vue|svelte)$/, "");
   if (!importPath.startsWith(".")) {
     importPath = `./${importPath}`;
   }
@@ -2109,11 +2122,11 @@ function needsQuotes(name) {
 
 // src/emit/emit-routes.ts
 var import_promises10 = require("fs/promises");
-var import_node_path11 = require("path");
+var import_node_path12 = require("path");
 async function emitRoutes(routes, outDir) {
   await (0, import_promises10.mkdir)(outDir, { recursive: true });
   const content = buildRoutesFile(routes);
-  await (0, import_promises10.writeFile)((0, import_node_path11.join)(outDir, "routes.ts"), content, "utf8");
+  await (0, import_promises10.writeFile)((0, import_node_path12.join)(outDir, "routes.ts"), content, "utf8");
 }
 function buildRoutesFile(routes) {
   if (routes.length === 0) {
@@ -2228,7 +2241,7 @@ function buildEmpty() {
 // src/generate-manifest.ts
 var import_node_crypto = require("crypto");
 var import_promises11 = require("fs/promises");
-var import_node_path12 = require("path");
+var import_node_path13 = require("path");
 var import_fast_glob2 = __toESM(require("fast-glob"), 1);
 var MANIFEST_FILE = ".codegen-manifest.json";
 var LOCK_FILE = ".watcher.lock";
@@ -2251,6 +2264,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");
 }
@@ -2290,26 +2306,35 @@ async function discoverInputFiles(config) {
   const matched = await (0, import_fast_glob2.default)(globs, { cwd, absolute: true, onlyFiles: true });
   return [...new Set(matched)].sort();
 }
-async function computeInputsHash(config) {
+async function computeInputsHash(config, extraInputs = []) {
   const hash = (0, import_node_crypto.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) => (0, import_node_path13.relative)(cwd, file)));
+  const extra = [...new Set(extraInputs)].filter((file) => !globbedRelative.has(file)).sort();
+  for (const file of globbed) {
     const contents = await (0, import_promises11.readFile)(file, "utf8");
-    hash.update(`file:${(0, import_node_path12.relative)(cwd, file)}
+    hash.update(`file:${(0, import_node_path13.relative)(cwd, file)}
 `);
     hash.update(contents);
     hash.update("\n");
   }
+  for (const file of extra) {
+    const contents = await (0, import_promises11.readFile)((0, import_node_path13.join)(cwd, file), "utf8").catch(() => null);
+    hash.update(`extra:${file}
+`);
+    hash.update(contents ?? "\0missing");
+    hash.update("\n");
+  }
   return hash.digest("hex");
 }
 async function readManifest(outDir) {
   try {
-    const raw = await (0, import_promises11.readFile)((0, import_node_path12.join)(outDir, MANIFEST_FILE), "utf8");
+    const raw = await (0, import_promises11.readFile)((0, import_node_path13.join)(outDir, MANIFEST_FILE), "utf8");
     const parsed = JSON.parse(raw);
     if (!isManifestShape(parsed)) return null;
     return {
@@ -2318,6 +2343,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 {
@@ -2328,7 +2354,7 @@ function computeConfigHash(config) {
   return (0, import_node_crypto.createHash)("sha256").update(serializeConfig(config)).digest("hex");
 }
 async function writeManifest(outDir, manifest) {
-  await (0, import_promises11.writeFile)((0, import_node_path12.join)(outDir, MANIFEST_FILE), `${JSON.stringify(manifest, null, 2)}
+  await (0, import_promises11.writeFile)((0, import_node_path13.join)(outDir, MANIFEST_FILE), `${JSON.stringify(manifest, null, 2)}
 `, "utf8");
 }
 async function listOutputFiles(outDir) {
@@ -2336,11 +2362,11 @@ async function listOutputFiles(outDir) {
   async function walk(dir) {
     const entries = await (0, import_promises11.readdir)(dir, { withFileTypes: true }).catch(() => []);
     for (const entry of entries) {
-      const abs = (0, import_node_path12.join)(dir, entry.name);
+      const abs = (0, import_node_path13.join)(dir, entry.name);
       if (entry.isDirectory()) {
         await walk(abs);
       } else if (entry.isFile()) {
-        const rel = (0, import_node_path12.relative)(outDir, abs);
+        const rel = (0, import_node_path13.relative)(outDir, abs);
         if (rel === MANIFEST_FILE || rel === LOCK_FILE) continue;
         found.push(rel);
       }
@@ -2377,8 +2403,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;
@@ -2399,7 +2425,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);
   }
@@ -2453,31 +2480,34 @@ async function generate(config, inputRoutes = [], entryPoint = "cli") {
   if (extensions.length > 0) {
     const extraFiles = await collectEmittedFiles(extensions, ctx);
     for (const file of extraFiles) {
-      const dest = (0, import_node_path13.join)(config.codegen.outDir, file.path);
-      await (0, import_promises12.mkdir)((0, import_node_path13.dirname)(dest), { recursive: true });
+      const dest = (0, import_node_path14.join)(config.codegen.outDir, file.path);
+      await (0, import_promises12.mkdir)((0, import_node_path14.dirname)(dest), { recursive: true });
       await (0, import_promises12.writeFile)(dest, file.contents, "utf8");
     }
   }
   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 } : {}
   });
 }
 
 // src/watch/watcher.ts
 var import_promises15 = require("fs/promises");
-var import_node_path17 = require("path");
+var import_node_path18 = require("path");
 var import_chokidar = __toESM(require("chokidar"), 1);
 
 // src/discovery/contracts-fast.ts
-var import_node_path15 = require("path");
+var import_node_path16 = require("path");
 var import_fast_glob3 = __toESM(require("fast-glob"), 1);
-var import_ts_morph9 = require("ts-morph");
+var import_ts_morph10 = require("ts-morph");
 
 // src/discovery/dto-type-resolver.ts
 var import_ts_morph7 = require("ts-morph");
@@ -2487,7 +2517,7 @@ var import_ts_morph4 = require("ts-morph");
 
 // src/discovery/type-ref-resolution.ts
 var import_node_fs = require("fs");
-var import_node_path14 = require("path");
+var import_node_path15 = require("path");
 var import_ts_morph3 = require("ts-morph");
 var _EMPTY_CTX = { projectRoot: "", tsconfigPaths: null };
 var _ctxByProject = /* @__PURE__ */ new WeakMap();
@@ -2539,12 +2569,12 @@ function findTypeInFile(name, file) {
 }
 function resolveModuleSpecifier(moduleSpecifier, sourceFile, project) {
   if (moduleSpecifier.startsWith(".")) {
-    const dir = (0, import_node_path14.dirname)(sourceFile.getFilePath());
+    const dir = (0, import_node_path15.dirname)(sourceFile.getFilePath());
     const noExt = moduleSpecifier.replace(/\.(js|ts)$/, "");
     return [
-      (0, import_node_path14.resolve)(dir, `${noExt}.ts`),
-      (0, import_node_path14.resolve)(dir, `${moduleSpecifier}.ts`),
-      (0, import_node_path14.resolve)(dir, moduleSpecifier, "index.ts")
+      (0, import_node_path15.resolve)(dir, `${noExt}.ts`),
+      (0, import_node_path15.resolve)(dir, `${moduleSpecifier}.ts`),
+      (0, import_node_path15.resolve)(dir, moduleSpecifier, "index.ts")
     ];
   }
   const ctx = _ctxFor(project);
@@ -2565,8 +2595,8 @@ function resolveModuleSpecifier(moduleSpecifier, sourceFile, project) {
         const rest = moduleSpecifier.slice(prefix.length);
         const candidates = [];
         for (const mapping of mappings) {
-          const resolved = (0, import_node_path14.resolve)(baseUrl, mapping.replace("*", rest));
-          candidates.push(`${resolved}.ts`, (0, import_node_path14.resolve)(resolved, "index.ts"));
+          const resolved = (0, import_node_path15.resolve)(baseUrl, mapping.replace("*", rest));
+          candidates.push(`${resolved}.ts`, (0, import_node_path15.resolve)(resolved, "index.ts"));
         }
         dbg("  resolved candidates:", candidates);
         return candidates;
@@ -3456,6 +3486,12 @@ function toFilterFieldType(name, r) {
 }
 
 // src/discovery/filter-for.ts
+function resolveMixinEntityClass(mixin, project) {
+  const entityArg = mixin?.classArgs[0];
+  if (!entityArg) return void 0;
+  const file = project.getSourceFile(entityArg.filePath) ?? project.addSourceFileAtPathIfExists(entityArg.filePath);
+  return file?.getClass(entityArg.name);
+}
 function classifyFilterForHint(typeInit) {
   if (import_ts_morph6.Node.isStringLiteral(typeInit)) {
     switch (typeInit.getLiteralValue()) {
@@ -3529,7 +3565,9 @@ function extractFilterForHints(classDecl, project) {
   }
   return hints;
 }
-function extractApplyFilterInfo(method, sourceFile, project) {
+function extractApplyFilterInfo(method, sourceFile, project, mixin) {
+  const declFile = method.getSourceFile();
+  const mixinEntity = resolveMixinEntityClass(mixin, project);
   for (const param of method.getParameters()) {
     const filterDecorator = param.getDecorators().find((d) => d.getName() === "ApplyFilter");
     if (!filterDecorator) continue;
@@ -3549,12 +3587,12 @@ function extractApplyFilterInfo(method, sourceFile, project) {
       }
     }
     const filterClassName = filterClassArg.getText();
-    const resolved = findType(filterClassName, sourceFile, project);
-    if (resolved && resolved.kind === "class") {
-      const classDecl = resolved.decl;
+    const resolved = findType(filterClassName, declFile, project);
+    const classDecl = resolved?.kind === "class" ? resolved.decl : resolveLocalClassDeclaration(filterClassArg);
+    if (classDecl) {
       let fieldTypes = extractClassPropertyTypes(classDecl, project);
       if (fieldTypes.length === 0) {
-        fieldTypes = extractFilterableEntityFields(classDecl, project);
+        fieldTypes = extractFilterableEntityFields(classDecl, project, mixinEntity);
       }
       const filterForHints = extractFilterForHints(classDecl, project);
       if (filterForHints.size > 0) {
@@ -3639,22 +3677,29 @@ function extractClassPropertyTypes(classDecl, project) {
   }
   return fields;
 }
-function extractFilterableEntityFields(filterClass, project) {
+function resolveLocalClassDeclaration(identifier) {
+  if (!import_ts_morph6.Node.isIdentifier(identifier)) return void 0;
+  return identifier.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => n !== void 0 && import_ts_morph6.Node.isClassDeclaration(n));
+}
+function resolveDeclaredEntity(optionsArg, filterClass, project) {
+  if (!import_ts_morph6.Node.isObjectLiteralExpression(optionsArg)) return void 0;
+  const entityProp = optionsArg.getProperty("entity");
+  if (!entityProp || !import_ts_morph6.Node.isPropertyAssignment(entityProp)) return void 0;
+  const entityInit = entityProp.getInitializer();
+  if (!entityInit || !import_ts_morph6.Node.isIdentifier(entityInit)) return void 0;
+  const resolved = findType(entityInit.getText(), filterClass.getSourceFile(), project);
+  if (!resolved || resolved.kind !== "class") return void 0;
+  return resolved.decl;
+}
+function extractFilterableEntityFields(filterClass, project, entityOverride) {
   const filterableDecorator = filterClass.getDecorators().find((d) => d.getName() === "Filterable");
   if (!filterableDecorator) return [];
   const args = filterableDecorator.getArguments();
   if (args.length === 0) return [];
   const optionsArg = args[0];
   if (!import_ts_morph6.Node.isObjectLiteralExpression(optionsArg)) return [];
-  const entityProp = optionsArg.getProperty("entity");
-  if (!entityProp || !import_ts_morph6.Node.isPropertyAssignment(entityProp)) return [];
-  const entityInit = entityProp.getInitializer();
-  if (!entityInit || !import_ts_morph6.Node.isIdentifier(entityInit)) return [];
-  const entityName = entityInit.getText();
-  const filterSourceFile = filterClass.getSourceFile();
-  const resolvedEntity = findType(entityName, filterSourceFile, project);
-  if (!resolvedEntity || resolvedEntity.kind !== "class") return [];
-  const entityDecl = resolvedEntity.decl;
+  const entityDecl = entityOverride ?? resolveDeclaredEntity(optionsArg, filterClass, project);
+  if (!entityDecl) return [];
   const fields = collectEntityFields(
     entityDecl,
     entityDecl.getSourceFile(),
@@ -4079,9 +4124,9 @@ function unwrapNamedContainer(node, names) {
   }
   return node;
 }
-function extractDtoContract(method, sourceFile, project) {
+function extractDtoContract(method, sourceFile, project, mixin) {
   let body = extractBodyType(method, sourceFile, project);
-  const filterInfo = extractApplyFilterInfo(method, sourceFile, project);
+  const filterInfo = extractApplyFilterInfo(method, sourceFile, project, mixin);
   const query = extractQueryType(method, sourceFile, project);
   const uploads = extractUploadedFiles(method);
   const multipartBody = uploads.fields ? `{ ${uploads.fields} }` : null;
@@ -4191,12 +4236,94 @@ function resolveParamClass(method, decoratorName, sourceFile, project) {
   return null;
 }
 
-// src/discovery/zod-ast-to-ts.ts
+// src/discovery/heritage.ts
 var import_ts_morph8 = require("ts-morph");
+function unwrapExpression(node) {
+  let current = node;
+  while (import_ts_morph8.Node.isAsExpression(current) || import_ts_morph8.Node.isSatisfiesExpression(current) || import_ts_morph8.Node.isParenthesizedExpression(current) || import_ts_morph8.Node.isTypeAssertion(current)) {
+    current = current.getExpression();
+  }
+  return current;
+}
+function resolveReturnedClass(factoryDecl) {
+  const body = factoryDecl.getBody();
+  if (!body) return void 0;
+  const returns = body.getDescendants().filter((n) => import_ts_morph8.Node.isReturnStatement(n));
+  for (const ret of returns) {
+    const expr = ret.getExpression();
+    if (!expr) continue;
+    const inner = unwrapExpression(expr);
+    if (import_ts_morph8.Node.isClassExpression(inner)) {
+      return inner;
+    }
+    if (import_ts_morph8.Node.isIdentifier(inner)) {
+      const name = inner.getText();
+      const decl = body.getDescendants().find((n) => import_ts_morph8.Node.isClassDeclaration(n) && n.getName() === name);
+      if (decl) return decl;
+    }
+  }
+  return void 0;
+}
+function resolveInheritedMethods(cls) {
+  const expr = cls.getExtends()?.getExpression();
+  if (!expr || !import_ts_morph8.Node.isCallExpression(expr)) return void 0;
+  const callee = expr.getExpression();
+  if (!import_ts_morph8.Node.isIdentifier(callee)) return void 0;
+  const factoryDecl = callee.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => import_ts_morph8.Node.isFunctionDeclaration(n));
+  if (!factoryDecl) return void 0;
+  const returnedClass = resolveReturnedClass(factoryDecl);
+  if (!returnedClass) return void 0;
+  const classArgs = [];
+  for (const arg of expr.getArguments()) {
+    if (!import_ts_morph8.Node.isIdentifier(arg)) continue;
+    const decl = arg.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => import_ts_morph8.Node.isClassDeclaration(n));
+    if (decl) {
+      classArgs.push({
+        name: decl.getName() ?? arg.getText(),
+        filePath: decl.getSourceFile().getFilePath()
+      });
+    }
+  }
+  return {
+    methods: returnedClass.getMethods(),
+    factoryName: callee.getText(),
+    factoryFilePath: factoryDecl.getSourceFile().getFilePath(),
+    classArgs
+  };
+}
+var mixinTypeProject;
+function getMixinTypeProject() {
+  mixinTypeProject ??= new import_ts_morph8.Project({
+    skipAddingFilesFromTsConfig: true,
+    compilerOptions: { strict: true }
+  });
+  return mixinTypeProject;
+}
+function clearMixinTypeProject() {
+  mixinTypeProject = void 0;
+}
+function resolveInstantiatedReturnType(cls, methodName) {
+  const filePath = cls.getSourceFile().getFilePath();
+  const className = cls.getName();
+  if (!className) return void 0;
+  const project = getMixinTypeProject();
+  const sourceFile = project.getSourceFile(filePath) ?? project.addSourceFileAtPathIfExists(filePath);
+  const typedCls = sourceFile?.getClass(className);
+  if (!typedCls) return void 0;
+  const prop = typedCls.getType().getProperty(methodName);
+  if (!prop) return void 0;
+  const returnType = prop.getTypeAtLocation(typedCls).getCallSignatures()[0]?.getReturnType();
+  if (!returnType) return void 0;
+  const unwrapped = returnType.getSymbol()?.getName() === "Promise" ? returnType.getTypeArguments()[0] ?? returnType : returnType;
+  return unwrapped.getText(typedCls);
+}
+
+// src/discovery/zod-ast-to-ts.ts
+var import_ts_morph9 = require("ts-morph");
 function zodAstToTs(node) {
-  if (!import_ts_morph8.Node.isCallExpression(node)) return "unknown";
+  if (!import_ts_morph9.Node.isCallExpression(node)) return "unknown";
   const expr = node.getExpression();
-  if (import_ts_morph8.Node.isPropertyAccessExpression(expr)) {
+  if (import_ts_morph9.Node.isPropertyAccessExpression(expr)) {
     const methodName = expr.getName();
     const receiver = expr.getExpression();
     if (methodName === "optional") {
@@ -4220,17 +4347,17 @@ function zodAstToTs(node) {
       case "literal": {
         const lit = args[0];
         if (!lit) return "unknown";
-        if (import_ts_morph8.Node.isStringLiteral(lit)) return JSON.stringify(lit.getLiteralValue());
-        if (import_ts_morph8.Node.isNumericLiteral(lit)) return lit.getLiteralValue().toString();
-        if (lit.getKind() === import_ts_morph8.SyntaxKind.TrueKeyword) return "true";
-        if (lit.getKind() === import_ts_morph8.SyntaxKind.FalseKeyword) return "false";
+        if (import_ts_morph9.Node.isStringLiteral(lit)) return JSON.stringify(lit.getLiteralValue());
+        if (import_ts_morph9.Node.isNumericLiteral(lit)) return lit.getLiteralValue().toString();
+        if (lit.getKind() === import_ts_morph9.SyntaxKind.TrueKeyword) return "true";
+        if (lit.getKind() === import_ts_morph9.SyntaxKind.FalseKeyword) return "false";
         return "unknown";
       }
       case "enum": {
         const arrArg = args[0];
-        if (!arrArg || !import_ts_morph8.Node.isArrayLiteralExpression(arrArg)) return "unknown";
+        if (!arrArg || !import_ts_morph9.Node.isArrayLiteralExpression(arrArg)) return "unknown";
         const members = arrArg.getElements().map(
-          (el) => import_ts_morph8.Node.isStringLiteral(el) ? JSON.stringify(el.getLiteralValue()) : "unknown"
+          (el) => import_ts_morph9.Node.isStringLiteral(el) ? JSON.stringify(el.getLiteralValue()) : "unknown"
         );
         return members.join(" | ");
       }
@@ -4241,10 +4368,10 @@ function zodAstToTs(node) {
       }
       case "object": {
         const objArg = args[0];
-        if (!objArg || !import_ts_morph8.Node.isObjectLiteralExpression(objArg)) return "unknown";
+        if (!objArg || !import_ts_morph9.Node.isObjectLiteralExpression(objArg)) return "unknown";
         const lines = [];
         for (const prop of objArg.getProperties()) {
-          if (!import_ts_morph8.Node.isPropertyAssignment(prop)) continue;
+          if (!import_ts_morph9.Node.isPropertyAssignment(prop)) continue;
           const key = prop.getName();
           const valNode = prop.getInitializer();
           if (!valNode) continue;
@@ -4256,7 +4383,7 @@ function zodAstToTs(node) {
       }
       case "union": {
         const arrArg = args[0];
-        if (!arrArg || !import_ts_morph8.Node.isArrayLiteralExpression(arrArg)) return "unknown";
+        if (!arrArg || !import_ts_morph9.Node.isArrayLiteralExpression(arrArg)) return "unknown";
         return arrArg.getElements().map(zodAstToTs).join(" | ");
       }
       case "record": {
@@ -4266,7 +4393,7 @@ function zodAstToTs(node) {
       }
       case "tuple": {
         const arrArg = args[0];
-        if (!arrArg || !import_ts_morph8.Node.isArrayLiteralExpression(arrArg)) return "unknown";
+        if (!arrArg || !import_ts_morph9.Node.isArrayLiteralExpression(arrArg)) return "unknown";
         return `[${arrArg.getElements().map(zodAstToTs).join(", ")}]`;
       }
       default:
@@ -4276,18 +4403,18 @@ function zodAstToTs(node) {
   return "unknown";
 }
 function isOptionalChain(node) {
-  if (!import_ts_morph8.Node.isCallExpression(node)) return false;
+  if (!import_ts_morph9.Node.isCallExpression(node)) return false;
   const expr = node.getExpression();
-  return import_ts_morph8.Node.isPropertyAccessExpression(expr) && expr.getName() === "optional";
+  return import_ts_morph9.Node.isPropertyAccessExpression(expr) && expr.getName() === "optional";
 }
 function parseDefineContractCall(callExpr) {
-  if (!import_ts_morph8.Node.isCallExpression(callExpr)) return null;
+  if (!import_ts_morph9.Node.isCallExpression(callExpr)) return null;
   const callee = callExpr.getExpression();
-  const calleeName = import_ts_morph8.Node.isIdentifier(callee) ? callee.getText() : import_ts_morph8.Node.isPropertyAccessExpression(callee) ? callee.getName() : "";
+  const calleeName = import_ts_morph9.Node.isIdentifier(callee) ? callee.getText() : import_ts_morph9.Node.isPropertyAccessExpression(callee) ? callee.getName() : "";
   if (calleeName !== "defineContract") return null;
   const args = callExpr.getArguments();
   const optsArg = args[0];
-  if (!optsArg || !import_ts_morph8.Node.isObjectLiteralExpression(optsArg)) return null;
+  if (!optsArg || !import_ts_morph9.Node.isObjectLiteralExpression(optsArg)) return null;
   let query = null;
   let body = null;
   let response = "unknown";
@@ -4295,7 +4422,7 @@ function parseDefineContractCall(callExpr) {
   let bodyZodText = null;
   let queryZodText = null;
   for (const prop of optsArg.getProperties()) {
-    if (!import_ts_morph8.Node.isPropertyAssignment(prop)) continue;
+    if (!import_ts_morph9.Node.isPropertyAssignment(prop)) continue;
     const propName = prop.getName();
     const val = prop.getInitializer();
     if (!val) continue;
@@ -4324,21 +4451,22 @@ async function discoverContractsFast(opts) {
     project.addSourceFileAtPath(f);
   }
   bindDiscoveryContext(project, cwd, tsconfigPath);
+  clearMixinTypeProject();
   return extractAllRoutes(project);
 }
 function resolveTsconfigPath(cwd, tsconfig) {
-  return tsconfig ? (0, import_node_path15.resolve)(tsconfig) : (0, import_node_path15.join)(cwd, "tsconfig.json");
+  return tsconfig ? (0, import_node_path16.resolve)(tsconfig) : (0, import_node_path16.join)(cwd, "tsconfig.json");
 }
 function createDiscoveryProject(tsconfigPath) {
   try {
-    return new import_ts_morph9.Project({
+    return new import_ts_morph10.Project({
       tsConfigFilePath: tsconfigPath,
       skipAddingFilesFromTsConfig: true,
       skipLoadingLibFiles: true,
       skipFileDependencyResolution: true
     });
   } catch {
-    return new import_ts_morph9.Project({
+    return new import_ts_morph10.Project({
       skipAddingFilesFromTsConfig: true,
       skipLoadingLibFiles: true,
       skipFileDependencyResolution: true,
@@ -4413,7 +4541,7 @@ var PersistentDiscovery = class _PersistentDiscovery {
   async rediscover(changedPaths) {
     if (changedPaths) {
       for (const p of changedPaths) {
-        const abs = (0, import_node_path15.resolve)(p);
+        const abs = (0, import_node_path16.resolve)(p);
         const sf = this.project.getSourceFile(abs);
         if (sf) {
           await sf.refreshFromFileSystem();
@@ -4445,15 +4573,16 @@ var PersistentDiscovery = class _PersistentDiscovery {
   runExtraction() {
     clearTypeResolutionCaches(this.project);
     clearEnumCache(this.project);
+    clearMixinTypeProject();
     return extractRoutesFrom(this.project, this.controllerPaths);
   }
 };
 function decoratorStringArg(decoratorExpr) {
   if (!decoratorExpr) return void 0;
-  if (import_ts_morph9.Node.isStringLiteral(decoratorExpr)) return decoratorExpr.getLiteralValue();
-  if (import_ts_morph9.Node.isArrayLiteralExpression(decoratorExpr)) {
+  if (import_ts_morph10.Node.isStringLiteral(decoratorExpr)) return decoratorExpr.getLiteralValue();
+  if (import_ts_morph10.Node.isArrayLiteralExpression(decoratorExpr)) {
     const first = decoratorExpr.getElements()[0];
-    if (first && import_ts_morph9.Node.isStringLiteral(first)) return first.getLiteralValue();
+    if (first && import_ts_morph10.Node.isStringLiteral(first)) return first.getLiteralValue();
   }
   return void 0;
 }
@@ -4475,7 +4604,8 @@ function joinPaths(prefix, suffix) {
   if (!prefix && !suffix) return "/";
   if (!prefix) return suffix.startsWith("/") ? suffix : `/${suffix}`;
   if (!suffix) return prefix.startsWith("/") ? prefix : `/${prefix}`;
-  const p = prefix.endsWith("/") ? prefix.slice(0, -1) : prefix;
+  const withLeadingSlash = prefix.startsWith("/") ? prefix : `/${prefix}`;
+  const p = withLeadingSlash.endsWith("/") ? withLeadingSlash.slice(0, -1) : withLeadingSlash;
   const s = suffix.startsWith("/") ? suffix : `/${suffix}`;
   const combined = p + s;
   return combined === "" ? "/" : combined;
@@ -4529,7 +4659,8 @@ function buildRoute(args) {
     methodAs,
     sourceFile,
     seenNames,
-    contractSource
+    contractSource,
+    mixin
   } = args;
   const routeName = resolveRouteName(className, methodName, classAs, methodAs);
   const qualifiedRef = `${className}.${methodName}`;
@@ -4545,7 +4676,12 @@ function buildRoute(args) {
     path: combinedPath,
     name: routeName,
     params: extractParams(combinedPath),
-    controllerRef: { className, methodName, filePath: sourceFile.getFilePath() },
+    controllerRef: {
+      className,
+      methodName,
+      filePath: sourceFile.getFilePath(),
+      ...mixin ? { mixin } : {}
+    },
     contract: { contractSource }
   };
 }
@@ -4559,16 +4695,17 @@ function extractContractRoute(args) {
     className,
     sourceFile,
     project,
-    seenNames
+    seenNames,
+    mixin
   } = args;
   const firstDecoratorArg = applyContractDecorator.getArguments()[0];
   if (!firstDecoratorArg) return null;
   let contractDef = null;
   let bodyZodRef = null;
   let queryZodRef = null;
-  if (import_ts_morph9.Node.isCallExpression(firstDecoratorArg)) {
+  if (import_ts_morph10.Node.isCallExpression(firstDecoratorArg)) {
     contractDef = parseDefineContractCall(firstDecoratorArg);
-  } else if (import_ts_morph9.Node.isIdentifier(firstDecoratorArg)) {
+  } else if (import_ts_morph10.Node.isIdentifier(firstDecoratorArg)) {
     const identName = firstDecoratorArg.getText();
     const resolvedVar = resolveImportedVariable(identName, sourceFile, project);
     if (!resolvedVar) {
@@ -4611,6 +4748,7 @@ function extractContractRoute(args) {
     methodAs,
     sourceFile,
     seenNames,
+    mixin,
     contractSource: {
       query: contractDef.query,
       body: contractDef.body,
@@ -4627,13 +4765,14 @@ function extractContractRoute(args) {
   });
 }
 function extractDtoRoute(args) {
-  const { cls, method, verb, prefix, className, sourceFile, project, seenNames } = args;
+  const { cls, method, verb, prefix, className, sourceFile, project, seenNames, mixin } = args;
   if (!verb) return null;
   const combined = joinPaths(prefix, verb.handlerPath);
   const methodName = method.getName();
   const classAs = readAsDecorator(cls, `class ${className}`);
   const methodAs = readAsDecorator(method, `${className}.${methodName}`);
-  const dtoContract = extractDtoContract(method, sourceFile, project);
+  const dtoContract = extractDtoContract(method, sourceFile, project, mixin);
+  const mixinResponse = mixin ? resolveInstantiatedReturnType(cls, methodName) : void 0;
   return buildRoute({
     className,
     methodName,
@@ -4643,10 +4782,11 @@ function extractDtoRoute(args) {
     methodAs,
     sourceFile,
     seenNames,
+    mixin,
     contractSource: {
       query: dtoContract?.query ?? null,
       body: dtoContract?.body ?? null,
-      response: dtoContract?.response ?? "unknown",
+      response: mixinResponse ?? dtoContract?.response ?? "unknown",
       error: dtoContract?.error ?? null,
       queryRef: dtoContract?.queryRef ?? null,
       bodyRef: dtoContract?.bodyRef ?? null,
@@ -4675,7 +4815,17 @@ function extractFromSourceFile(sourceFile, project) {
     const firstArg2 = controllerDecorator.getArguments()[0];
     const prefix = decoratorStringArg(firstArg2) ?? "";
     const className = cls.getName() ?? "Unknown";
-    for (const method of cls.getMethods()) {
+    const inherited = resolveInheritedMethods(cls);
+    const mixinBinding = inherited ? {
+      factoryName: inherited.factoryName,
+      factoryFilePath: inherited.factoryFilePath,
+      classArgs: inherited.classArgs
+    } : void 0;
+    const methods = [
+      ...cls.getMethods().map((method) => ({ method })),
+      ...(inherited?.methods ?? []).map((method) => ({ method, mixin: mixinBinding }))
+    ];
+    for (const { method, mixin } of methods) {
       const verb = resolveVerb(method);
       const applyContractDecorator = method.getDecorator("ApplyContract");
       const route = applyContractDecorator ? extractContractRoute({
@@ -4687,7 +4837,8 @@ function extractFromSourceFile(sourceFile, project) {
         className,
         sourceFile,
         project,
-        seenNames
+        seenNames,
+        mixin
       }) : extractDtoRoute({
         cls,
         method,
@@ -4696,7 +4847,8 @@ function extractFromSourceFile(sourceFile, project) {
         className,
         sourceFile,
         project,
-        seenNames
+        seenNames,
+        mixin
       });
       if (route) routes.push(route);
     }
@@ -4707,7 +4859,7 @@ function extractFromSourceFile(sourceFile, project) {
 // src/watch/lock-file.ts
 var import_promises13 = require("fs/promises");
 var import_promises14 = require("fs/promises");
-var import_node_path16 = require("path");
+var import_node_path17 = require("path");
 var LOCK_FILE2 = ".watcher.lock";
 function isProcessAlive(pid) {
   try {
@@ -4719,7 +4871,7 @@ function isProcessAlive(pid) {
 }
 async function acquireLock(outDir) {
   await (0, import_promises14.mkdir)(outDir, { recursive: true });
-  const lockPath = (0, import_node_path16.join)(outDir, LOCK_FILE2);
+  const lockPath = (0, import_node_path17.join)(outDir, LOCK_FILE2);
   const lockData = { pid: process.pid, startedAt: (/* @__PURE__ */ new Date()).toISOString() };
   try {
     const fd = await (0, import_promises13.open)(lockPath, "wx");
@@ -4760,7 +4912,7 @@ async function watch(config, onChange, options = {}) {
   if (lock === null) {
     let holderPid = "unknown";
     try {
-      const raw = await (0, import_promises15.readFile)((0, import_node_path17.join)(config.codegen.outDir, ".watcher.lock"), "utf8");
+      const raw = await (0, import_promises15.readFile)((0, import_node_path18.join)(config.codegen.outDir, ".watcher.lock"), "utf8");
       const data = JSON.parse(raw);
       if (data.pid !== void 0) holderPid = String(data.pid);
     } catch {
@@ -4813,7 +4965,7 @@ async function watch(config, onChange, options = {}) {
   }
   let pagesDebounceTimer;
   const pagesGlob = config.pages?.glob ?? ".nestjs-codegen-no-pages";
-  const pagesWatcher = import_chokidar.default.watch((0, import_node_path17.join)(config.codegen.cwd, pagesGlob), {
+  const pagesWatcher = import_chokidar.default.watch((0, import_node_path18.join)(config.codegen.cwd, pagesGlob), {
     ignoreInitial: true,
     persistent: true,
     awaitWriteFinish: { stabilityThreshold: 80, pollInterval: 20 }
@@ -4840,7 +4992,7 @@ async function watch(config, onChange, options = {}) {
   pagesWatcher.on("unlink", schedulePagesRegenerate);
   let contractsDebounceTimer;
   const pendingChangedPaths = /* @__PURE__ */ new Set();
-  const contractsWatcher = import_chokidar.default.watch((0, import_node_path17.join)(config.codegen.cwd, config.contracts.glob), {
+  const contractsWatcher = import_chokidar.default.watch((0, import_node_path18.join)(config.codegen.cwd, config.contracts.glob), {
     ignoreInitial: true,
     persistent: true,
     awaitWriteFinish: { stabilityThreshold: 80, pollInterval: 20 }
@@ -4870,7 +5022,7 @@ async function watch(config, onChange, options = {}) {
   contractsWatcher.on("add", (p) => scheduleContractsRegenerate(p));
   contractsWatcher.on("change", (p) => scheduleContractsRegenerate(p));
   contractsWatcher.on("unlink", (p) => scheduleContractsRegenerate(p));
-  const formsWatcher = import_chokidar.default.watch((0, import_node_path17.join)(config.codegen.cwd, config.forms.watch), {
+  const formsWatcher = import_chokidar.default.watch((0, import_node_path18.join)(config.codegen.cwd, config.forms.watch), {
     ignoreInitial: true,
     persistent: true,
     awaitWriteFinish: { stabilityThreshold: 80, pollInterval: 20 }
@@ -4980,7 +5132,7 @@ function createChainModuleRenderer(opts) {
 }
 
 // src/index.ts
-var VERSION = "0.15.0";
+var VERSION = "0.17.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CodegenError,