@dudousxd/nestjs-codegen 0.18.0 → 0.20.0

package/dist/index.d.cts

@@ -382,6 +382,6 @@ interface FastDiscoveryOptions {
 }
 declare function discoverContractsFast(opts: FastDiscoveryOptions): Promise<RouteDescriptor[]>;
 
-declare const VERSION = "0.18.0";
+declare const VERSION = "0.20.0";
 
 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.18.0";
+declare const VERSION = "0.20.0";
 
 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

@@ -3480,10 +3480,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;
@@ -3505,12 +3541,26 @@ 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()) {
@@ -3528,7 +3578,12 @@ function resolveInheritedMethods(cls) {
   }
   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,
     namedClassArgs
@@ -3587,10 +3642,15 @@ function resolveInstantiatedReturnType(cls, methodName) {
 
 // src/discovery/filter-for.ts
 function resolveMixinEntityClass(mixin, project) {
-  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);
+  return resolveClassRef(mixin?.namedClassArgs?.entity ?? mixin?.classArgs[0], project);
+}
+function resolveMixinFilterClass(mixin, project) {
+  return resolveClassRef(mixin?.namedClassArgs?.filter, project);
+}
+function resolveClassRef(ref, project) {
+  if (!ref) return void 0;
+  const file = project.getSourceFile(ref.filePath) ?? project.addSourceFileAtPathIfExists(ref.filePath);
+  return file?.getClass(ref.name);
 }
 function classifyFilterForHint(typeInit) {
   if (Node6.isStringLiteral(typeInit)) {
@@ -3690,31 +3750,55 @@ function extractApplyFilterInfo(method, sourceFile, project, mixin) {
     }
     const filterClassName = filterClassArg.getText();
     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) {
-        fieldTypes = extractFilterableEntityFields(classDecl, project, mixinEntity);
-      }
-      const filterForHints = extractFilterForHints(classDecl, project);
-      if (filterForHints.size > 0) {
-        const byName = new Map(fieldTypes.map((f) => [f.name, f]));
-        for (const [key, classified] of filterForHints) {
-          byName.set(key, toFilterFieldType(key, classified));
-        }
-        fieldTypes = [...byName.values()];
-      }
-      if (fieldTypes.length === 0) return null;
-      const fieldNames = fieldTypes.map((f) => f.name);
+    const declaredClass = factoryStaticClass ?? (resolved?.kind === "class" ? resolved.decl : resolveLocalClassDeclaration(filterClassArg));
+    const ownRoute = !mixin || declFile.getFilePath() !== mixin.factoryFilePath;
+    const namedByRoute = ownRoute && Node6.isIdentifier(filterClassArg) ? declaredClass : void 0;
+    for (const candidate of orderFilterCandidates({
+      namedByRoute,
+      supplied: resolveMixinFilterClass(mixin, project),
+      declared: declaredClass
+    })) {
+      const fieldTypes = collectFilterFields(candidate, project, mixinEntity);
+      if (fieldTypes.length === 0) continue;
       return {
-        fieldNames,
+        fieldNames: fieldTypes.map((f) => f.name),
         fieldTypes,
         source
       };
     }
+    if (declaredClass) return null;
   }
   return null;
 }
+function orderFilterCandidates(sources) {
+  const ordered = [];
+  const seen = /* @__PURE__ */ new Set();
+  const push = (decl, preferDeclaredEntity) => {
+    if (!decl || seen.has(decl)) return;
+    seen.add(decl);
+    ordered.push({ decl, preferDeclaredEntity });
+  };
+  push(sources.namedByRoute, true);
+  push(sources.supplied, true);
+  push(sources.declared, false);
+  return ordered;
+}
+function collectFilterFields(candidate, project, mixinEntity) {
+  const { decl, preferDeclaredEntity } = candidate;
+  let fieldTypes = extractClassPropertyTypes(decl, project);
+  if (fieldTypes.length === 0) {
+    fieldTypes = extractFilterableEntityFields(decl, project, mixinEntity, preferDeclaredEntity);
+  }
+  const filterForHints = extractFilterForHints(decl, project);
+  if (filterForHints.size > 0) {
+    const byName = new Map(fieldTypes.map((f) => [f.name, f]));
+    for (const [key, classified] of filterForHints) {
+      byName.set(key, toFilterFieldType(key, classified));
+    }
+    fieldTypes = [...byName.values()];
+  }
+  return fieldTypes;
+}
 var RELATION_DECORATORS = /* @__PURE__ */ new Set(["OneToMany", "ManyToOne", "ManyToMany", "OneToOne"]);
 function collectEntityFields(entityDecl, sourceFile, project, prefix, visited) {
   const entityName = entityDecl.getName() ?? "";
@@ -3793,21 +3877,53 @@ function resolveDeclaredEntity(optionsArg, filterClass, project) {
   if (!resolved || resolved.kind !== "class") return void 0;
   return resolved.decl;
 }
-function extractFilterableEntityFields(filterClass, project, entityOverride) {
+function readFieldNameList(optionsArg, key) {
+  if (!Node6.isObjectLiteralExpression(optionsArg)) return void 0;
+  const prop = optionsArg.getProperty(key);
+  if (!prop || !Node6.isPropertyAssignment(prop)) return void 0;
+  const init = prop.getInitializer();
+  if (!init || !Node6.isArrayLiteralExpression(init)) return void 0;
+  const names = /* @__PURE__ */ new Set();
+  for (const el of init.getElements()) {
+    if (Node6.isStringLiteral(el)) {
+      names.add(el.getLiteralValue());
+      continue;
+    }
+    if (Node6.isObjectLiteralExpression(el)) {
+      const fieldProp = el.getProperty("field");
+      if (fieldProp && Node6.isPropertyAssignment(fieldProp)) {
+        const fieldInit = fieldProp.getInitializer();
+        if (fieldInit && Node6.isStringLiteral(fieldInit)) {
+          names.add(fieldInit.getLiteralValue());
+          continue;
+        }
+      }
+    }
+    return void 0;
+  }
+  return names;
+}
+function narrowToDeclaredFields(fields, optionsArg) {
+  const allowed = readFieldNameList(optionsArg, "allowed");
+  const blocked = readFieldNameList(optionsArg, "blocked");
+  if (!allowed && !blocked) return fields;
+  return fields.filter(
+    (f) => (!allowed || allowed.has(f.name)) && !(blocked?.has(f.name) ?? false)
+  );
+}
+function extractFilterableEntityFields(filterClass, project, entityOverride, preferDeclaredEntity = false) {
   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 (!Node6.isObjectLiteralExpression(optionsArg)) return [];
-  const entityDecl = entityOverride ?? resolveDeclaredEntity(optionsArg, filterClass, project);
+  const declaredEntity = resolveDeclaredEntity(optionsArg, filterClass, project);
+  const entityDecl = preferDeclaredEntity ? declaredEntity ?? entityOverride : entityOverride ?? declaredEntity;
   if (!entityDecl) return [];
-  const fields = collectEntityFields(
-    entityDecl,
-    entityDecl.getSourceFile(),
-    project,
-    "",
-    /* @__PURE__ */ new Set()
+  const fields = narrowToDeclaredFields(
+    collectEntityFields(entityDecl, entityDecl.getSourceFile(), project, "", /* @__PURE__ */ new Set()),
+    optionsArg
   );
   const relationsDecorator = filterClass.getDecorators().find((d) => d.getName() === "Relations");
   if (relationsDecorator) {
@@ -5155,7 +5271,7 @@ function createChainModuleRenderer(opts) {
 }
 
 // src/index.ts
-var VERSION = "0.18.0";
+var VERSION = "0.20.0";
 export {
   CodegenError,
   ConfigError,