mongodb-dynamic-api 2.1.1 → 2.1.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 Changelog
 
+## [2.1.3](https://github.com/MikeDev75015/mongodb-dynamic-api/compare/v2.1.2...v2.1.3) (2024-03-29)
+
+## [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.3",
   "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/dtos/delete.presenter.d.ts

@@ -0,0 +1,3 @@
+export declare class DeletePresenter {
+    deletedCount: number;
+}

package/src/{routes/delete-one/delete-one.presenter.js → dtos/delete.presenter.js}

@@ -9,12 +9,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeleteOnePresenter = void 0;
+exports.DeletePresenter = void 0;
 const swagger_1 = require("@nestjs/swagger");
-class DeleteOnePresenter {
+class DeletePresenter {
 }
-exports.DeleteOnePresenter = DeleteOnePresenter;
+exports.DeletePresenter = DeletePresenter;
 __decorate([
     (0, swagger_1.ApiProperty)(),
     __metadata("design:type", Number)
-], DeleteOnePresenter.prototype, "deletedCount", void 0);
+], DeletePresenter.prototype, "deletedCount", void 0);

package/src/dtos/index.d.ts

@@ -1,3 +1,4 @@
 export * from './delete-many-entity.query';
+export * from './delete.presenter';
 export * from './entity.param';
 export * from './entity.query';

package/src/dtos/index.js

@@ -15,5 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./delete-many-entity.query"), exports);
+__exportStar(require("./delete.presenter"), exports);
 __exportStar(require("./entity.param"), exports);
 __exportStar(require("./entity.query"), exports);

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/controller-mixin.helper.d.ts

@@ -0,0 +1,66 @@
+import { Type } from '@nestjs/common';
+import { EntityParam } from '../dtos';
+import { DynamicApiControllerOptions, DynamicAPIRouteConfig } from '../interfaces';
+import { BaseEntity } from '../models';
+declare function getControllerMixinData<Entity extends BaseEntity>(entity: Type<Entity>, { path, apiTag, isPublic: isPublicController, abilityPredicates: controllerAbilityPredicates, }: DynamicApiControllerOptions<Entity>, { type: routeType, description, dTOs, isPublic: isPublicRoute, abilityPredicate: routeAbilityPredicate, }: DynamicAPIRouteConfig<Entity>, version?: string): {
+    routeType: import("../interfaces/dynamic-api-route-type.type").RouteType;
+    displayedName: string;
+    description: string;
+    isPublic: boolean;
+    abilityPredicate: import("../interfaces/dynamic-api-casl-ability.interface").RouteAbilityPredicate<Entity>;
+    RouteBody: Type<any>;
+    RoutePresenter: Type<any>;
+    EntityParam?: undefined;
+    RouteQuery?: undefined;
+} | {
+    routeType: import("../interfaces/dynamic-api-route-type.type").RouteType;
+    displayedName: string;
+    description: string;
+    isPublic: boolean;
+    abilityPredicate: import("../interfaces/dynamic-api-casl-ability.interface").RouteAbilityPredicate<Entity>;
+    RoutePresenter: Type<any>;
+    RouteBody?: undefined;
+    EntityParam?: undefined;
+    RouteQuery?: undefined;
+} | {
+    routeType: import("../interfaces/dynamic-api-route-type.type").RouteType;
+    displayedName: string;
+    description: string;
+    isPublic: boolean;
+    abilityPredicate: import("../interfaces/dynamic-api-casl-ability.interface").RouteAbilityPredicate<Entity>;
+    EntityParam: typeof EntityParam;
+    RoutePresenter: Type<any>;
+    RouteBody?: undefined;
+    RouteQuery?: undefined;
+} | {
+    routeType: import("../interfaces/dynamic-api-route-type.type").RouteType;
+    displayedName: string;
+    description: string;
+    isPublic: boolean;
+    abilityPredicate: import("../interfaces/dynamic-api-casl-ability.interface").RouteAbilityPredicate<Entity>;
+    RouteBody: Type<any>;
+    RoutePresenter: Type<any>;
+    EntityParam: typeof EntityParam;
+    RouteQuery?: undefined;
+} | {
+    routeType: import("../interfaces/dynamic-api-route-type.type").RouteType;
+    displayedName: string;
+    description: string;
+    isPublic: boolean;
+    abilityPredicate: import("../interfaces/dynamic-api-casl-ability.interface").RouteAbilityPredicate<Entity>;
+    RouteQuery: Type<any>;
+    RoutePresenter: Type<any>;
+    RouteBody?: undefined;
+    EntityParam?: undefined;
+} | {
+    routeType: import("../interfaces/dynamic-api-route-type.type").RouteType;
+    displayedName: string;
+    description: string;
+    isPublic: boolean;
+    abilityPredicate: import("../interfaces/dynamic-api-casl-ability.interface").RouteAbilityPredicate<Entity>;
+    EntityParam: typeof EntityParam;
+    RouteQuery: Type<any>;
+    RoutePresenter: Type<any>;
+    RouteBody?: undefined;
+};
+export { getControllerMixinData };

package/src/helpers/controller-mixin.helper.js

@@ -0,0 +1,159 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getControllerMixinData = void 0;
+const swagger_1 = require("@nestjs/swagger");
+const class_transformer_1 = require("class-transformer");
+const class_validator_1 = require("class-validator");
+const dtos_1 = require("../dtos");
+const mixins_1 = require("../mixins");
+const controller_ability_predicates_helper_1 = require("./controller-ability-predicates.helper");
+const format_helper_1 = require("./format.helper");
+const versioning_config_helper_1 = require("./versioning-config.helper");
+function buildCreateManyBodyDTO(entity, displayedName, version, CustomBody) {
+    class DtoBody extends (0, mixins_1.EntityBodyMixin)(entity) {
+    }
+    Object.defineProperty(DtoBody, 'name', {
+        value: `${displayedName}${(0, versioning_config_helper_1.addVersionSuffix)(version)}Dto`,
+        writable: false,
+    });
+    class CreateManyBody {
+    }
+    __decorate([
+        (0, swagger_1.ApiProperty)({ type: [DtoBody] }),
+        (0, class_validator_1.ValidateNested)({ each: true }),
+        (0, class_validator_1.IsInstance)(DtoBody, { each: true }),
+        (0, class_validator_1.ArrayMinSize)(1),
+        (0, class_transformer_1.Type)(() => DtoBody),
+        __metadata("design:type", Array)
+    ], CreateManyBody.prototype, "list", void 0);
+    class RouteBody extends (0, swagger_1.PickType)(CustomBody ?? CreateManyBody, ['list']) {
+    }
+    Object.defineProperty(RouteBody, 'name', {
+        value: CustomBody ? CustomBody.name : `CreateMany${displayedName}${(0, versioning_config_helper_1.addVersionSuffix)(version)}Dto`,
+        writable: false,
+    });
+    return RouteBody;
+}
+function buildDeletePresenterDTO(displayedName, version, CustomPresenter) {
+    class RoutePresenter extends (CustomPresenter ?? dtos_1.DeletePresenter) {
+    }
+    Object.defineProperty(RoutePresenter, 'name', {
+        value: CustomPresenter ? CustomPresenter.name : `Delete${displayedName}${(0, versioning_config_helper_1.addVersionSuffix)(version)}Presenter`,
+        writable: false,
+    });
+    return RoutePresenter;
+}
+function buildDefaultRouteQuery(entity, routeType, displayedName, version, CustomQuery) {
+    class RouteQuery extends (CustomQuery ?? dtos_1.EntityQuery) {
+    }
+    Object.defineProperty(RouteQuery, 'name', {
+        value: CustomQuery ? CustomQuery.name : `${routeType}${displayedName}${(0, versioning_config_helper_1.addVersionSuffix)(version)}Query`,
+        writable: false,
+    });
+    return RouteQuery;
+}
+function buildDefaultRouteBody(entity, routeType, displayedName, version, CustomBody) {
+    const optionalBody = routeType !== 'CreateOne' && routeType !== 'ReplaceOne';
+    class RouteBody extends (CustomBody ?? (0, mixins_1.EntityBodyMixin)(entity, optionalBody)) {
+    }
+    Object.defineProperty(RouteBody, 'name', {
+        value: CustomBody ? CustomBody.name : `${routeType}${displayedName}${(0, versioning_config_helper_1.addVersionSuffix)(version)}Dto`,
+        writable: false,
+    });
+    return RouteBody;
+}
+function buildDefaultRoutePresenter(entity, routeType, displayedName, version, CustomPresenter) {
+    class RoutePresenter extends (CustomPresenter ?? (0, mixins_1.EntityPresenterMixin)(entity)) {
+    }
+    Object.defineProperty(RoutePresenter, 'name', {
+        value: CustomPresenter ? CustomPresenter.name : `${displayedName}${(0, versioning_config_helper_1.addVersionSuffix)(version)}Presenter`,
+        writable: false,
+    });
+    return RoutePresenter;
+}
+function getDTOsByRouteType(entity, routeType, displayedName, version, dTOs) {
+    const { query: CustomQuery, body: CustomBody, presenter: CustomPresenter, } = dTOs ?? {};
+    Object.defineProperty(dtos_1.EntityParam, 'name', {
+        value: `${displayedName}${(0, versioning_config_helper_1.addVersionSuffix)(version)}Param`,
+        writable: false,
+    });
+    const RouteQuery = buildDefaultRouteQuery(entity, routeType, displayedName, version, CustomQuery);
+    const RouteBody = buildDefaultRouteBody(entity, routeType, displayedName, version, CustomBody);
+    const RoutePresenter = buildDefaultRoutePresenter(entity, routeType, displayedName, version, CustomPresenter);
+    switch (routeType) {
+        case 'CreateMany':
+            return {
+                RouteBody: buildCreateManyBodyDTO(entity, displayedName, version, CustomBody),
+                RoutePresenter,
+            };
+        case 'DeleteMany':
+            return {
+                RoutePresenter: buildDeletePresenterDTO(displayedName, version, CustomPresenter),
+            };
+        case 'DeleteOne':
+            return {
+                EntityParam: dtos_1.EntityParam,
+                RoutePresenter: buildDeletePresenterDTO(displayedName, version, CustomPresenter),
+            };
+        case 'CreateOne':
+        case 'DuplicateMany':
+        case 'UpdateMany':
+            return {
+                RouteBody,
+                RoutePresenter,
+            };
+        case 'DuplicateOne':
+        case 'ReplaceOne':
+        case 'UpdateOne':
+            return {
+                RouteBody,
+                RoutePresenter,
+                EntityParam: dtos_1.EntityParam,
+            };
+        case 'GetMany':
+            return {
+                RouteQuery,
+                RoutePresenter,
+            };
+        case 'GetOne':
+            return {
+                EntityParam: dtos_1.EntityParam,
+                RouteQuery,
+                RoutePresenter,
+            };
+        default:
+            throw new Error(`Route type ${routeType} is not supported`);
+    }
+}
+function getControllerMixinData(entity, { path, apiTag, isPublic: isPublicController, abilityPredicates: controllerAbilityPredicates, }, { type: routeType, description, dTOs, isPublic: isPublicRoute, abilityPredicate: routeAbilityPredicate, }, version) {
+    const displayedName = (0, format_helper_1.getFormattedApiTag)(apiTag, entity.name);
+    let isPublic;
+    if (typeof isPublicRoute === 'boolean') {
+        isPublic = isPublicRoute;
+    }
+    else if (typeof isPublicController === 'boolean') {
+        isPublic = isPublicController;
+    }
+    else {
+        isPublic = false;
+    }
+    const abilityPredicate = routeAbilityPredicate ?? (0, controller_ability_predicates_helper_1.getPredicateFromControllerAbilityPredicates)(controllerAbilityPredicates, routeType);
+    return {
+        ...getDTOsByRouteType(entity, routeType, displayedName, version, dTOs),
+        routeType,
+        displayedName,
+        description,
+        isPublic,
+        abilityPredicate,
+    };
+}
+exports.getControllerMixinData = getControllerMixinData;

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.d.ts

@@ -2,5 +2,5 @@ import { Type } from '@nestjs/common';
 import { DynamicApiControllerOptions, DynamicAPIRouteConfig } from '../../interfaces';
 import { BaseEntity } from '../../models';
 import { CreateManyControllerConstructor } from './create-many-controller.interface';
-declare function CreateManyControllerMixin<Entity extends BaseEntity>(entity: Type<Entity>, { path, apiTag, isPublic: isPublicController, abilityPredicates: controllerAbilityPredicates, }: DynamicApiControllerOptions<Entity>, { type: routeType, description, dTOs, isPublic: isPublicRoute, abilityPredicate: routeAbilityPredicate, }: DynamicAPIRouteConfig<Entity>, version?: string): CreateManyControllerConstructor<Entity>;
+declare function CreateManyControllerMixin<Entity extends BaseEntity>(entity: Type<Entity>, controllerOptions: DynamicApiControllerOptions<Entity>, routeConfig: DynamicAPIRouteConfig<Entity>, version?: string): CreateManyControllerConstructor<Entity>;
 export { CreateManyControllerMixin };

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

@@ -14,66 +14,18 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateManyControllerMixin = void 0;
 const common_1 = require("@nestjs/common");
-const swagger_1 = require("@nestjs/swagger");
-const class_transformer_1 = require("class-transformer");
-const class_validator_1 = require("class-validator");
 const builders_1 = require("../../builders");
 const decorators_1 = require("../../decorators");
 const helpers_1 = require("../../helpers");
-const controller_ability_predicates_helper_1 = require("../../helpers/controller-ability-predicates.helper");
+const controller_mixin_helper_1 = require("../../helpers/controller-mixin.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 { body: CustomBody, presenter: CustomPresenter } = dTOs ?? {};
-    let isPublic;
-    if (typeof isPublicRoute === 'boolean') {
-        isPublic = isPublicRoute;
-    }
-    else if (typeof isPublicController === 'boolean') {
-        isPublic = isPublicController;
-    }
-    else {
-        isPublic = false;
-    }
-    class DtoBody extends (0, mixins_1.EntityBodyMixin)(entity) {
-    }
-    Object.defineProperty(DtoBody, 'name', {
-        value: `${displayedName}${(0, helpers_1.addVersionSuffix)(version)}Dto`,
-        writable: false,
-    });
-    class CreateManyBody {
-    }
-    __decorate([
-        (0, swagger_1.ApiProperty)({ type: [DtoBody] }),
-        (0, class_validator_1.ValidateNested)({ each: true }),
-        (0, class_validator_1.IsInstance)(DtoBody, { each: true }),
-        (0, class_validator_1.ArrayMinSize)(1),
-        (0, class_transformer_1.Type)(() => DtoBody),
-        __metadata("design:type", Array)
-    ], 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,
-        });
-    }
-    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,
-        });
-    }
-    const routeDecoratorsBuilder = new builders_1.RouteDecoratorsBuilder('CreateMany', entity, version, description, isPublic, {
-        param: undefined,
-        query: undefined,
+function CreateManyControllerMixin(entity, controllerOptions, routeConfig, version) {
+    var _a;
+    const { routeType, description, isPublic, RouteBody, RoutePresenter, abilityPredicate, } = (0, controller_mixin_helper_1.getControllerMixinData)(entity, controllerOptions, routeConfig, version);
+    const routeDecoratorsBuilder = new builders_1.RouteDecoratorsBuilder(routeType, entity, version, description, isPublic, {
         body: RouteBody,
         presenter: RoutePresenter,
     });
-    const abilityPredicate = routeAbilityPredicate ?? (0, controller_ability_predicates_helper_1.getPredicateFromControllerAbilityPredicates)(controllerAbilityPredicates, routeType);
     class CreateManyPoliciesGuard extends (0, mixins_1.CreatePoliciesGuardMixin)(entity, routeType, version, abilityPredicate) {
     }
     class BaseCreateManyController {
@@ -91,7 +43,7 @@ function CreateManyControllerMixin(entity, { path, apiTag, isPublic: isPublicCon
         (0, decorators_1.CheckPolicies)((ability) => ability.can(routeType, entity)),
         __param(0, (0, common_1.Body)()),
         __metadata("design:type", Function),
-        __metadata("design:paramtypes", [RouteBody]),
+        __metadata("design:paramtypes", [typeof (_a = typeof RouteBody !== "undefined" && RouteBody) === "function" ? _a : Object]),
         __metadata("design:returntype", Promise)
     ], BaseCreateManyController.prototype, "createMany", null);
     Object.defineProperty(BaseCreateManyController, 'name', {

package/src/routes/create-one/create-one-controller.mixin.d.ts

@@ -2,5 +2,5 @@ import { Type } from '@nestjs/common';
 import { DynamicApiControllerOptions, DynamicAPIRouteConfig } from '../../interfaces';
 import { BaseEntity } from '../../models';
 import { CreateOneControllerConstructor } from './create-one-controller.interface';
-declare function CreateOneControllerMixin<Entity extends BaseEntity>(entity: Type<Entity>, { path, apiTag, isPublic: isPublicController, abilityPredicates: controllerAbilityPredicates, }: DynamicApiControllerOptions<Entity>, { type: routeType, description, dTOs, isPublic: isPublicRoute, abilityPredicate: routeAbilityPredicate, }: DynamicAPIRouteConfig<Entity>, version?: string): CreateOneControllerConstructor<Entity>;
+declare function CreateOneControllerMixin<Entity extends BaseEntity>(entity: Type<Entity>, controllerOptions: DynamicApiControllerOptions<Entity>, routeConfig: DynamicAPIRouteConfig<Entity>, version?: string): CreateOneControllerConstructor<Entity>;
 export { CreateOneControllerMixin };