@dudousxd/nestjs-codegen 0.20.0 → 0.21.0

package/dist/cli/main.js

@@ -3717,7 +3717,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()) {
@@ -3743,7 +3743,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 && Node6.isIdentifier(filterClassArg) ? declaredClass : void 0;
     for (const candidate of orderFilterCandidates({
       namedByRoute,
@@ -4334,9 +4334,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;
@@ -4899,7 +4899,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,
@@ -5180,7 +5180,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 = {}) {