@dudousxd/nestjs-codegen 0.17.0 → 0.17.2

package/dist/index.d.cts

@@ -382,6 +382,6 @@ interface FastDiscoveryOptions {
 }
 declare function discoverContractsFast(opts: FastDiscoveryOptions): Promise<RouteDescriptor[]>;
 
-declare const VERSION = "0.17.0";
+declare const VERSION = "0.17.2";
 
 export { type ChainModuleRendererOptions, CodegenError, type CodegenManifest, ConfigError, DriftGuardError, type EntryPoint, type FastDiscoveryOptions, type JsonSchema, type MocksEmitOptions, type OpenApiDocument, type OpenApiEmitOptions, type OpenApiInfo, RenderContext, RenderedModule, ResolvedConfig, RouteDescriptor, SchemaModule, SchemaNode, type TsTypeContext, UserConfig, VERSION, ValidationAdapter, type WatchOptions, type Watcher, acquireLock, buildMocksFile, buildOpenApiSpec, createChainModuleRenderer, defineConfig, discoverContractsFast, emitApi, emitForms, emitMocks, emitOpenApi, emitRoutes, extractSchemaFromDto, generate, loadConfig, renderTsType, resolveConfig, schemaModuleToJsonSchema, schemaNodeToJsonSchema, toObjectKey, typeNameFor, watch };

package/dist/index.d.ts

@@ -382,6 +382,6 @@ interface FastDiscoveryOptions {
 }
 declare function discoverContractsFast(opts: FastDiscoveryOptions): Promise<RouteDescriptor[]>;
 
-declare const VERSION = "0.17.0";
+declare const VERSION = "0.17.2";
 
 export { type ChainModuleRendererOptions, CodegenError, type CodegenManifest, ConfigError, DriftGuardError, type EntryPoint, type FastDiscoveryOptions, type JsonSchema, type MocksEmitOptions, type OpenApiDocument, type OpenApiEmitOptions, type OpenApiInfo, RenderContext, RenderedModule, ResolvedConfig, RouteDescriptor, SchemaModule, SchemaNode, type TsTypeContext, UserConfig, VERSION, ValidationAdapter, type WatchOptions, type Watcher, acquireLock, buildMocksFile, buildOpenApiSpec, createChainModuleRenderer, defineConfig, discoverContractsFast, emitApi, emitForms, emitMocks, emitOpenApi, emitRoutes, extractSchemaFromDto, generate, loadConfig, renderTsType, resolveConfig, schemaModuleToJsonSchema, schemaNodeToJsonSchema, toObjectKey, typeNameFor, watch };

package/dist/index.js

@@ -2453,7 +2453,7 @@ import {
 
 // src/discovery/dto-type-resolver.ts
 import {
-  Node as Node6,
+  Node as Node7,
   SyntaxKind as SyntaxKind3
 } from "ts-morph";
 
@@ -3216,7 +3216,7 @@ function inSchemaFromDecorator(decorator) {
 
 // src/discovery/filter-for.ts
 import {
-  Node as Node5
+  Node as Node6
 } from "ts-morph";
 
 // src/discovery/filter-field-types.ts
@@ -3439,6 +3439,123 @@ function toFilterFieldType(name, r) {
   return ft;
 }
 
+// src/discovery/heritage.ts
+import { Node as Node5, Project as Project3 } from "ts-morph";
+function resolveHeritageCall(node) {
+  if (!node) return void 0;
+  const expr = unwrapExpression(node);
+  if (Node5.isCallExpression(expr)) return expr;
+  if (!Node5.isIdentifier(expr)) return void 0;
+  const decl = expr.getDefinitions().map((d) => d.getDeclarationNode()).find(
+    (n) => n !== void 0 && Node5.isVariableDeclaration(n)
+  );
+  const init = decl?.getInitializer();
+  if (!init) return void 0;
+  const unwrapped = unwrapExpression(init);
+  return Node5.isCallExpression(unwrapped) ? unwrapped : void 0;
+}
+function unwrapExpression(node) {
+  let current = node;
+  while (Node5.isAsExpression(current) || Node5.isSatisfiesExpression(current) || Node5.isParenthesizedExpression(current) || Node5.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) => Node5.isReturnStatement(n));
+  for (const ret of returns) {
+    const expr = ret.getExpression();
+    if (!expr) continue;
+    const inner = unwrapExpression(expr);
+    if (Node5.isClassExpression(inner)) {
+      return inner;
+    }
+    if (Node5.isIdentifier(inner)) {
+      const name = inner.getText();
+      const decl = body.getDescendants().find((n) => Node5.isClassDeclaration(n) && n.getName() === name);
+      if (decl) return decl;
+    }
+  }
+  return void 0;
+}
+function resolveFactoryDeclaration(call) {
+  const callee = call.getExpression();
+  if (!Node5.isIdentifier(callee)) return void 0;
+  return callee.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => Node5.isFunctionDeclaration(n));
+}
+function resolveFactoryStaticClass(node) {
+  if (!Node5.isPropertyAccessExpression(node)) return void 0;
+  const call = resolveHeritageCall(node.getExpression());
+  if (!call) return void 0;
+  const factoryDecl = resolveFactoryDeclaration(call);
+  if (!factoryDecl) return void 0;
+  const returnedClass = resolveReturnedClass(factoryDecl);
+  if (!returnedClass) return void 0;
+  const staticProp = returnedClass.getStaticProperties().find((p) => p.getName() === node.getName());
+  if (!staticProp || !Node5.isPropertyDeclaration(staticProp)) return void 0;
+  const init = staticProp.getInitializer();
+  if (!init) return void 0;
+  const inner = unwrapExpression(init);
+  if (Node5.isClassExpression(inner)) return inner;
+  if (!Node5.isIdentifier(inner)) return void 0;
+  return inner.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => n !== void 0 && Node5.isClassDeclaration(n));
+}
+function resolveInheritedMethods(cls) {
+  const expr = resolveHeritageCall(cls.getExtends()?.getExpression());
+  if (!expr) return void 0;
+  const callee = expr.getExpression();
+  if (!Node5.isIdentifier(callee)) return void 0;
+  const factoryDecl = resolveFactoryDeclaration(expr);
+  if (!factoryDecl) return void 0;
+  const returnedClass = resolveReturnedClass(factoryDecl);
+  if (!returnedClass) return void 0;
+  const classArgs = [];
+  for (const arg of expr.getArguments()) {
+    if (!Node5.isIdentifier(arg)) continue;
+    const decl = arg.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => Node5.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 Project3({
+    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/filter-for.ts
 function resolveMixinEntityClass(mixin, project) {
   const entityArg = mixin?.classArgs[0];
@@ -3447,7 +3564,7 @@ function resolveMixinEntityClass(mixin, project) {
   return file?.getClass(entityArg.name);
 }
 function classifyFilterForHint(typeInit) {
-  if (Node5.isStringLiteral(typeInit)) {
+  if (Node6.isStringLiteral(typeInit)) {
     switch (typeInit.getLiteralValue()) {
       case "string":
         return { kind: "string" };
@@ -3461,10 +3578,10 @@ function classifyFilterForHint(typeInit) {
         return null;
     }
   }
-  if (Node5.isArrayLiteralExpression(typeInit)) {
+  if (Node6.isArrayLiteralExpression(typeInit)) {
     const values = [];
     for (const el of typeInit.getElements()) {
-      if (!Node5.isStringLiteral(el)) return null;
+      if (!Node6.isStringLiteral(el)) return null;
       values.push(el.getLiteralValue());
     }
     if (values.length === 0) return null;
@@ -3499,11 +3616,11 @@ function extractFilterForHints(classDecl, project) {
     if (!filterForDec) continue;
     const args = filterForDec.getArguments();
     const keyArg = args[0];
-    const inputKey = keyArg && Node5.isStringLiteral(keyArg) ? keyArg.getLiteralValue() : method.getName();
+    const inputKey = keyArg && Node6.isStringLiteral(keyArg) ? keyArg.getLiteralValue() : method.getName();
     const optsArg = args[1];
-    if (optsArg && Node5.isObjectLiteralExpression(optsArg)) {
+    if (optsArg && Node6.isObjectLiteralExpression(optsArg)) {
       const typeProp = optsArg.getProperty("type");
-      if (typeProp && Node5.isPropertyAssignment(typeProp)) {
+      if (typeProp && Node6.isPropertyAssignment(typeProp)) {
         const typeInit = typeProp.getInitializer();
         if (typeInit) {
           const classified = classifyFilterForHint(typeInit);
@@ -3528,21 +3645,23 @@ function extractApplyFilterInfo(method, sourceFile, project, mixin) {
     const args = filterDecorator.getArguments();
     if (args.length === 0) continue;
     const filterClassArg = args[0];
-    if (!filterClassArg || !Node5.isIdentifier(filterClassArg)) continue;
+    if (!filterClassArg) continue;
+    const factoryStaticClass = resolveFactoryStaticClass(filterClassArg);
+    if (!factoryStaticClass && !Node6.isIdentifier(filterClassArg)) continue;
     let source = "query";
     const optionsArg = args[1];
-    if (optionsArg && Node5.isObjectLiteralExpression(optionsArg)) {
+    if (optionsArg && Node6.isObjectLiteralExpression(optionsArg)) {
       const sourceProp = optionsArg.getProperty("source");
-      if (sourceProp && Node5.isPropertyAssignment(sourceProp)) {
+      if (sourceProp && Node6.isPropertyAssignment(sourceProp)) {
         const init = sourceProp.getInitializer();
-        if (init && Node5.isStringLiteral(init) && init.getLiteralValue() === "body") {
+        if (init && Node6.isStringLiteral(init) && init.getLiteralValue() === "body") {
           source = "body";
         }
       }
     }
     const filterClassName = filterClassArg.getText();
-    const resolved = findType(filterClassName, declFile, project);
-    const classDecl = resolved?.kind === "class" ? resolved.decl : resolveLocalClassDeclaration(filterClassArg);
+    const resolved = factoryStaticClass ? void 0 : findType(filterClassName, declFile, project);
+    const classDecl = factoryStaticClass ?? (resolved?.kind === "class" ? resolved.decl : resolveLocalClassDeclaration(filterClassArg));
     if (classDecl) {
       let fieldTypes = extractClassPropertyTypes(classDecl, project);
       if (fieldTypes.length === 0) {
@@ -3598,22 +3717,22 @@ function resolveRelationEntity(prop, sourceFile, project) {
     const args = dec.getArguments();
     if (args.length === 0) continue;
     const arg = args[0];
-    if (Node5.isObjectLiteralExpression(arg)) {
+    if (Node6.isObjectLiteralExpression(arg)) {
       const entityProp = arg.getProperty("entity");
-      if (entityProp && Node5.isPropertyAssignment(entityProp)) {
+      if (entityProp && Node6.isPropertyAssignment(entityProp)) {
         const init = entityProp.getInitializer();
-        if (init && Node5.isArrowFunction(init)) {
+        if (init && Node6.isArrowFunction(init)) {
           const body = init.getBody();
-          if (Node5.isIdentifier(body)) {
+          if (Node6.isIdentifier(body)) {
             const resolved = findType(body.getText(), prop.getSourceFile(), project);
             if (resolved?.kind === "class") return resolved.decl;
           }
         }
       }
     }
-    if (Node5.isArrowFunction(arg)) {
+    if (Node6.isArrowFunction(arg)) {
       const body = arg.getBody();
-      if (Node5.isIdentifier(body)) {
+      if (Node6.isIdentifier(body)) {
         const resolved = findType(body.getText(), prop.getSourceFile(), project);
         if (resolved?.kind === "class") return resolved.decl;
       }
@@ -3632,15 +3751,15 @@ function extractClassPropertyTypes(classDecl, project) {
   return fields;
 }
 function resolveLocalClassDeclaration(identifier) {
-  if (!Node5.isIdentifier(identifier)) return void 0;
-  return identifier.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => n !== void 0 && Node5.isClassDeclaration(n));
+  if (!Node6.isIdentifier(identifier)) return void 0;
+  return identifier.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => n !== void 0 && Node6.isClassDeclaration(n));
 }
 function resolveDeclaredEntity(optionsArg, filterClass, project) {
-  if (!Node5.isObjectLiteralExpression(optionsArg)) return void 0;
+  if (!Node6.isObjectLiteralExpression(optionsArg)) return void 0;
   const entityProp = optionsArg.getProperty("entity");
-  if (!entityProp || !Node5.isPropertyAssignment(entityProp)) return void 0;
+  if (!entityProp || !Node6.isPropertyAssignment(entityProp)) return void 0;
   const entityInit = entityProp.getInitializer();
-  if (!entityInit || !Node5.isIdentifier(entityInit)) return void 0;
+  if (!entityInit || !Node6.isIdentifier(entityInit)) return void 0;
   const resolved = findType(entityInit.getText(), filterClass.getSourceFile(), project);
   if (!resolved || resolved.kind !== "class") return void 0;
   return resolved.decl;
@@ -3651,7 +3770,7 @@ function extractFilterableEntityFields(filterClass, project, entityOverride) {
   const args = filterableDecorator.getArguments();
   if (args.length === 0) return [];
   const optionsArg = args[0];
-  if (!Node5.isObjectLiteralExpression(optionsArg)) return [];
+  if (!Node6.isObjectLiteralExpression(optionsArg)) return [];
   const entityDecl = entityOverride ?? resolveDeclaredEntity(optionsArg, filterClass, project);
   if (!entityDecl) return [];
   const fields = collectEntityFields(
@@ -3664,17 +3783,17 @@ function extractFilterableEntityFields(filterClass, project, entityOverride) {
   const relationsDecorator = filterClass.getDecorators().find((d) => d.getName() === "Relations");
   if (relationsDecorator) {
     const relArgs = relationsDecorator.getArguments();
-    if (relArgs.length > 0 && Node5.isObjectLiteralExpression(relArgs[0])) {
+    if (relArgs.length > 0 && Node6.isObjectLiteralExpression(relArgs[0])) {
       for (const relProp of relArgs[0].getProperties()) {
-        if (!Node5.isPropertyAssignment(relProp)) continue;
+        if (!Node6.isPropertyAssignment(relProp)) continue;
         const relInit = relProp.getInitializer();
-        if (!relInit || !Node5.isObjectLiteralExpression(relInit)) continue;
+        if (!relInit || !Node6.isObjectLiteralExpression(relInit)) continue;
         const keysProp = relInit.getProperty("keys");
-        if (!keysProp || !Node5.isPropertyAssignment(keysProp)) continue;
+        if (!keysProp || !Node6.isPropertyAssignment(keysProp)) continue;
         const keysInit = keysProp.getInitializer();
-        if (!keysInit || !Node5.isArrayLiteralExpression(keysInit)) continue;
+        if (!keysInit || !Node6.isArrayLiteralExpression(keysInit)) continue;
         for (const el of keysInit.getElements()) {
-          if (Node5.isStringLiteral(el)) {
+          if (Node6.isStringLiteral(el)) {
             fields.push(toFilterFieldType(el.getLiteralValue(), { kind: "unknown" }));
           }
         }
@@ -3715,22 +3834,22 @@ var PASSTHROUGH_UTILITY = /* @__PURE__ */ new Set([
 ]);
 function resolveTypeNodeToString(typeNode, sourceFile, project, depth, subst = /* @__PURE__ */ new Map()) {
   if (depth <= 0) return "unknown";
-  if (Node6.isArrayTypeNode(typeNode)) {
+  if (Node7.isArrayTypeNode(typeNode)) {
     const elementType = typeNode.getElementTypeNode();
     return `Array<${resolveTypeNodeToString(elementType, sourceFile, project, depth, subst)}>`;
   }
-  if (Node6.isUnionTypeNode(typeNode)) {
+  if (Node7.isUnionTypeNode(typeNode)) {
     return typeNode.getTypeNodes().map((t) => resolveTypeNodeToString(t, sourceFile, project, depth, subst)).join(" | ");
   }
-  if (Node6.isIntersectionTypeNode(typeNode)) {
+  if (Node7.isIntersectionTypeNode(typeNode)) {
     return typeNode.getTypeNodes().map((t) => resolveTypeNodeToString(t, sourceFile, project, depth, subst)).join(" & ");
   }
-  if (Node6.isParenthesizedTypeNode(typeNode)) {
+  if (Node7.isParenthesizedTypeNode(typeNode)) {
     return `(${resolveTypeNodeToString(typeNode.getTypeNode(), sourceFile, project, depth, subst)})`;
   }
-  if (Node6.isTypeReference(typeNode)) {
+  if (Node7.isTypeReference(typeNode)) {
     const typeName = typeNode.getTypeName();
-    const name = Node6.isIdentifier(typeName) ? typeName.getText() : typeNode.getText();
+    const name = Node7.isIdentifier(typeName) ? typeName.getText() : typeNode.getText();
     const bound = subst.get(name);
     if (bound !== void 0) return bound;
     if (name === "string" || name === "number" || name === "boolean") return name;
@@ -3753,10 +3872,10 @@ function resolveTypeNodeToString(typeNode, sourceFile, project, depth, subst = /
     dbg("unresolvable type:", name, "in", sourceFile.getFilePath());
     return "unknown";
   }
-  if (Node6.isTypeLiteral(typeNode)) {
+  if (Node7.isTypeLiteral(typeNode)) {
     const members = [];
     for (const member of typeNode.getMembers()) {
-      if (Node6.isPropertySignature(member)) {
+      if (Node7.isPropertySignature(member)) {
         const memberTypeNode = member.getTypeNode();
         const memberType = memberTypeNode ? resolveTypeNodeToString(memberTypeNode, sourceFile, project, depth, subst) : "unknown";
         members.push(`${member.getName()}${member.hasQuestionToken() ? "?" : ""}: ${memberType}`);
@@ -3856,7 +3975,7 @@ function extractQueryType(method, sourceFile, project) {
     if (!queryDecorator) continue;
     const queryArgs = queryDecorator.getArguments();
     const nameArg = queryArgs[0];
-    if (!nameArg || !Node6.isStringLiteral(nameArg)) continue;
+    if (!nameArg || !Node7.isStringLiteral(nameArg)) continue;
     const queryName = nameArg.getLiteralValue();
     const typeNode = param.getTypeNode();
     const queryType = typeNode ? resolveTypeNodeToString(typeNode, sourceFile, project, 3) : "string";
@@ -3867,7 +3986,7 @@ function extractQueryType(method, sourceFile, project) {
 function isParamOptional(param) {
   if (param.hasQuestionToken() || param.hasInitializer()) return true;
   const typeNode = param.getTypeNode();
-  if (typeNode && Node6.isUnionTypeNode(typeNode)) {
+  if (typeNode && Node7.isUnionTypeNode(typeNode)) {
     return typeNode.getTypeNodes().some((t) => t.getKind() === SyntaxKind3.UndefinedKeyword);
   }
   return false;
@@ -3880,7 +3999,7 @@ function extractParamsType(method, sourceFile, project) {
     const paramArgs = paramDecorator.getArguments();
     if (paramArgs.length === 0) continue;
     const nameArg = paramArgs[0];
-    if (!Node6.isStringLiteral(nameArg)) continue;
+    if (!Node7.isStringLiteral(nameArg)) continue;
     const paramName = nameArg.getLiteralValue();
     const typeNode = param.getTypeNode();
     const paramType = typeNode ? resolveTypeNodeToString(typeNode, sourceFile, project, 3) : "string";
@@ -3901,28 +4020,28 @@ function extractUploadedFiles(method) {
   for (const decorator of method.getDecorators()) {
     if (decorator.getName() !== "UseInterceptors") continue;
     for (const arg of decorator.getArguments()) {
-      if (!Node6.isCallExpression(arg)) continue;
+      if (!Node7.isCallExpression(arg)) continue;
       const interceptor = arg.getExpression().getText();
       const callArgs = arg.getArguments();
       const firstArg2 = callArgs[0];
       if (interceptor === "FileInterceptor") {
-        if (firstArg2 && Node6.isStringLiteral(firstArg2)) {
+        if (firstArg2 && Node7.isStringLiteral(firstArg2)) {
           entries.push(`${firstArg2.getLiteralValue()}: ${FILE}`);
           multipart = true;
         }
       } else if (interceptor === "FilesInterceptor") {
-        if (firstArg2 && Node6.isStringLiteral(firstArg2)) {
+        if (firstArg2 && Node7.isStringLiteral(firstArg2)) {
           entries.push(`${firstArg2.getLiteralValue()}: Array<${FILE}>`);
           multipart = true;
         }
       } else if (interceptor === "FileFieldsInterceptor") {
-        if (firstArg2 && Node6.isArrayLiteralExpression(firstArg2)) {
+        if (firstArg2 && Node7.isArrayLiteralExpression(firstArg2)) {
           for (const el of firstArg2.getElements()) {
-            if (!Node6.isObjectLiteralExpression(el)) continue;
+            if (!Node7.isObjectLiteralExpression(el)) continue;
             const nameProp = el.getProperty("name");
-            if (nameProp && Node6.isPropertyAssignment(nameProp)) {
+            if (nameProp && Node7.isPropertyAssignment(nameProp)) {
               const init = nameProp.getInitializer();
-              if (init && Node6.isStringLiteral(init)) {
+              if (init && Node7.isStringLiteral(init)) {
                 entries.push(`${init.getLiteralValue()}: Array<${FILE}>`);
               }
             }
@@ -3942,13 +4061,13 @@ function extractResponseType(method, sourceFile, project) {
   if (apiResponseDecorator) {
     const args = apiResponseDecorator.getArguments();
     const optsArg = args[0];
-    if (optsArg && Node6.isObjectLiteralExpression(optsArg)) {
+    if (optsArg && Node7.isObjectLiteralExpression(optsArg)) {
       for (const prop of optsArg.getProperties()) {
-        if (!Node6.isPropertyAssignment(prop)) continue;
+        if (!Node7.isPropertyAssignment(prop)) continue;
         if (prop.getName() !== "type") continue;
         const val = prop.getInitializer();
         if (!val) continue;
-        if (Node6.isArrayLiteralExpression(val)) {
+        if (Node7.isArrayLiteralExpression(val)) {
           const elements = val.getElements();
           const firstEl = elements[0];
           if (elements.length > 0 && firstEl !== void 0) {
@@ -3969,24 +4088,24 @@ function extractResponseType(method, sourceFile, project) {
 }
 function apiResponseStatus(decorator) {
   const optsArg = decorator.getArguments()[0];
-  if (!optsArg || !Node6.isObjectLiteralExpression(optsArg)) return null;
+  if (!optsArg || !Node7.isObjectLiteralExpression(optsArg)) return null;
   for (const prop of optsArg.getProperties()) {
-    if (!Node6.isPropertyAssignment(prop)) continue;
+    if (!Node7.isPropertyAssignment(prop)) continue;
     if (prop.getName() !== "status") continue;
     const val = prop.getInitializer();
-    if (val && Node6.isNumericLiteral(val)) return Number(val.getLiteralValue());
+    if (val && Node7.isNumericLiteral(val)) return Number(val.getLiteralValue());
   }
   return null;
 }
 function apiResponseTypeNode(decorator) {
   const optsArg = decorator.getArguments()[0];
-  if (!optsArg || !Node6.isObjectLiteralExpression(optsArg)) return null;
+  if (!optsArg || !Node7.isObjectLiteralExpression(optsArg)) return null;
   for (const prop of optsArg.getProperties()) {
-    if (!Node6.isPropertyAssignment(prop)) continue;
+    if (!Node7.isPropertyAssignment(prop)) continue;
     if (prop.getName() !== "type") continue;
     const val = prop.getInitializer();
     if (!val) return null;
-    if (Node6.isArrayLiteralExpression(val)) {
+    if (Node7.isArrayLiteralExpression(val)) {
       const first = val.getElements()[0];
       return first ? { node: first, isArray: true } : null;
     }
@@ -4004,7 +4123,7 @@ function extractErrorType(method, sourceFile, project) {
     const inner = resolveIdentifierToClassType(typeInfo.node, sourceFile, project, 3);
     const type = typeInfo.isArray ? `Array<${inner}>` : inner;
     let ref = null;
-    if (Node6.isIdentifier(typeInfo.node)) {
+    if (Node7.isIdentifier(typeInfo.node)) {
       const name = typeInfo.node.getText();
       const localDecl = sourceFile.getInterface(name) || sourceFile.getClass(name) || sourceFile.getTypeAlias(name);
       if (localDecl?.isExported()) {
@@ -4021,7 +4140,7 @@ function extractErrorType(method, sourceFile, project) {
   return null;
 }
 function resolveIdentifierToClassType(node, sourceFile, project, depth) {
-  if (!Node6.isIdentifier(node)) return "unknown";
+  if (!Node7.isIdentifier(node)) return "unknown";
   const name = node.getText();
   const resolved = findType(name, sourceFile, project);
   if (resolved) {
@@ -4041,9 +4160,9 @@ var STREAM_ENVELOPES = /* @__PURE__ */ new Set(["MessageEvent", "MessageEventLik
 var BINARY_RESPONSE_TYPES = /* @__PURE__ */ new Set(["StreamableFile", "Buffer"]);
 function detectBinaryResponse(method) {
   const node = unwrapNamedContainer(method.getReturnTypeNode(), /* @__PURE__ */ new Set(["Promise"]));
-  if (!node || !Node6.isTypeReference(node)) return false;
+  if (!node || !Node7.isTypeReference(node)) return false;
   const typeName = node.getTypeName();
-  const name = Node6.isIdentifier(typeName) ? typeName.getText() : "";
+  const name = Node7.isIdentifier(typeName) ? typeName.getText() : "";
   return BINARY_RESPONSE_TYPES.has(name);
 }
 function detectStreamElement(method) {
@@ -4058,9 +4177,9 @@ function detectStreamElement(method) {
   return null;
 }
 function streamContainerElement(node) {
-  if (!node || !Node6.isTypeReference(node)) return null;
+  if (!node || !Node7.isTypeReference(node)) return null;
   const typeName = node.getTypeName();
-  const name = Node6.isIdentifier(typeName) ? typeName.getText() : "";
+  const name = Node7.isIdentifier(typeName) ? typeName.getText() : "";
   if (STREAM_CONTAINERS.has(name) || STREAM_CONTAINERS_GENERATOR.has(name)) {
     return node.getTypeArguments()[0] ?? null;
   }
@@ -4070,9 +4189,9 @@ function hasAsQueryDecorator(method) {
   return method.getDecorators().some((d) => d.getName() === "AsQuery");
 }
 function unwrapNamedContainer(node, names) {
-  if (!node || !Node6.isTypeReference(node)) return node;
+  if (!node || !Node7.isTypeReference(node)) return node;
   const typeName = node.getTypeName();
-  const name = Node6.isIdentifier(typeName) ? typeName.getText() : "";
+  const name = Node7.isIdentifier(typeName) ? typeName.getText() : "";
   if (names.has(name)) {
     return node.getTypeArguments()[0] ?? node;
   }
@@ -4118,11 +4237,11 @@ function extractDtoContract(method, sourceFile, project, mixin) {
     if (apiResp) {
       const args = apiResp.getArguments();
       const optsArg = args[0];
-      if (optsArg && Node6.isObjectLiteralExpression(optsArg)) {
+      if (optsArg && Node7.isObjectLiteralExpression(optsArg)) {
         for (const prop of optsArg.getProperties()) {
-          if (Node6.isPropertyAssignment(prop) && prop.getName() === "type") {
+          if (Node7.isPropertyAssignment(prop) && prop.getName() === "type") {
             const val = prop.getInitializer();
-            if (val && Node6.isIdentifier(val)) {
+            if (val && Node7.isIdentifier(val)) {
               const name = val.getText();
               const localDecl = sourceFile.getInterface(name) || sourceFile.getClass(name) || sourceFile.getTypeAlias(name);
               if (localDecl?.isExported()) {
@@ -4190,88 +4309,6 @@ function resolveParamClass(method, decoratorName, sourceFile, project) {
   return null;
 }
 
-// src/discovery/heritage.ts
-import { Node as Node7, Project as Project3 } from "ts-morph";
-function unwrapExpression(node) {
-  let current = node;
-  while (Node7.isAsExpression(current) || Node7.isSatisfiesExpression(current) || Node7.isParenthesizedExpression(current) || Node7.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) => Node7.isReturnStatement(n));
-  for (const ret of returns) {
-    const expr = ret.getExpression();
-    if (!expr) continue;
-    const inner = unwrapExpression(expr);
-    if (Node7.isClassExpression(inner)) {
-      return inner;
-    }
-    if (Node7.isIdentifier(inner)) {
-      const name = inner.getText();
-      const decl = body.getDescendants().find((n) => Node7.isClassDeclaration(n) && n.getName() === name);
-      if (decl) return decl;
-    }
-  }
-  return void 0;
-}
-function resolveInheritedMethods(cls) {
-  const expr = cls.getExtends()?.getExpression();
-  if (!expr || !Node7.isCallExpression(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));
-  if (!factoryDecl) return void 0;
-  const returnedClass = resolveReturnedClass(factoryDecl);
-  if (!returnedClass) return void 0;
-  const classArgs = [];
-  for (const arg of expr.getArguments()) {
-    if (!Node7.isIdentifier(arg)) continue;
-    const decl = arg.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => Node7.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 Project3({
-    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
 import { Node as Node8, SyntaxKind as SyntaxKind4 } from "ts-morph";
 function zodAstToTs(node) {
@@ -4775,9 +4812,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);
@@ -5086,7 +5125,7 @@ function createChainModuleRenderer(opts) {
 }
 
 // src/index.ts
-var VERSION = "0.17.0";
+var VERSION = "0.17.2";
 export {
   CodegenError,
   ConfigError,