@dudousxd/nestjs-codegen 0.20.0 → 0.21.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @dudousxd/nestjs-codegen
 
+## 0.21.0
+
+### Minor Changes
+
+- 71b4485: Tell an overridden route from an inherited one by the class it is declared on, not by its file
+
+  `extractApplyFilterInfo` decided whether a route was the controller's OWN by
+  comparing the method's file to the factory's (`declFile !== mixin.factoryFilePath`).
+  That is a proxy for the real question, and it breaks on the one shape where the
+  two come apart: a controller factory declared in the SAME file as a controller
+  that calls it. There, a genuine override reads as inherited, its
+  `@ApplyFilter(SomeFilter)` is mistaken for the factory talking about itself, and
+  the factory's `filter` option silently outranks the filter the override names —
+  typing the route against a filter the runtime does not use.
+
+  `extractDtoContract` now takes the `@Controller` class the route was discovered
+  on and passes it down, so the check is `method.getParent() === controllerClass`:
+  the ground truth the discovery pass already computed when it merged own and
+  inherited methods. The parameter is optional — omitting it degrades to the
+  previous file comparison, so an external caller of the exported
+  `extractDtoContract` keeps working unchanged.
+
+  This also settles a disagreement between packages. `@dudousxd/nestjs-filter-codegen`
+  asks the same question via `controllerClass.getMethod(name)` and was already
+  right about the colocated case; the two have to agree on what an override IS, not
+  merely on how to rank one, or the same route ends up described twice, differently.
+
 ## 0.20.0
 
 ### Minor Changes

package/dist/cli/main.cjs

@@ -3736,7 +3736,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()) {
@@ -3762,7 +3762,7 @@ function extractApplyFilterInfo(method, sourceFile, project, mixin) {
     const filterClassName = filterClassArg.getText();
     const resolved = factoryStaticClass ? void 0 : findType(filterClassName, declFile, project);
     const declaredClass = factoryStaticClass ?? (resolved?.kind === "class" ? resolved.decl : resolveLocalClassDeclaration(filterClassArg));
-    const ownRoute = !mixin || declFile.getFilePath() !== mixin.factoryFilePath;
+    const ownRoute = !mixin || (controllerClass ? method.getParent() === controllerClass : declFile.getFilePath() !== mixin.factoryFilePath);
     const namedByRoute = ownRoute && import_ts_morph7.Node.isIdentifier(filterClassArg) ? declaredClass : void 0;
     for (const candidate of orderFilterCandidates({
       namedByRoute,
@@ -4353,9 +4353,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;
@@ -4918,7 +4918,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,
@@ -5199,7 +5199,7 @@ async function watch(config, onChange, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "0.20.0";
+var VERSION = "0.21.0";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {