@dudousxd/nestjs-codegen 0.17.0 → 0.17.1

package/dist/nest/index.cjs

@@ -4020,6 +4020,19 @@ function resolveParamClass(method, decoratorName, sourceFile, project) {
 
 // src/discovery/heritage.ts
 var import_ts_morph8 = require("ts-morph");
+function resolveHeritageCall(node) {
+  if (!node) return void 0;
+  const expr = unwrapExpression(node);
+  if (import_ts_morph8.Node.isCallExpression(expr)) return expr;
+  if (!import_ts_morph8.Node.isIdentifier(expr)) return void 0;
+  const decl = expr.getDefinitions().map((d) => d.getDeclarationNode()).find(
+    (n) => n !== void 0 && import_ts_morph8.Node.isVariableDeclaration(n)
+  );
+  const init = decl?.getInitializer();
+  if (!init) return void 0;
+  const unwrapped = unwrapExpression(init);
+  return import_ts_morph8.Node.isCallExpression(unwrapped) ? unwrapped : void 0;
+}
 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)) {
@@ -4047,8 +4060,8 @@ function resolveReturnedClass(factoryDecl) {
   return void 0;
 }
 function resolveInheritedMethods(cls) {
-  const expr = cls.getExtends()?.getExpression();
-  if (!expr || !import_ts_morph8.Node.isCallExpression(expr)) return void 0;
+  const expr = resolveHeritageCall(cls.getExtends()?.getExpression());
+  if (!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));
@@ -4584,9 +4597,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);
@@ -4812,7 +4827,7 @@ async function watch(config, onChange, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "0.17.0";
+var VERSION = "0.17.1";
 
 // src/generate-manifest.ts
 var MANIFEST_FILE = ".codegen-manifest.json";