@dudousxd/nestjs-codegen 0.15.0 → 0.16.0

package/dist/cli/main.js

@@ -2409,8 +2409,8 @@ import chokidar from "chokidar";
 import { join as join14, resolve as resolve3 } from "path";
 import fg3 from "fast-glob";
 import {
-  Node as Node8,
-  Project as Project3
+  Node as Node9,
+  Project as Project4
 } from "ts-morph";
 
 // src/discovery/dto-type-resolver.ts
@@ -3402,6 +3402,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 (Node5.isStringLiteral(typeInit)) {
     switch (typeInit.getLiteralValue()) {
@@ -3475,7 +3481,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;
@@ -3495,12 +3503,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) {
@@ -3585,22 +3593,29 @@ function extractClassPropertyTypes(classDecl, project) {
   }
   return fields;
 }
-function extractFilterableEntityFields(filterClass, project) {
+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));
+}
+function resolveDeclaredEntity(optionsArg, filterClass, project) {
+  if (!Node5.isObjectLiteralExpression(optionsArg)) return void 0;
+  const entityProp = optionsArg.getProperty("entity");
+  if (!entityProp || !Node5.isPropertyAssignment(entityProp)) return void 0;
+  const entityInit = entityProp.getInitializer();
+  if (!entityInit || !Node5.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 (!Node5.isObjectLiteralExpression(optionsArg)) return [];
-  const entityProp = optionsArg.getProperty("entity");
-  if (!entityProp || !Node5.isPropertyAssignment(entityProp)) return [];
-  const entityInit = entityProp.getInitializer();
-  if (!entityInit || !Node5.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(),
@@ -4025,9 +4040,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;
@@ -4137,12 +4152,94 @@ 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 Node7, SyntaxKind as SyntaxKind4 } from "ts-morph";
+import { Node as Node8, SyntaxKind as SyntaxKind4 } from "ts-morph";
 function zodAstToTs(node) {
-  if (!Node7.isCallExpression(node)) return "unknown";
+  if (!Node8.isCallExpression(node)) return "unknown";
   const expr = node.getExpression();
-  if (Node7.isPropertyAccessExpression(expr)) {
+  if (Node8.isPropertyAccessExpression(expr)) {
     const methodName = expr.getName();
     const receiver = expr.getExpression();
     if (methodName === "optional") {
@@ -4166,17 +4263,17 @@ function zodAstToTs(node) {
       case "literal": {
         const lit = args[0];
         if (!lit) return "unknown";
-        if (Node7.isStringLiteral(lit)) return JSON.stringify(lit.getLiteralValue());
-        if (Node7.isNumericLiteral(lit)) return lit.getLiteralValue().toString();
+        if (Node8.isStringLiteral(lit)) return JSON.stringify(lit.getLiteralValue());
+        if (Node8.isNumericLiteral(lit)) return lit.getLiteralValue().toString();
         if (lit.getKind() === SyntaxKind4.TrueKeyword) return "true";
         if (lit.getKind() === SyntaxKind4.FalseKeyword) return "false";
         return "unknown";
       }
       case "enum": {
         const arrArg = args[0];
-        if (!arrArg || !Node7.isArrayLiteralExpression(arrArg)) return "unknown";
+        if (!arrArg || !Node8.isArrayLiteralExpression(arrArg)) return "unknown";
         const members = arrArg.getElements().map(
-          (el) => Node7.isStringLiteral(el) ? JSON.stringify(el.getLiteralValue()) : "unknown"
+          (el) => Node8.isStringLiteral(el) ? JSON.stringify(el.getLiteralValue()) : "unknown"
         );
         return members.join(" | ");
       }
@@ -4187,10 +4284,10 @@ function zodAstToTs(node) {
       }
       case "object": {
         const objArg = args[0];
-        if (!objArg || !Node7.isObjectLiteralExpression(objArg)) return "unknown";
+        if (!objArg || !Node8.isObjectLiteralExpression(objArg)) return "unknown";
         const lines = [];
         for (const prop of objArg.getProperties()) {
-          if (!Node7.isPropertyAssignment(prop)) continue;
+          if (!Node8.isPropertyAssignment(prop)) continue;
           const key = prop.getName();
           const valNode = prop.getInitializer();
           if (!valNode) continue;
@@ -4202,7 +4299,7 @@ function zodAstToTs(node) {
       }
       case "union": {
         const arrArg = args[0];
-        if (!arrArg || !Node7.isArrayLiteralExpression(arrArg)) return "unknown";
+        if (!arrArg || !Node8.isArrayLiteralExpression(arrArg)) return "unknown";
         return arrArg.getElements().map(zodAstToTs).join(" | ");
       }
       case "record": {
@@ -4212,7 +4309,7 @@ function zodAstToTs(node) {
       }
       case "tuple": {
         const arrArg = args[0];
-        if (!arrArg || !Node7.isArrayLiteralExpression(arrArg)) return "unknown";
+        if (!arrArg || !Node8.isArrayLiteralExpression(arrArg)) return "unknown";
         return `[${arrArg.getElements().map(zodAstToTs).join(", ")}]`;
       }
       default:
@@ -4222,18 +4319,18 @@ function zodAstToTs(node) {
   return "unknown";
 }
 function isOptionalChain(node) {
-  if (!Node7.isCallExpression(node)) return false;
+  if (!Node8.isCallExpression(node)) return false;
   const expr = node.getExpression();
-  return Node7.isPropertyAccessExpression(expr) && expr.getName() === "optional";
+  return Node8.isPropertyAccessExpression(expr) && expr.getName() === "optional";
 }
 function parseDefineContractCall(callExpr) {
-  if (!Node7.isCallExpression(callExpr)) return null;
+  if (!Node8.isCallExpression(callExpr)) return null;
   const callee = callExpr.getExpression();
-  const calleeName = Node7.isIdentifier(callee) ? callee.getText() : Node7.isPropertyAccessExpression(callee) ? callee.getName() : "";
+  const calleeName = Node8.isIdentifier(callee) ? callee.getText() : Node8.isPropertyAccessExpression(callee) ? callee.getName() : "";
   if (calleeName !== "defineContract") return null;
   const args = callExpr.getArguments();
   const optsArg = args[0];
-  if (!optsArg || !Node7.isObjectLiteralExpression(optsArg)) return null;
+  if (!optsArg || !Node8.isObjectLiteralExpression(optsArg)) return null;
   let query = null;
   let body = null;
   let response = "unknown";
@@ -4241,7 +4338,7 @@ function parseDefineContractCall(callExpr) {
   let bodyZodText = null;
   let queryZodText = null;
   for (const prop of optsArg.getProperties()) {
-    if (!Node7.isPropertyAssignment(prop)) continue;
+    if (!Node8.isPropertyAssignment(prop)) continue;
     const propName = prop.getName();
     const val = prop.getInitializer();
     if (!val) continue;
@@ -4270,6 +4367,7 @@ async function discoverContractsFast(opts) {
     project.addSourceFileAtPath(f);
   }
   bindDiscoveryContext(project, cwd, tsconfigPath);
+  clearMixinTypeProject();
   return extractAllRoutes(project);
 }
 function resolveTsconfigPath(cwd, tsconfig) {
@@ -4277,14 +4375,14 @@ function resolveTsconfigPath(cwd, tsconfig) {
 }
 function createDiscoveryProject(tsconfigPath) {
   try {
-    return new Project3({
+    return new Project4({
       tsConfigFilePath: tsconfigPath,
       skipAddingFilesFromTsConfig: true,
       skipLoadingLibFiles: true,
       skipFileDependencyResolution: true
     });
   } catch {
-    return new Project3({
+    return new Project4({
       skipAddingFilesFromTsConfig: true,
       skipLoadingLibFiles: true,
       skipFileDependencyResolution: true,
@@ -4391,15 +4489,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 (Node8.isStringLiteral(decoratorExpr)) return decoratorExpr.getLiteralValue();
-  if (Node8.isArrayLiteralExpression(decoratorExpr)) {
+  if (Node9.isStringLiteral(decoratorExpr)) return decoratorExpr.getLiteralValue();
+  if (Node9.isArrayLiteralExpression(decoratorExpr)) {
     const first = decoratorExpr.getElements()[0];
-    if (first && Node8.isStringLiteral(first)) return first.getLiteralValue();
+    if (first && Node9.isStringLiteral(first)) return first.getLiteralValue();
   }
   return void 0;
 }
@@ -4421,7 +4520,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;
@@ -4475,7 +4575,8 @@ function buildRoute(args) {
     methodAs,
     sourceFile,
     seenNames,
-    contractSource
+    contractSource,
+    mixin
   } = args;
   const routeName = resolveRouteName(className, methodName, classAs, methodAs);
   const qualifiedRef = `${className}.${methodName}`;
@@ -4491,7 +4592,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 }
   };
 }
@@ -4505,16 +4611,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 (Node8.isCallExpression(firstDecoratorArg)) {
+  if (Node9.isCallExpression(firstDecoratorArg)) {
     contractDef = parseDefineContractCall(firstDecoratorArg);
-  } else if (Node8.isIdentifier(firstDecoratorArg)) {
+  } else if (Node9.isIdentifier(firstDecoratorArg)) {
     const identName = firstDecoratorArg.getText();
     const resolvedVar = resolveImportedVariable(identName, sourceFile, project);
     if (!resolvedVar) {
@@ -4557,6 +4664,7 @@ function extractContractRoute(args) {
     methodAs,
     sourceFile,
     seenNames,
+    mixin,
     contractSource: {
       query: contractDef.query,
       body: contractDef.body,
@@ -4573,13 +4681,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,
@@ -4589,10 +4698,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,
@@ -4621,7 +4731,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({
@@ -4633,7 +4753,8 @@ function extractFromSourceFile(sourceFile, project) {
         className,
         sourceFile,
         project,
-        seenNames
+        seenNames,
+        mixin
       }) : extractDtoRoute({
         cls,
         method,
@@ -4642,7 +4763,8 @@ function extractFromSourceFile(sourceFile, project) {
         className,
         sourceFile,
         project,
-        seenNames
+        seenNames,
+        mixin
       });
       if (route) routes.push(route);
     }
@@ -4843,7 +4965,7 @@ async function watch(config, onChange, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "0.15.0";
+var VERSION = "0.16.0";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {