@dudousxd/nestjs-codegen 0.17.2 → 0.19.0

package/dist/cli/main.js

@@ -3472,10 +3472,46 @@ function resolveReturnedClass(factoryDecl) {
   }
   return void 0;
 }
+function factoryCalleeName(call) {
+  const callee = unwrapExpression(call.getExpression());
+  if (Node5.isIdentifier(callee)) return callee;
+  if (Node5.isPropertyAccessExpression(callee)) {
+    const name = callee.getNameNode();
+    return Node5.isIdentifier(name) ? name : void 0;
+  }
+  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));
+  const name = factoryCalleeName(call);
+  return name ? resolveFactoryFromName(name, /* @__PURE__ */ new Set()) : void 0;
+}
+function resolveFactoryFromName(name, seen) {
+  if (seen.has(name)) return void 0;
+  seen.add(name);
+  const decls = name.getDefinitions().map((d) => d.getDeclarationNode()).filter((n) => n !== void 0);
+  for (const decl of decls) {
+    if (Node5.isFunctionDeclaration(decl) || Node5.isMethodDeclaration(decl)) return decl;
+    if (Node5.isPropertyAssignment(decl)) {
+      const init = decl.getInitializer();
+      const inner = init ? unwrapExpression(init) : void 0;
+      if (inner && Node5.isIdentifier(inner)) {
+        const resolved = resolveFactoryFromName(inner, seen);
+        if (resolved) return resolved;
+      }
+      continue;
+    }
+    if (Node5.isShorthandPropertyAssignment(decl)) {
+      const nameNode = decl.getNameNode();
+      const resolved = Node5.isIdentifier(nameNode) ? resolveFactoryFromName(nameNode, seen) : void 0;
+      if (resolved) return resolved;
+    }
+  }
+  return void 0;
+}
+function warnUnresolvedFactory(cls, calleeText, reason) {
+  console.warn(
+    `[nestjs-codegen/fast] ${cls.getName() ?? "<anonymous class>"} in ${cls.getSourceFile().getFilePath()} extends ${calleeText}(...) but ${reason} \u2014 it contributes NO routes to the generated client. Resolvable factory callees: a name (\`factory(...)\`), a namespace or object property (\`ns.factory(...)\`), or a static method (\`Factory.create(...)\`), each resolving to a function or method declaration that returns a class.`
+  );
 }
 function resolveFactoryStaticClass(node) {
   if (!Node5.isPropertyAccessExpression(node)) return void 0;
@@ -3497,30 +3533,78 @@ function resolveFactoryStaticClass(node) {
 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 isController = cls.getDecorator("Controller") !== void 0;
+  const calleeText = expr.getExpression().getText();
   const factoryDecl = resolveFactoryDeclaration(expr);
-  if (!factoryDecl) return void 0;
+  if (!factoryDecl) {
+    if (isController) {
+      warnUnresolvedFactory(
+        cls,
+        calleeText,
+        factoryCalleeName(expr) ? "its callee does not resolve to a function or method declaration" : "its callee is not a name that can be resolved statically"
+      );
+    }
+    return void 0;
+  }
   const returnedClass = resolveReturnedClass(factoryDecl);
-  if (!returnedClass) return void 0;
+  if (!returnedClass) {
+    if (isController) {
+      warnUnresolvedFactory(cls, calleeText, "that factory does not return a class declaration");
+    }
+    return void 0;
+  }
   const classArgs = [];
+  const namedClassArgs = {};
   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()
-      });
+    const positional = resolveClassReference(arg);
+    if (positional) {
+      classArgs.push(positional);
+      continue;
+    }
+    if (!Node5.isObjectLiteralExpression(arg)) continue;
+    for (const prop of arg.getProperties()) {
+      const named = resolvePropertyClassReference(prop);
+      if (!named) continue;
+      namedClassArgs[named.key] ??= named.ref;
     }
   }
   return {
     methods: returnedClass.getMethods(),
-    factoryName: callee.getText(),
+    // The DECLARATION's name, not the call-site text: consumers look the factory
+    // back up by name inside `factoryFilePath`, which a qualified
+    // `tables.createTableController` would never match. For a bare identifier
+    // the two coincide (bar an import alias, where the declaration name is the
+    // one that resolves anyway).
+    factoryName: factoryDecl.getName() ?? calleeText,
     factoryFilePath: factoryDecl.getSourceFile().getFilePath(),
-    classArgs
+    classArgs,
+    namedClassArgs
   };
 }
+function resolveClassReference(node) {
+  const expr = unwrapExpression(node);
+  if (!Node5.isIdentifier(expr)) return void 0;
+  const decl = expr.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => n !== void 0 && Node5.isClassDeclaration(n));
+  if (!decl) return void 0;
+  return {
+    name: decl.getName() ?? expr.getText(),
+    filePath: decl.getSourceFile().getFilePath()
+  };
+}
+function resolvePropertyClassReference(prop) {
+  if (Node5.isShorthandPropertyAssignment(prop)) {
+    const ref2 = resolveClassReference(prop.getNameNode());
+    return ref2 ? { key: prop.getName(), ref: ref2 } : void 0;
+  }
+  if (!Node5.isPropertyAssignment(prop)) return void 0;
+  const init = prop.getInitializer();
+  if (!init) return void 0;
+  const ref = resolveClassReference(init);
+  if (!ref) return void 0;
+  const nameNode = prop.getNameNode();
+  const key = Node5.isStringLiteral(nameNode) ? nameNode.getLiteralValue() : prop.getName();
+  return { key, ref };
+}
 var mixinTypeProject;
 function getMixinTypeProject() {
   mixinTypeProject ??= new Project3({
@@ -3550,7 +3634,7 @@ function resolveInstantiatedReturnType(cls, methodName) {
 
 // src/discovery/filter-for.ts
 function resolveMixinEntityClass(mixin, project) {
-  const entityArg = mixin?.classArgs[0];
+  const entityArg = mixin?.namedClassArgs?.entity ?? mixin?.classArgs[0];
   if (!entityArg) return void 0;
   const file = project.getSourceFile(entityArg.filePath) ?? project.addSourceFileAtPathIfExists(entityArg.filePath);
   return file?.getClass(entityArg.name);
@@ -4802,7 +4886,8 @@ function extractFromSourceFile(sourceFile, project) {
     const mixinBinding = inherited ? {
       factoryName: inherited.factoryName,
       factoryFilePath: inherited.factoryFilePath,
-      classArgs: inherited.classArgs
+      classArgs: inherited.classArgs,
+      namedClassArgs: inherited.namedClassArgs
     } : void 0;
     const ownMethods = cls.getMethods();
     const ownNames = new Set(ownMethods.map((m) => m.getName()));
@@ -5034,7 +5119,7 @@ async function watch(config, onChange, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "0.17.2";
+var VERSION = "0.19.0";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {