mongodb-dynamic-api 2.1.1 → 2.1.2

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 Changelog
 
+## [2.1.2](https://github.com/MikeDev75015/mongodb-dynamic-api/compare/v2.1.1...v2.1.2) (2024-03-26)
+
+
+* rename all custom dto to avoid swagger conflicts ([0bc7e5f](https://github.com/MikeDev75015/mongodb-dynamic-api/commit/0bc7e5fe85f3c44ce3382839e5a502d3232e5526))
+
 ## [2.1.1](https://github.com/MikeDev75015/mongodb-dynamic-api/compare/v2.1.0...v2.1.1) (2024-03-21)
 
 ## [2.1.0](https://github.com/MikeDev75015/mongodb-dynamic-api/compare/v2.0.0...v2.1.0) (2024-03-20)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb-dynamic-api",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Auto generated CRUD API for MongoDB using NestJS",
   "readmeFilename": "README.md",
   "main": "index.js",

package/src/builders/casl/casl-ability.builder.d.ts

@@ -1,5 +1,5 @@
 import { Type } from '@nestjs/common';
-import { AppAbility, DynamicApiRouteCaslAbilityPredicate, RouteType } from '../../interfaces';
+import { AppAbility, RouteAbilityPredicate, RouteType } from '../../interfaces';
 import { BaseEntity } from '../../models';
-declare function CaslAbilityBuilder<Entity extends BaseEntity>(entity: Type<Entity>, routeType: RouteType, abilityPredicate: DynamicApiRouteCaslAbilityPredicate<Entity>, user: unknown): AppAbility<Entity>;
+declare function CaslAbilityBuilder<Entity extends BaseEntity>(entity: Type<Entity>, routeType: RouteType, abilityPredicate: RouteAbilityPredicate<Entity>, user: unknown): AppAbility<Entity>;
 export { CaslAbilityBuilder };

package/src/builders/casl/casl-ability.builder.js

@@ -2,13 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CaslAbilityBuilder = void 0;
 const ability_1 = require("@casl/ability");
+const interfaces_1 = require("../../interfaces");
 function CaslAbilityBuilder(entity, routeType, abilityPredicate, user) {
-    const { can, build } = new ability_1.AbilityBuilder(ability_1.createMongoAbility);
-    if (abilityPredicate(new entity(), user)) {
-        can(routeType, entity);
+    if (!entity || !routeType || !abilityPredicate || !user) {
+        throw new Error('Invalid parameters, cannot build ability');
     }
+    const { can, build } = new ability_1.AbilityBuilder(ability_1.PureAbility);
+    can(routeType, entity, (instance) => abilityPredicate(instance, user));
     return build({
-        detectSubjectType: (object) => object.constructor
+        conditionsMatcher: interfaces_1.lambdaMatcher,
+        detectSubjectType: (object) => object.constructor,
     });
 }
 exports.CaslAbilityBuilder = CaslAbilityBuilder;

package/src/guards/base-policies.guard.d.ts

@@ -1,12 +1,12 @@
 import { CanActivate, ExecutionContext, Type } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
-import { DynamicApiRouteCaslAbilityPredicate, RouteType } from '../interfaces';
+import { RouteAbilityPredicate, RouteType } from '../interfaces';
 import { BaseEntity } from '../models';
 export declare abstract class BasePoliciesGuard<Entity extends BaseEntity> implements CanActivate {
     protected readonly reflector: Reflector;
     protected routeType: RouteType;
     protected entity: Type<Entity>;
-    protected abilityPredicate: DynamicApiRouteCaslAbilityPredicate<Entity> | undefined;
+    protected abilityPredicate: RouteAbilityPredicate<Entity> | undefined;
     protected constructor(reflector: Reflector);
     canActivate(context: ExecutionContext): boolean;
     private execPolicyHandler;

package/src/helpers/controller-ability-predicates.helper.d.ts

@@ -1,4 +1,4 @@
-import { DynamicApiControllerAbilityPredicate, DynamicApiRouteCaslAbilityPredicate, RouteType } from '../interfaces';
+import { ControllerAbilityPredicate, RouteAbilityPredicate, RouteType } from '../interfaces';
 import { BaseEntity } from '../models';
-declare function getPredicateFromControllerAbilityPredicates<Entity extends BaseEntity>(controllerAbilityPredicates: DynamicApiControllerAbilityPredicate<Entity>[], route: RouteType): DynamicApiRouteCaslAbilityPredicate<Entity>;
+declare function getPredicateFromControllerAbilityPredicates<Entity extends BaseEntity>(controllerAbilityPredicates: ControllerAbilityPredicate<Entity>[], route: RouteType): RouteAbilityPredicate<Entity>;
 export { getPredicateFromControllerAbilityPredicates };

package/src/helpers/format.helper.d.ts

@@ -1,2 +1,3 @@
 export declare function pascalCase(str?: string): string;
 export declare function isValidVersion(version: string): boolean;
+export declare function getFormattedApiTag<Entity>(apiTag: string | undefined, entityName: string): string;

package/src/helpers/format.helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidVersion = exports.pascalCase = void 0;
+exports.getFormattedApiTag = exports.isValidVersion = exports.pascalCase = void 0;
 const lodash_1 = require("lodash");
 function pascalCase(str) {
     return str ? (0, lodash_1.upperFirst)((0, lodash_1.camelCase)(str)) : undefined;
@@ -10,3 +10,7 @@ function isValidVersion(version) {
     return /^\d+$/.test(version);
 }
 exports.isValidVersion = isValidVersion;
+function getFormattedApiTag(apiTag, entityName) {
+    return pascalCase(apiTag) ?? entityName;
+}
+exports.getFormattedApiTag = getFormattedApiTag;

package/src/interfaces/dynamic-api-casl-ability.interface.d.ts

@@ -1,9 +1,12 @@
+import { AbilityTuple, MatchConditions, PureAbility } from '@casl/ability';
 import { BaseEntity } from '../models';
 import { RouteType } from './dynamic-api-route-type.type';
-type DynamicApiRouteCaslAbilityPredicate<Entity extends BaseEntity, T = any> = (entity: Entity, user?: T) => boolean;
-type DynamicApiRegisterAbilityPredicate<T = any> = (user?: T) => boolean;
-type DynamicApiControllerAbilityPredicate<Entity extends BaseEntity> = {
+type AppAbility<Entity extends BaseEntity> = PureAbility<AbilityTuple, MatchConditions<Entity>>;
+declare const lambdaMatcher: <Entity extends BaseEntity>(matchConditions: MatchConditions<Entity>) => MatchConditions<Entity>;
+type RouteAbilityPredicate<Entity extends BaseEntity, User = any> = (entity: Entity, user: User) => boolean;
+type RegisterAbilityPredicate<User = any> = (user: User) => boolean;
+type ControllerAbilityPredicate<Entity extends BaseEntity> = {
     targets: RouteType[];
-    predicate: DynamicApiRouteCaslAbilityPredicate<Entity>;
+    predicate: RouteAbilityPredicate<Entity>;
 };
-export { DynamicApiRouteCaslAbilityPredicate, DynamicApiRegisterAbilityPredicate, DynamicApiControllerAbilityPredicate, };
+export { AppAbility, ControllerAbilityPredicate, RegisterAbilityPredicate, RouteAbilityPredicate, lambdaMatcher, };

package/src/interfaces/dynamic-api-casl-ability.interface.js

@@ -1,2 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.lambdaMatcher = void 0;
+const lambdaMatcher = (matchConditions) => matchConditions;
+exports.lambdaMatcher = lambdaMatcher;

package/src/interfaces/dynamic-api-controller-options.interface.d.ts

@@ -1,12 +1,12 @@
 import { ValidationPipeOptions } from '@nestjs/common';
 import { BaseEntity } from '../models';
-import { DynamicApiControllerAbilityPredicate } from './dynamic-api-casl-ability.interface';
+import { ControllerAbilityPredicate } from './dynamic-api-casl-ability.interface';
 interface DynamicApiControllerOptions<Entity extends BaseEntity> {
     path: string;
     apiTag?: string;
     version?: string;
     isPublic?: boolean;
     validationPipeOptions?: ValidationPipeOptions;
-    abilityPredicates?: DynamicApiControllerAbilityPredicate<Entity>[];
+    abilityPredicates?: ControllerAbilityPredicate<Entity>[];
 }
 export { DynamicApiControllerOptions };

package/src/interfaces/dynamic-api-policy-handler.interface.d.ts

@@ -1,9 +1,7 @@
-import { MongoAbility } from '@casl/ability/dist/types';
-import { ExecutionContext, Type } from '@nestjs/common';
+import { ExecutionContext } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { BaseEntity } from '../models';
-import { RouteType } from './dynamic-api-route-type.type';
-type AppAbility<Entity extends BaseEntity> = MongoAbility<[RouteType, Type<Entity>]>;
+import { AppAbility } from './dynamic-api-casl-ability.interface';
 interface IPolicyHandler<Entity extends BaseEntity> {
     handle(ability: AppAbility<Entity>): boolean;
 }
@@ -13,4 +11,4 @@ interface PoliciesGuard<Entity extends BaseEntity> {
     canActivate(context: ExecutionContext): boolean;
 }
 type PoliciesGuardConstructor<Entity extends BaseEntity> = new (reflector: Reflector) => PoliciesGuard<Entity>;
-export { AppAbility, PolicyHandler, PoliciesGuardConstructor, PoliciesGuard };
+export { PolicyHandler, PoliciesGuardConstructor, PoliciesGuard };

package/src/interfaces/dynamic-api-route-config.interface.d.ts

@@ -1,6 +1,6 @@
 import { ValidationPipeOptions } from '@nestjs/common';
 import { BaseEntity } from '../models';
-import { DynamicApiRouteCaslAbilityPredicate } from './dynamic-api-casl-ability.interface';
+import { RouteAbilityPredicate } from './dynamic-api-casl-ability.interface';
 import { DTOsBundle } from './dynamic-api-route-dtos-bundle.type';
 import { RouteType } from './dynamic-api-route-type.type';
 interface DynamicAPIRouteConfig<Entity extends BaseEntity> {
@@ -10,6 +10,6 @@ interface DynamicAPIRouteConfig<Entity extends BaseEntity> {
     version?: string;
     dTOs?: DTOsBundle;
     validationPipeOptions?: ValidationPipeOptions;
-    abilityPredicate?: DynamicApiRouteCaslAbilityPredicate<Entity>;
+    abilityPredicate?: RouteAbilityPredicate<Entity>;
 }
 export { DynamicAPIRouteConfig };

package/src/mixins/create-policies-guard.mixin.d.ts

@@ -1,5 +1,5 @@
 import { Type } from '@nestjs/common';
-import { DynamicApiRouteCaslAbilityPredicate, PoliciesGuardConstructor, RouteType } from '../interfaces';
+import { RouteAbilityPredicate, PoliciesGuardConstructor, RouteType } from '../interfaces';
 import { BaseEntity } from '../models';
-declare function CreatePoliciesGuardMixin<Entity extends BaseEntity>(entity: Type<Entity>, routeType: RouteType, version: string | undefined, abilityPredicate: DynamicApiRouteCaslAbilityPredicate<Entity> | undefined): PoliciesGuardConstructor<Entity>;
+declare function CreatePoliciesGuardMixin<Entity extends BaseEntity>(entity: Type<Entity>, routeType: RouteType, version: string | undefined, abilityPredicate: RouteAbilityPredicate<Entity> | undefined): PoliciesGuardConstructor<Entity>;
 export { CreatePoliciesGuardMixin };

package/src/modules/auth/interfaces/auth-options.interface.d.ts

@@ -1,9 +1,9 @@
 import { Type } from '@nestjs/common';
-import { DynamicApiRegisterAbilityPredicate } from '../../../interfaces';
+import { RegisterAbilityPredicate } from '../../../interfaces';
 import { BaseEntity } from '../../../models';
 type DynamicApiRegisterOptions<Entity extends BaseEntity = any> = {
     protected?: boolean;
-    abilityPredicate?: DynamicApiRegisterAbilityPredicate;
+    abilityPredicate?: RegisterAbilityPredicate;
     additionalFields?: (keyof Entity | {
         name: keyof Entity;
         required?: boolean;

package/src/modules/auth/mixins/auth-register-policies-guard.mixin.d.ts

@@ -1,6 +1,6 @@
 import { Type } from '@nestjs/common';
-import { DynamicApiRegisterAbilityPredicate, PoliciesGuardConstructor, RouteType } from '../../../interfaces';
+import { RegisterAbilityPredicate, PoliciesGuardConstructor, RouteType } from '../../../interfaces';
 import { BaseEntity } from '../../../models';
 declare const registerRouteType: RouteType;
-declare function AuthRegisterPoliciesGuardMixin<Entity extends BaseEntity>(entity: Type<Entity>, abilityPredicate: DynamicApiRegisterAbilityPredicate | undefined): PoliciesGuardConstructor<Entity>;
+declare function AuthRegisterPoliciesGuardMixin<Entity extends BaseEntity>(entity: Type<Entity>, abilityPredicate: RegisterAbilityPredicate | undefined): PoliciesGuardConstructor<Entity>;
 export { AuthRegisterPoliciesGuardMixin, registerRouteType };

package/src/modules/auth/services/base-auth.service.d.ts

@@ -48,4 +48,5 @@ export declare abstract class BaseAuthService<Entity extends BaseEntity> extends
         accessToken: string;
     }>;
     private getUserById;
+    private buildUserFields;
 }

package/src/modules/auth/services/base-auth.service.js

@@ -14,7 +14,7 @@ class BaseAuthService extends services_1.BaseService {
     }
     async validateUser(login, pass) {
         const user = (await this.model.findOne({ [this.loginField]: login }).lean().exec());
-        if (!user || !await this.bcryptService.comparePassword(pass, user[this.passwordField])) {
+        if (!user || !(await this.bcryptService.comparePassword(pass, user[this.passwordField]))) {
             return null;
         }
         const fieldsToBuild = [
@@ -22,7 +22,7 @@ class BaseAuthService extends services_1.BaseService {
             this.loginField,
             ...this.additionalRequestFields,
         ];
-        return this.buildInstance(fieldsToBuild.reduce((acc, field) => (user[field] ? { ...acc, [field]: user[field] } : acc), {}));
+        return this.buildUserFields(user, fieldsToBuild);
     }
     async login(user) {
         const fieldsToBuild = [
@@ -31,7 +31,7 @@ class BaseAuthService extends services_1.BaseService {
             this.loginField,
             ...this.additionalRequestFields,
         ];
-        const payload = this.buildInstance(fieldsToBuild.reduce((acc, field) => (user[field] !== undefined ? { ...acc, [field]: user[field] } : acc), {}));
+        const payload = this.buildUserFields(user, fieldsToBuild);
         return {
             accessToken: this.jwtService.sign(payload),
         };
@@ -49,7 +49,7 @@ class BaseAuthService extends services_1.BaseService {
             this.loginField,
             ...this.additionalRequestFields,
         ];
-        return this.buildInstance(fieldsToBuild.reduce((acc, field) => (user[field] !== undefined ? { ...acc, [field]: user[field] } : acc), {}));
+        return this.buildUserFields(user, fieldsToBuild);
     }
     async changePassword(userId, newPassword) {
         const hashedPassword = await this.bcryptService.hashPassword(newPassword);
@@ -60,5 +60,8 @@ class BaseAuthService extends services_1.BaseService {
     async getUserById(userId) {
         return (await this.model.findOne({ _id: userId }).lean().exec());
     }
+    buildUserFields(user, fieldsToBuild) {
+        return this.buildInstance(fieldsToBuild.reduce((acc, field) => (user[field] !== undefined ? { ...acc, [field]: user[field] } : acc), {}));
+    }
 }
 exports.BaseAuthService = BaseAuthService;

package/src/routes/create-many/create-many-controller.mixin.js

@@ -23,7 +23,7 @@ const helpers_1 = require("../../helpers");
 const controller_ability_predicates_helper_1 = require("../../helpers/controller-ability-predicates.helper");
 const mixins_1 = require("../../mixins");
 function CreateManyControllerMixin(entity, { path, apiTag, isPublic: isPublicController, abilityPredicates: controllerAbilityPredicates, }, { type: routeType, description, dTOs, isPublic: isPublicRoute, abilityPredicate: routeAbilityPredicate, }, version) {
-    const displayedName = (0, helpers_1.pascalCase)(apiTag) ?? entity.name;
+    const displayedName = (0, helpers_1.getFormattedApiTag)(apiTag, entity.name);
     const { body: CustomBody, presenter: CustomPresenter } = dTOs ?? {};
     let isPublic;
     if (typeof isPublicRoute === 'boolean') {
@@ -53,20 +53,16 @@ function CreateManyControllerMixin(entity, { path, apiTag, isPublic: isPublicCon
     ], CreateManyBody.prototype, "list", void 0);
     class RouteBody extends (0, swagger_1.PickType)(CustomBody ?? CreateManyBody, ['list']) {
     }
-    if (!CustomBody) {
-        Object.defineProperty(RouteBody, 'name', {
-            value: `CreateMany${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Dto`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(RouteBody, 'name', {
+        value: CustomBody ? CustomBody.name : `CreateMany${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Dto`,
+        writable: false,
+    });
     class RoutePresenter extends (CustomPresenter ?? (0, mixins_1.EntityPresenterMixin)(entity)) {
     }
-    if (!CustomPresenter) {
-        Object.defineProperty(RoutePresenter, 'name', {
-            value: `${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(RoutePresenter, 'name', {
+        value: CustomPresenter ? CustomPresenter.name : `${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
+        writable: false,
+    });
     const routeDecoratorsBuilder = new builders_1.RouteDecoratorsBuilder('CreateMany', entity, version, description, isPublic, {
         param: undefined,
         query: undefined,

package/src/routes/create-one/create-one-controller.mixin.js

@@ -20,7 +20,7 @@ const helpers_1 = require("../../helpers");
 const controller_ability_predicates_helper_1 = require("../../helpers/controller-ability-predicates.helper");
 const mixins_1 = require("../../mixins");
 function CreateOneControllerMixin(entity, { path, apiTag, isPublic: isPublicController, abilityPredicates: controllerAbilityPredicates, }, { type: routeType, description, dTOs, isPublic: isPublicRoute, abilityPredicate: routeAbilityPredicate, }, version) {
-    const displayedName = (0, helpers_1.pascalCase)(apiTag) ?? entity.name;
+    const displayedName = (0, helpers_1.getFormattedApiTag)(apiTag, entity.name);
     const { body: CustomBody, presenter: CustomPresenter } = dTOs ?? {};
     let isPublic;
     if (typeof isPublicRoute === 'boolean') {
@@ -34,20 +34,16 @@ function CreateOneControllerMixin(entity, { path, apiTag, isPublic: isPublicCont
     }
     class RouteBody extends (CustomBody ?? (0, mixins_1.EntityBodyMixin)(entity)) {
     }
-    if (!CustomBody) {
-        Object.defineProperty(RouteBody, 'name', {
-            value: `CreateOne${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Dto`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(RouteBody, 'name', {
+        value: CustomBody ? CustomBody.name : `CreateOne${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Dto`,
+        writable: false,
+    });
     class RoutePresenter extends (CustomPresenter ?? (0, mixins_1.EntityPresenterMixin)(entity)) {
     }
-    if (!CustomPresenter) {
-        Object.defineProperty(RoutePresenter, 'name', {
-            value: `${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(RoutePresenter, 'name', {
+        value: CustomPresenter ? CustomPresenter.name : `${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
+        writable: false,
+    });
     const routeDecoratorsBuilder = new builders_1.RouteDecoratorsBuilder('CreateOne', entity, version, description, isPublic, {
         param: undefined,
         query: undefined,

package/src/routes/delete-many/delete-many-controller.mixin.js

@@ -21,7 +21,7 @@ const controller_ability_predicates_helper_1 = require("../../helpers/controller
 const mixins_1 = require("../../mixins");
 const delete_many_presenter_1 = require("./delete-many.presenter");
 function DeleteManyControllerMixin(entity, { path, apiTag, isPublic: isPublicController, abilityPredicates: controllerAbilityPredicates, }, { type: routeType, description, dTOs, isPublic: isPublicRoute, abilityPredicate: routeAbilityPredicate, }, version) {
-    const displayedName = (0, helpers_1.pascalCase)(apiTag) ?? entity.name;
+    const displayedName = (0, helpers_1.getFormattedApiTag)(apiTag, entity.name);
     const { presenter: CustomPresenter } = dTOs ?? {};
     let isPublic;
     if (typeof isPublicRoute === 'boolean') {
@@ -35,12 +35,10 @@ function DeleteManyControllerMixin(entity, { path, apiTag, isPublic: isPublicCon
     }
     class RoutePresenter extends (CustomPresenter ?? delete_many_presenter_1.DeleteManyPresenter) {
     }
-    if (!CustomPresenter) {
-        Object.defineProperty(RoutePresenter, 'name', {
-            value: `DeleteMany${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(RoutePresenter, 'name', {
+        value: CustomPresenter ? CustomPresenter.name : `DeleteMany${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
+        writable: false,
+    });
     const routeDecoratorsBuilder = new builders_1.RouteDecoratorsBuilder('DeleteMany', entity, version, description, isPublic, {
         param: undefined,
         query: undefined,

package/src/routes/delete-one/delete-one-controller.mixin.js

@@ -22,8 +22,8 @@ const controller_ability_predicates_helper_1 = require("../../helpers/controller
 const mixins_1 = require("../../mixins");
 const delete_one_presenter_1 = require("./delete-one.presenter");
 function DeleteOneControllerMixin(entity, { path, apiTag, isPublic: isPublicController, abilityPredicates: controllerAbilityPredicates, }, { type: routeType, description, dTOs, isPublic: isPublicRoute, abilityPredicate: routeAbilityPredicate, }, version) {
-    const displayedName = (0, helpers_1.pascalCase)(apiTag) ?? entity.name;
-    const { param: CustomParam, presenter: CustomPresenter } = dTOs ?? {};
+    const displayedName = (0, helpers_1.getFormattedApiTag)(apiTag, entity.name);
+    const { presenter: CustomPresenter } = dTOs ?? {};
     let isPublic;
     if (typeof isPublicRoute === 'boolean') {
         isPublic = isPublicRoute;
@@ -34,24 +34,18 @@ function DeleteOneControllerMixin(entity, { path, apiTag, isPublic: isPublicCont
     else {
         isPublic = false;
     }
-    class RouteParam extends (CustomParam ?? dtos_1.EntityParam) {
-    }
-    if (!CustomParam) {
-        Object.defineProperty(RouteParam, 'name', {
-            value: `DeleteOne${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Param`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(dtos_1.EntityParam, 'name', {
+        value: `DeleteOne${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Param`,
+        writable: false,
+    });
     class RoutePresenter extends (CustomPresenter ?? delete_one_presenter_1.DeleteOnePresenter) {
     }
-    if (!CustomPresenter) {
-        Object.defineProperty(RoutePresenter, 'name', {
-            value: `DeleteOne${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(RoutePresenter, 'name', {
+        value: CustomPresenter ? CustomPresenter.name : `DeleteOne${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
+        writable: false,
+    });
     const routeDecoratorsBuilder = new builders_1.RouteDecoratorsBuilder('DeleteOne', entity, version, description, isPublic, {
-        param: RouteParam,
+        param: dtos_1.EntityParam,
         query: undefined,
         body: undefined,
         presenter: RoutePresenter,

package/src/routes/duplicate-many/duplicate-many-controller.mixin.js

@@ -20,7 +20,7 @@ const helpers_1 = require("../../helpers");
 const controller_ability_predicates_helper_1 = require("../../helpers/controller-ability-predicates.helper");
 const mixins_1 = require("../../mixins");
 function DuplicateManyControllerMixin(entity, { path, apiTag, isPublic: isPublicController, abilityPredicates: controllerAbilityPredicates, }, { type: routeType, description, dTOs, isPublic: isPublicRoute, abilityPredicate: routeAbilityPredicate, }, version) {
-    const displayedName = (0, helpers_1.pascalCase)(apiTag) ?? entity.name;
+    const displayedName = (0, helpers_1.getFormattedApiTag)(apiTag, entity.name);
     const { body: CustomBody, presenter: CustomPresenter, } = dTOs ?? {};
     let isPublic;
     if (typeof isPublicRoute === 'boolean') {
@@ -34,20 +34,16 @@ function DuplicateManyControllerMixin(entity, { path, apiTag, isPublic: isPublic
     }
     class RouteBody extends (CustomBody ?? (0, mixins_1.EntityBodyMixin)(entity, true)) {
     }
-    if (!CustomBody) {
-        Object.defineProperty(RouteBody, 'name', {
-            value: `DuplicateMany${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Dto`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(RouteBody, 'name', {
+        value: CustomBody ? CustomBody.name : `DuplicateMany${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Dto`,
+        writable: false,
+    });
     class RoutePresenter extends (CustomPresenter ?? (0, mixins_1.EntityPresenterMixin)(entity)) {
     }
-    if (!CustomPresenter) {
-        Object.defineProperty(RoutePresenter, 'name', {
-            value: `${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(RoutePresenter, 'name', {
+        value: CustomPresenter ? CustomPresenter.name : `${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
+        writable: false,
+    });
     const routeDecoratorsBuilder = new builders_1.RouteDecoratorsBuilder('DuplicateMany', entity, version, description, isPublic, {
         param: undefined,
         query: undefined,

package/src/routes/duplicate-one/duplicate-one-controller.mixin.js

@@ -21,8 +21,8 @@ const helpers_1 = require("../../helpers");
 const controller_ability_predicates_helper_1 = require("../../helpers/controller-ability-predicates.helper");
 const mixins_1 = require("../../mixins");
 function DuplicateOneControllerMixin(entity, { path, apiTag, isPublic: isPublicController, abilityPredicates: controllerAbilityPredicates, }, { type: routeType, description, dTOs, isPublic: isPublicRoute, abilityPredicate: routeAbilityPredicate, }, version) {
-    const displayedName = (0, helpers_1.pascalCase)(apiTag) ?? entity.name;
-    const { body: CustomBody, param: CustomParam, presenter: CustomPresenter, } = dTOs ?? {};
+    const displayedName = (0, helpers_1.getFormattedApiTag)(apiTag, entity.name);
+    const { body: CustomBody, presenter: CustomPresenter, } = dTOs ?? {};
     let isPublic;
     if (typeof isPublicRoute === 'boolean') {
         isPublic = isPublicRoute;
@@ -33,32 +33,24 @@ function DuplicateOneControllerMixin(entity, { path, apiTag, isPublic: isPublicC
     else {
         isPublic = false;
     }
+    Object.defineProperty(dtos_1.EntityParam, 'name', {
+        value: `DuplicateOne${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Param`,
+        writable: false,
+    });
     class RouteBody extends (CustomBody ?? (0, mixins_1.EntityBodyMixin)(entity, true)) {
     }
-    if (!CustomBody) {
-        Object.defineProperty(RouteBody, 'name', {
-            value: `DuplicateOne${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Dto`,
-            writable: false,
-        });
-    }
-    class RouteParam extends (CustomParam ?? dtos_1.EntityParam) {
-    }
-    if (!CustomParam) {
-        Object.defineProperty(RouteParam, 'name', {
-            value: `DuplicateOne${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Param`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(RouteBody, 'name', {
+        value: CustomBody ? CustomBody.name : `DuplicateOne${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Dto`,
+        writable: false,
+    });
     class RoutePresenter extends (CustomPresenter ?? (0, mixins_1.EntityPresenterMixin)(entity)) {
     }
-    if (!CustomPresenter) {
-        Object.defineProperty(RoutePresenter, 'name', {
-            value: `${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(RoutePresenter, 'name', {
+        value: CustomPresenter ? CustomPresenter.name : `${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
+        writable: false,
+    });
     const routeDecoratorsBuilder = new builders_1.RouteDecoratorsBuilder('DuplicateOne', entity, version, description, isPublic, {
-        param: RouteParam,
+        param: dtos_1.EntityParam,
         query: undefined,
         body: RouteBody,
         presenter: RoutePresenter,

package/src/routes/get-many/get-many-controller.mixin.js

@@ -21,7 +21,7 @@ const helpers_1 = require("../../helpers");
 const controller_ability_predicates_helper_1 = require("../../helpers/controller-ability-predicates.helper");
 const mixins_1 = require("../../mixins");
 function GetManyControllerMixin(entity, { path, apiTag, isPublic: isPublicController, abilityPredicates: controllerAbilityPredicates, }, { type: routeType, description, dTOs, isPublic: isPublicRoute, abilityPredicate: routeAbilityPredicate, }, version) {
-    const displayedName = (0, helpers_1.pascalCase)(apiTag) ?? entity.name;
+    const displayedName = (0, helpers_1.getFormattedApiTag)(apiTag, entity.name);
     const { query: CustomQuery, presenter: CustomPresenter } = dTOs ?? {};
     let isPublic;
     if (typeof isPublicRoute === 'boolean') {
@@ -35,20 +35,16 @@ function GetManyControllerMixin(entity, { path, apiTag, isPublic: isPublicContro
     }
     class RouteQuery extends (CustomQuery ?? dtos_1.EntityQuery) {
     }
-    if (!CustomQuery) {
-        Object.defineProperty(RouteQuery, 'name', {
-            value: `${routeType}${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Query`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(RouteQuery, 'name', {
+        value: CustomQuery ? CustomQuery.name : `${routeType}${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Query`,
+        writable: false,
+    });
     class RoutePresenter extends (CustomPresenter ?? (0, mixins_1.EntityPresenterMixin)(entity)) {
     }
-    if (!CustomPresenter) {
-        Object.defineProperty(RoutePresenter, 'name', {
-            value: `${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(RoutePresenter, 'name', {
+        value: CustomPresenter ? CustomPresenter.name : `${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
+        writable: false,
+    });
     const routeDecoratorsBuilder = new builders_1.RouteDecoratorsBuilder(routeType, entity, version, description, isPublic, {
         param: undefined,
         query: RouteQuery,

package/src/routes/get-one/get-one-controller.mixin.js

@@ -21,8 +21,8 @@ const helpers_1 = require("../../helpers");
 const controller_ability_predicates_helper_1 = require("../../helpers/controller-ability-predicates.helper");
 const mixins_1 = require("../../mixins");
 function GetOneControllerMixin(entity, { path, apiTag, isPublic: isPublicController, abilityPredicates: controllerAbilityPredicates, }, { type: routeType, description, dTOs, isPublic: isPublicRoute, abilityPredicate: routeAbilityPredicate, }, version) {
-    const displayedName = (0, helpers_1.pascalCase)(apiTag) ?? entity.name;
-    const { param: CustomParam, query: CustomQuery, presenter: CustomPresenter, } = dTOs ?? {};
+    const displayedName = (0, helpers_1.getFormattedApiTag)(apiTag, entity.name);
+    const { query: CustomQuery, presenter: CustomPresenter, } = dTOs ?? {};
     let isPublic;
     if (typeof isPublicRoute === 'boolean') {
         isPublic = isPublicRoute;
@@ -33,32 +33,24 @@ function GetOneControllerMixin(entity, { path, apiTag, isPublic: isPublicControl
     else {
         isPublic = false;
     }
-    class RouteParam extends (CustomParam ?? dtos_1.EntityParam) {
-    }
-    if (!CustomParam) {
-        Object.defineProperty(RouteParam, 'name', {
-            value: `GetOne${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Param`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(dtos_1.EntityParam, 'name', {
+        value: `GetOne${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Param`,
+        writable: false,
+    });
     class RouteQuery extends (CustomQuery ?? dtos_1.EntityQuery) {
     }
-    if (!CustomQuery) {
-        Object.defineProperty(RouteQuery, 'name', {
-            value: `GetOne${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Query`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(RouteQuery, 'name', {
+        value: CustomQuery ? CustomQuery.name : `GetOne${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Query`,
+        writable: false,
+    });
     class RoutePresenter extends (CustomPresenter ?? (0, mixins_1.EntityPresenterMixin)(entity)) {
     }
-    if (!CustomPresenter) {
-        Object.defineProperty(RoutePresenter, 'name', {
-            value: `${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
-            writable: false,
-        });
-    }
+    Object.defineProperty(RoutePresenter, 'name', {
+        value: CustomPresenter ? CustomPresenter.name : `${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Presenter`,
+        writable: false,
+    });
     const routeDecoratorsBuilder = new builders_1.RouteDecoratorsBuilder('GetOne', entity, version, description, isPublic, {
-        param: RouteParam,
+        param: dtos_1.EntityParam,
         query: RouteQuery,
         body: undefined,
         presenter: RoutePresenter,