@dudousxd/nestjs-codegen 0.19.0 → 0.21.0

package/dist/index.d.cts

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

@@ -3642,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)) {
@@ -3720,7 +3725,7 @@ function extractFilterForHints(classDecl, project) {
   }
   return hints;
 }
-function extractApplyFilterInfo(method, sourceFile, project, mixin) {
+function extractApplyFilterInfo(method, sourceFile, project, mixin, controllerClass) {
   const declFile = method.getSourceFile();
   const mixinEntity = resolveMixinEntityClass(mixin, project);
   for (const param of method.getParameters()) {
@@ -3745,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 || (controllerClass ? method.getParent() === controllerClass : 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() ?? "";
@@ -3848,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) {
@@ -4281,9 +4342,9 @@ function unwrapNamedContainer(node, names) {
   }
   return node;
 }
-function extractDtoContract(method, sourceFile, project, mixin) {
+function extractDtoContract(method, sourceFile, project, mixin, controllerClass) {
   let body = extractBodyType(method, sourceFile, project);
-  const filterInfo = extractApplyFilterInfo(method, sourceFile, project, mixin);
+  const filterInfo = extractApplyFilterInfo(method, sourceFile, project, mixin, controllerClass);
   const query = extractQueryType(method, sourceFile, project);
   const uploads = extractUploadedFiles(method);
   const multipartBody = uploads.fields ? `{ ${uploads.fields} }` : null;
@@ -4846,7 +4907,7 @@ function extractDtoRoute(args) {
   const methodName = method.getName();
   const classAs = readAsDecorator(cls, `class ${className}`);
   const methodAs = readAsDecorator(method, `${className}.${methodName}`);
-  const dtoContract = extractDtoContract(method, sourceFile, project, mixin);
+  const dtoContract = extractDtoContract(method, sourceFile, project, mixin, cls);
   const mixinResponse = mixin ? resolveInstantiatedReturnType(cls, methodName) : void 0;
   return buildRoute({
     className,
@@ -5210,7 +5271,7 @@ function createChainModuleRenderer(opts) {
 }
 
 // src/index.ts
-var VERSION = "0.19.0";
+var VERSION = "0.21.0";
 export {
   CodegenError,
   ConfigError,