@steroidsjs/nest 1.0.13 → 1.1.1

package/usecases/base/SteroidsQuery.d.ts

@@ -0,0 +1,13 @@
+export interface IQueryRelation {
+    name: string;
+    alias?: string;
+    isId?: boolean;
+}
+export default class SteroidsQuery<TDto> {
+    readonly dto?: TDto;
+    readonly select?: string[];
+    readonly excludeSelect?: string[];
+    readonly relations?: IQueryRelation[];
+    static create(dto?: any, SchemaClass?: any): SteroidsQuery<any>;
+    constructor(data?: SteroidsQuery<TDto>);
+}

package/usecases/base/SteroidsQuery.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const MetaHelper_1 = require("../../infrastructure/helpers/MetaHelper");
+class SteroidsQuery {
+    constructor(data = {}) {
+        this.dto = data.dto;
+        this.select = data.select;
+        this.excludeSelect = data.excludeSelect;
+        this.relations = data.relations;
+    }
+    static create(dto = null, SchemaClass = null) {
+        return new SteroidsQuery(Object.assign({ dto }, MetaHelper_1.MetaHelper.getSchemaQueryData(SchemaClass)));
+    }
+}
+exports.default = SteroidsQuery;
+//# sourceMappingURL=SteroidsQuery.js.map

package/usecases/base/SteroidsQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SteroidsQuery.js","sourceRoot":"","sources":["../../../src/usecases/base/SteroidsQuery.ts"],"names":[],"mappings":";;AAAA,wEAAmE;AAQnE,MAAqB,aAAa;IAa9B,YAAY,OAA4B,EAAE;QACtC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IACpC,CAAC;IAZD,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,EAAE,WAAW,GAAG,IAAI;QACxC,OAAO,IAAI,aAAa,iBACpB,GAAG,IACA,uBAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAC/C,CAAC;IACP,CAAC;CAQJ;AAnBD,gCAmBC"}

package/usecases/helpers/DataMapperHelper.d.ts

@@ -1,5 +1,5 @@
 export declare class DataMapperHelper {
     static getKeys(object: any): any;
-    static anyToModel(obj: any, ModelClass: any): any;
+    static anyToModel(source: any, ModelClass: any, fieldNames?: any): any;
     static applyFields(target: Record<string, unknown> | any, source: any, fields?: string[]): void;
 }

package/usecases/helpers/DataMapperHelper.js

@@ -3,14 +3,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataMapperHelper = void 0;
 const lodash_1 = require("lodash");
 const BaseField_1 = require("../../infrastructure/decorators/fields/BaseField");
+const MetaHelper_1 = require("../../infrastructure/helpers/MetaHelper");
 class DataMapperHelper {
     static getKeys(object) {
         return Reflect.getMetadata(BaseField_1.MODEL_FIELD_NAMES_KEY, object.prototype) || [];
     }
-    static anyToModel(obj, ModelClass) {
-        const result = new ModelClass();
-        Object.assign(result, obj);
-        return result;
+    static anyToModel(source, ModelClass, fieldNames = null) {
+        if (!fieldNames) {
+            fieldNames = this.getKeys(ModelClass);
+        }
+        const model = new ModelClass();
+        fieldNames.forEach(fieldName => {
+            if ((0, lodash_1.has)(source, fieldName)) {
+                const value = source[fieldName];
+                if ((0, lodash_1.isObject)(value)) {
+                    const modelMeta = MetaHelper_1.MetaHelper.getFieldOptions(ModelClass, fieldName);
+                    if (modelMeta.appType === 'relation') {
+                        model[fieldName] = this.anyToModel(value, modelMeta.modelClass());
+                    }
+                    else {
+                    }
+                }
+                else {
+                    model[fieldName] = value;
+                }
+            }
+            else if ((0, lodash_1.has)(source, fieldName + 'Id')) {
+                model[fieldName + 'Id'] = source[fieldName + 'Id'];
+            }
+            else if ((0, lodash_1.has)(source, fieldName + 'Ids')) {
+                model[fieldName + 'Ids'] = source[fieldName + 'Ids'];
+            }
+        });
+        return model;
     }
     static applyFields(target, source, fields = null) {
         if ((0, lodash_1.isObject)(source)) {

package/usecases/helpers/DataMapperHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataMapperHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/DataMapperHelper.ts"],"names":[],"mappings":";;;AAAA,mCAIgB;AAEhB,gFAAuF;AAEvF,MAAa,gBAAgB;IACzB,MAAM,CAAC,OAAO,CAAC,MAAM;QACjB,OAAO,OAAO,CAAC,WAAW,CAAC,iCAAqB,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IAC9E,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU;QAC7B,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC3B,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,MAAqC,EAAE,MAAW,EAAE,SAAmB,IAAI;QAC1F,IAAI,IAAA,iBAAS,EAAC,MAAM,CAAC,EAAE;YACnB,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SAkBjC;IACL,CAAC;CACJ;AAjCD,4CAiCC"}
+{"version":3,"file":"DataMapperHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/DataMapperHelper.ts"],"names":[],"mappings":";;;AAAA,mCAGgB;AAChB,gFAAuF;AACvF,wEAAmE;AAGnE,MAAa,gBAAgB;IACzB,MAAM,CAAC,OAAO,CAAC,MAAM;QACjB,OAAO,OAAO,CAAC,WAAW,CAAC,iCAAqB,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IAC9E,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;QACnD,IAAI,CAAC,UAAU,EAAE;YACb,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;SACzC;QAED,MAAM,KAAK,GAAG,IAAI,UAAU,EAAE,CAAC;QAE/B,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC3B,IAAI,IAAA,YAAI,EAAC,MAAM,EAAE,SAAS,CAAC,EAAE;gBACzB,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;gBAEhC,IAAI,IAAA,iBAAS,EAAC,KAAK,CAAC,EAAE;oBAClB,MAAM,SAAS,GAAG,uBAAU,CAAC,eAAe,CAAC,UAAU,EAAE,SAAS,CAA0B,CAAC;oBAC7F,IAAI,SAAS,CAAC,OAAO,KAAK,UAAU,EAAE;wBAClC,KAAK,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC;qBACrE;yBAAM;qBAEN;iBACJ;qBAAM;oBACH,KAAK,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;iBAC5B;aACJ;iBAAM,IAAI,IAAA,YAAI,EAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAAC,EAAE;gBACvC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;aACtD;iBAAM,IAAI,IAAA,YAAI,EAAC,MAAM,EAAE,SAAS,GAAG,KAAK,CAAC,EAAE;gBACxC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,GAAG,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC,CAAC;aACxD;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,MAAqC,EAAE,MAAW,EAAE,SAAmB,IAAI;QAC1F,IAAI,IAAA,iBAAS,EAAC,MAAM,CAAC,EAAE;YACnB,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SAkBjC;IACL,CAAC;CACJ;AA1DD,4CA0DC"}

package/usecases/helpers/SearchHelper.d.ts

@@ -1,7 +1,9 @@
 import { Repository } from 'typeorm';
 import { SelectQueryBuilder } from 'typeorm/query-builder/SelectQueryBuilder';
-import { SearchInputDto } from '../../usecases/dtos/SearchInputDto';
-import { SearchResultDto } from '../../usecases/dtos/SearchResultDto';
+import { SearchInputDto } from '../dtos/SearchInputDto';
+import { SearchResultDto } from '../dtos/SearchResultDto';
+import SteroidsQuery from '../base/SteroidsQuery';
 export declare class SearchHelper {
-    static search<TTable>(repository: Repository<any>, dto: SearchInputDto, prepareHandler?: (query: SelectQueryBuilder<TTable>) => void | null): Promise<SearchResultDto<TTable>>;
+    static prepareSelect(repository: Repository<any>, dbQuery: SelectQueryBuilder<any>, query: SteroidsQuery<SearchInputDto>): void;
+    static search<TTable>(repository: Repository<any>, query: SteroidsQuery<SearchInputDto>, prepareHandler?: (query: SelectQueryBuilder<TTable>) => void | null): Promise<SearchResultDto<TTable>>;
 }

package/usecases/helpers/SearchHelper.js

@@ -1,26 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SearchHelper = void 0;
-const SearchResultDto_1 = require("../../usecases/dtos/SearchResultDto");
+const SearchResultDto_1 = require("../dtos/SearchResultDto");
 class SearchHelper {
-    static async search(repository, dto, prepareHandler = null) {
+    static prepareSelect(repository, dbQuery, query) {
+        const prefix = dbQuery.expressionMap.mainAlias.name + '.';
+        let select = query.select;
+        if (query.excludeSelect) {
+            select = repository.metadata.columns
+                .map(column => column.propertyName)
+                .filter(name => !query.excludeSelect.includes(name));
+        }
+        if (select) {
+            dbQuery.select(select.map(name => prefix + name));
+        }
+        (query.relations || []).forEach(relation => {
+            if (relation.isId) {
+                dbQuery.loadRelationIdAndMap(prefix + (relation.alias || relation.name), prefix + relation.name);
+            }
+            else {
+                dbQuery.relation(relation.name);
+            }
+        });
+    }
+    static async search(repository, query, prepareHandler = null) {
         const result = new SearchResultDto_1.SearchResultDto();
-        dto = Object.assign({ page: 1, pageSize: 50 }, dto);
-        const query = repository.createQueryBuilder();
+        const dto = Object.assign({ page: 1, pageSize: 50 }, query.dto);
+        const dbQuery = repository.createQueryBuilder();
+        this.prepareSelect(repository, dbQuery, query);
         const sort = typeof dto.sort === 'string' ? dto.sort.split(',') : (dto.sort || []);
         if (sort.length === 0) {
-            query.orderBy(sort.reduce((obj, value) => {
+            dbQuery.orderBy(sort.reduce((obj, value) => {
                 obj[value.replace('!', '')] = value.indexOf('!') === 0 ? 'DESC' : 'ASC';
                 return obj;
             }, {}));
         }
         if (prepareHandler) {
-            prepareHandler.call(null, query);
+            prepareHandler.call(null, dbQuery);
         }
-        query
+        dbQuery
             .offset((dto.page - 1) * dto.pageSize)
             .limit(dto.pageSize);
-        const [items, total] = await query.getManyAndCount();
+        const [items, total] = await dbQuery.getManyAndCount();
         result.items = items;
         result.total = total;
         return result;

package/usecases/helpers/SearchHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/SearchHelper.ts"],"names":[],"mappings":";;;AAGA,yEAAoE;AAEpE,MAAa,YAAY;IACrB,MAAM,CAAC,KAAK,CAAC,MAAM,CACf,UAA2B,EAC3B,GAAmB,EACnB,iBAAqE,IAAI;QAEzE,MAAM,MAAM,GAAG,IAAI,iCAAe,EAAU,CAAC;QAG7C,GAAG,mBACC,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,EAAE,IACT,GAAG,CACT,CAAC;QAGF,MAAM,KAAK,GAAG,UAAU,CAAC,kBAAkB,EAAE,CAAC;QAG9C,MAAM,IAAI,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QACnF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACnB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACrC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;gBACxE,OAAO,GAAG,CAAC;YACf,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SACX;QAGD,IAAI,cAAc,EAAE;YAChB,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SACpC;QAGD,KAAK;aACA,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;aACrC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAGzB,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAC;QACrD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QACrB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QAErB,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AA5CD,oCA4CC"}
+{"version":3,"file":"SearchHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/SearchHelper.ts"],"names":[],"mappings":"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"}

package/usecases/helpers/ValidationHelper.d.ts

@@ -1,2 +1,2 @@
 import { ValidatorOptions } from 'class-validator';
-export declare function validateOrReject(model: any, validatorOptions?: ValidatorOptions): Promise<void>;
+export declare function validateOrReject(dto: any, validatorOptions?: ValidatorOptions): Promise<void>;

package/usecases/helpers/ValidationHelper.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOrReject = void 0;
 const class_validator_1 = require("class-validator");
 const ValidationException_1 = require("../exceptions/ValidationException");
-async function validateOrReject(model, validatorOptions) {
-    const errors = await (0, class_validator_1.validate)(model, validatorOptions);
+async function validateOrReject(dto, validatorOptions) {
+    const errors = await (0, class_validator_1.validate)(dto, validatorOptions);
     if (errors.length) {
         throw new ValidationException_1.ValidationException(errors);
     }

package/usecases/helpers/ValidationHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"ValidationHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/ValidationHelper.ts"],"names":[],"mappings":";;;AAAA,qDAA2D;AAC3D,2EAAsE;AAE/D,KAAK,UAAU,gBAAgB,CAAC,KAAU,EAAE,gBAAmC;IAClF,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAQ,EAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IACvD,IAAI,MAAM,CAAC,MAAM,EAAE;QACf,MAAM,IAAI,yCAAmB,CAAC,MAAM,CAAC,CAAC;KACzC;AACL,CAAC;AALD,4CAKC"}
+{"version":3,"file":"ValidationHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/ValidationHelper.ts"],"names":[],"mappings":";;;AAAA,qDAA2D;AAC3D,2EAAsE;AAE/D,KAAK,UAAU,gBAAgB,CAAC,GAAQ,EAAE,gBAAmC;IAChF,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAQ,EAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IACrD,IAAI,MAAM,CAAC,MAAM,EAAE;QACf,MAAM,IAAI,yCAAmB,CAAC,MAAM,CAAC,CAAC;KACzC;AACL,CAAC;AALD,4CAKC"}

package/usecases/interfaces/ICrudRepository.d.ts

@@ -2,9 +2,10 @@ import { Repository } from 'typeorm';
 import { SearchResultDto } from '../dtos/SearchResultDto';
 import { SearchInputDto } from '../dtos/SearchInputDto';
 import { ICondition } from '../../infrastructure/helpers/ConditionHelper';
+import SteroidsQuery from '../base/SteroidsQuery';
 export interface ICrudRepository<TModel> {
     dbRepository: Repository<any>;
-    search: (dto: SearchInputDto) => Promise<SearchResultDto<TModel>>;
+    search: (query: SteroidsQuery<SearchInputDto>) => Promise<SearchResultDto<TModel>>;
     findOne: (condition: ICondition) => Promise<TModel>;
     create: (model: TModel) => Promise<TModel>;
     update: (id: number, model: TModel) => Promise<TModel>;

package/usecases/services/CrudService.d.ts

@@ -1,16 +1,16 @@
 import { ICrudRepository } from '../interfaces/ICrudRepository';
 import { ISearchInputDto } from '../dtos/SearchInputDto';
 import { SearchResultDto } from '../dtos/SearchResultDto';
+import SteroidsQuery from '../base/SteroidsQuery';
 export declare class CrudService<TModel, TSearchDto = ISearchInputDto, TSaveDto = TModel> {
     protected primaryKey: string;
     protected repository: ICrudRepository<TModel>;
     protected modelClass: any;
     init(repository: ICrudRepository<TModel>, ModelClass: any): void;
-    createModel(): TModel | any;
-    search(dto: TSearchDto): Promise<SearchResultDto<TModel>>;
+    search(query: SteroidsQuery<TSearchDto>): Promise<SearchResultDto<TModel>>;
     findById(id: number | string): Promise<TModel>;
     create(dto: TSaveDto): Promise<TModel>;
     update(id: number | string, dto: TSaveDto): Promise<TModel>;
     remove(id: number | string): Promise<void>;
-    protected dtoToModel(dto: TSaveDto): TModel;
+    protected dtoToModel(dto: TSaveDto): Promise<TModel>;
 }

package/usecases/services/CrudService.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrudService = void 0;
 const lodash_1 = require("lodash");
+const DataMapperHelper_1 = require("../helpers/DataMapperHelper");
 const ValidationHelper_1 = require("../helpers/ValidationHelper");
-const class_transformer_1 = require("class-transformer");
 class CrudService {
     constructor() {
         this.primaryKey = 'id';
@@ -12,38 +12,29 @@ class CrudService {
         this.repository = repository;
         this.modelClass = ModelClass;
     }
-    createModel() {
-        const ModelClass = this.modelClass;
-        return new ModelClass();
-    }
-    async search(dto) {
-        await (0, ValidationHelper_1.validateOrReject)(dto);
-        const repositoryResult = await this.repository.search(dto);
-        return repositoryResult;
+    async search(query) {
+        await (0, ValidationHelper_1.validateOrReject)(query.dto);
+        return await this.repository.search(query);
     }
     async findById(id) {
-        const model = await this.repository.findOne({ [this.primaryKey]: (0, lodash_1.toInteger)(id) });
-        return model;
+        return this.repository.findOne({ [this.primaryKey]: (0, lodash_1.toInteger)(id) });
     }
     async create(dto) {
         await (0, ValidationHelper_1.validateOrReject)(dto);
-        let model = this.dtoToModel(dto);
-        await (0, ValidationHelper_1.validateOrReject)(model);
-        const tmodel = await this.repository.create(model);
-        return tmodel;
+        return this.repository.create(await this.dtoToModel(dto));
     }
     async update(id, dto) {
         await (0, ValidationHelper_1.validateOrReject)(dto);
-        let model = this.dtoToModel(dto);
-        await (0, ValidationHelper_1.validateOrReject)(model);
-        model = await this.repository.update((0, lodash_1.toInteger)(id), model);
-        return model;
+        return this.repository.update((0, lodash_1.toInteger)(id), await this.dtoToModel(dto));
     }
     async remove(id) {
         await this.repository.remove((0, lodash_1.toInteger)(id));
     }
-    dtoToModel(dto) {
-        return (0, class_transformer_1.plainToInstance)(this.modelClass, dto);
+    async dtoToModel(dto) {
+        if (!this.modelClass) {
+            throw new Error('Property modelClass is not set in service: ' + this.constructor.name);
+        }
+        return DataMapperHelper_1.DataMapperHelper.anyToModel(dto, this.modelClass);
     }
 }
 exports.CrudService = CrudService;

package/usecases/services/CrudService.js.map

@@ -1 +1 @@
-{"version":3,"file":"CrudService.js","sourceRoot":"","sources":["../../../src/usecases/services/CrudService.ts"],"names":[],"mappings":";;;AAAA,mCAA+C;AAK/C,kEAA6D;AAC7D,yDAAkD;AAKlD,MAAa,WAAW;IAAxB;QAQc,eAAU,GAAW,IAAI,CAAC;IAsFxC,CAAC;IAvEG,IAAI,CAAC,UAAmC,EAAE,UAAU;QAChD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,WAAW;QACP,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,OAAO,IAAI,UAAU,EAAE,CAAC;IAC5B,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,GAAe;QACxB,MAAM,IAAA,mCAAgB,EAAC,GAAG,CAAC,CAAC;QAC5B,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3D,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAMD,KAAK,CAAC,QAAQ,CAAC,EAAmB;QAC9B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,IAAA,kBAAU,EAAC,EAAE,CAAC,EAAC,CAAC,CAAC;QACjF,OAAO,KAAK,CAAC;IACjB,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,GAAa;QACtB,MAAM,IAAA,mCAAgB,EAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,IAAA,mCAAgB,EAAC,KAAK,CAAC,CAAC;QAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnD,OAAO,MAAM,CAAC;IAClB,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,EAAmB,EAAE,GAAa;QAC3C,MAAM,IAAA,mCAAgB,EAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,IAAA,mCAAgB,EAAC,KAAK,CAAC,CAAC;QAC9B,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAA,kBAAU,EAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;QAC5D,OAAO,KAAK,CAAC;IACjB,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,EAAmB;QAC5B,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAA,kBAAU,EAAC,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;IAQS,UAAU,CAAC,GAAa;QAC9B,OAAO,IAAA,mCAAe,EAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IACjD,CAAC;CACJ;AA9FD,kCA8FC"}
+{"version":3,"file":"CrudService.js","sourceRoot":"","sources":["../../../src/usecases/services/CrudService.ts"],"names":[],"mappings":";;;AAAA,mCAA+C;AAE/C,kEAA6D;AAG7D,kEAA6D;AAM7D,MAAa,WAAW;IAAxB;QAMc,eAAU,GAAW,IAAI,CAAC;IA4ExC,CAAC;IA7DG,IAAI,CAAC,UAAmC,EAAE,UAAU;QAChD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,KAAgC;QACzC,MAAM,IAAA,mCAAgB,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAMD,KAAK,CAAC,QAAQ,CAAC,EAAmB;QAC9B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,IAAA,kBAAU,EAAC,EAAE,CAAC,EAAC,CAAC,CAAC;IACxE,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,GAAa;QACtB,MAAM,IAAA,mCAAgB,EAAC,GAAG,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9D,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,EAAmB,EAAE,GAAa;QAC3C,MAAM,IAAA,mCAAgB,EAAC,GAAG,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAA,kBAAU,EAAC,EAAE,CAAC,EAAE,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9E,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,EAAmB;QAC5B,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAA,kBAAU,EAAC,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;IAOS,KAAK,CAAC,UAAU,CAAC,GAAa;QACpC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,6CAA6C,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SAC1F;QAED,OAAO,mCAAgB,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7D,CAAC;CACJ;AAlFD,kCAkFC"}

package/infrastructure/decorators/fields/ExtendFields.d.ts

@@ -1 +0,0 @@
-export declare function ExtendFields(modelClass: any): (object: any) => void;

package/infrastructure/decorators/fields/ExtendFields.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExtendFields = void 0;
-const constants_1 = require("@nestjs/swagger/dist/constants");
-function ExtendFields(modelClass) {
-    return (object) => {
-        const properties = Reflect.getMetadata(constants_1.DECORATORS.API_MODEL_PROPERTIES_ARRAY, modelClass.prototype);
-        (properties || []).forEach(propertyName => {
-            propertyName = propertyName.replace(/^:/, '');
-            console.log(11, Object.keys(object.prototype));
-        });
-    };
-}
-exports.ExtendFields = ExtendFields;
-//# sourceMappingURL=ExtendFields.js.map

package/infrastructure/decorators/fields/ExtendFields.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ExtendFields.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/fields/ExtendFields.ts"],"names":[],"mappings":";;;AAAA,8DAA0D;AAG1D,SAAgB,YAAY,CAAC,UAAU;IACnC,OAAO,CAAC,MAAM,EAAE,EAAE;QACd,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,sBAAU,CAAC,0BAA0B,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;QACpG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YACtC,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAE9C,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;QAEnD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;AACN,CAAC;AAVD,oCAUC"}