@steroidsjs/nest 1.1.1 → 1.1.2

package/usecases/base/SearchQuery.d.ts

@@ -0,0 +1,17 @@
+import { ICondition } from '../../infrastructure/helpers/ConditionHelper';
+import { Repository } from 'typeorm';
+import { SelectQueryBuilder } from 'typeorm/query-builder/SelectQueryBuilder';
+export interface IQueryRelation {
+    name: string;
+    alias?: string;
+    isId?: boolean;
+}
+export default class SearchQuery {
+    select?: string[];
+    excludeSelect?: string[];
+    relations?: IQueryRelation[];
+    condition?: ICondition;
+    static createFromSchema(SchemaClass: any): SearchQuery;
+    static prepare(dbRepository: Repository<any>, dbQuery: SelectQueryBuilder<any>, searchQuery: SearchQuery): void;
+    constructor(data?: SearchQuery);
+}

package/usecases/base/SearchQuery.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const MetaHelper_1 = require("../../infrastructure/helpers/MetaHelper");
+const ConditionHelper_1 = require("../../infrastructure/helpers/ConditionHelper");
+class SearchQuery {
+    constructor(data = {}) {
+        this.select = data.select;
+        this.excludeSelect = data.excludeSelect;
+        this.relations = data.relations;
+        this.condition = data.condition;
+    }
+    static createFromSchema(SchemaClass) {
+        return new SearchQuery(MetaHelper_1.MetaHelper.getSchemaQueryData(SchemaClass));
+    }
+    static prepare(dbRepository, dbQuery, searchQuery) {
+        const prefix = dbQuery.expressionMap.mainAlias.name + '.';
+        let select = searchQuery.select;
+        if (searchQuery.excludeSelect) {
+            select = dbRepository.metadata.columns
+                .map(column => column.propertyName)
+                .filter(name => !searchQuery.excludeSelect.includes(name));
+        }
+        if (select) {
+            dbQuery.select(select.map(name => prefix + name));
+        }
+        (searchQuery.relations || []).forEach(relation => {
+            if (relation.isId) {
+                dbQuery.loadRelationIdAndMap(prefix + (relation.alias || relation.name), prefix + relation.name);
+            }
+            else {
+                dbQuery.relation(relation.name);
+            }
+        });
+        if (searchQuery.condition) {
+            dbQuery.andWhere(ConditionHelper_1.ConditionHelper.toTypeOrm(searchQuery.condition));
+        }
+    }
+}
+exports.default = SearchQuery;
+//# sourceMappingURL=SearchQuery.js.map

package/usecases/base/SearchQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SearchQuery.js","sourceRoot":"","sources":["../../../src/usecases/base/SearchQuery.ts"],"names":[],"mappings":";;AAAA,wEAAmE;AACnE,kFAAyF;AAUzF,MAAqB,WAAW;IAiD5B,YAAY,OAAoB,EAAE;QAC9B,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;QAChC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IACpC,CAAC;IAhDD,MAAM,CAAC,gBAAgB,CAAC,WAAW;QAC/B,OAAO,IAAI,WAAW,CAAC,uBAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,OAAO,CACV,YAA6B,EAC7B,OAAgC,EAChC,WAAwB;QAGxB,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,GAAG,GAAG,CAAC;QAG1D,IAAI,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;QAChC,IAAI,WAAW,CAAC,aAAa,EAAE;YAC3B,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO;iBACjC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC;iBAClC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;SAClE;QAED,IAAI,MAAM,EAAE;YAER,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;SACrD;QAGD,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC7C,IAAI,QAAQ,CAAC,IAAI,EAAE;gBACf,OAAO,CAAC,oBAAoB,CACxB,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC,EAC1C,MAAM,GAAG,QAAQ,CAAC,IAAI,CACzB,CAAC;aACL;iBAAM;gBACH,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;aACnC;QACL,CAAC,CAAC,CAAC;QAGH,IAAI,WAAW,CAAC,SAAS,EAAE;YACvB,OAAO,CAAC,QAAQ,CAAC,iCAAe,CAAC,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;SACtE;IACL,CAAC;CAQJ;AAvDD,8BAuDC"}

package/usecases/helpers/DataMapperHelper.d.ts

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

package/usecases/helpers/DataMapperHelper.js

@@ -37,6 +37,27 @@ class DataMapperHelper {
         });
         return model;
     }
+    static anyToSchema(source, SchemaClass) {
+        return source;
+    }
+    static anyToPlain(source) {
+        if (Array.isArray(source)) {
+            return source.map(item => this.anyToPlain(item));
+        }
+        if ((0, lodash_1.isDate)(source)) {
+            return source;
+        }
+        if ((0, lodash_1.isObject)(source)) {
+            const keys = MetaHelper_1.MetaHelper.getFieldNames(source.constructor);
+            return Object.keys(source).reduce((obj, key) => {
+                if (!keys || keys.includes(key)) {
+                    obj[key] = DataMapperHelper.anyToPlain(source[key]);
+                }
+                return obj;
+            }, {});
+        }
+        return source;
+    }
     static applyFields(target, source, fields = null) {
         if ((0, lodash_1.isObject)(source)) {
             Object.assign(target, source);

package/usecases/helpers/DataMapperHelper.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"DataMapperHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/DataMapperHelper.ts"],"names":[],"mappings":"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"}

package/usecases/helpers/SearchHelper.d.ts

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

package/usecases/helpers/SearchHelper.js

@@ -2,32 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SearchHelper = void 0;
 const SearchResultDto_1 = require("../dtos/SearchResultDto");
+const SearchQuery_1 = require("../base/SearchQuery");
 class SearchHelper {
-    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) {
+    static async search(repository, dto, query, prepareHandler = null) {
         const result = new SearchResultDto_1.SearchResultDto();
-        const dto = Object.assign({ page: 1, pageSize: 50 }, query.dto);
+        dto = Object.assign({ page: 1, pageSize: 50 }, dto);
         const dbQuery = repository.createQueryBuilder();
-        this.prepareSelect(repository, dbQuery, query);
+        SearchQuery_1.default.prepare(repository, dbQuery, query);
         const sort = typeof dto.sort === 'string' ? dto.sort.split(',') : (dto.sort || []);
         if (sort.length === 0) {
             dbQuery.orderBy(sort.reduce((obj, value) => {

package/usecases/helpers/SearchHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/SearchHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SearchHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/SearchHelper.ts"],"names":[],"mappings":";;;AAGA,6DAAwD;AACxD,qDAA8C;AAE9C,MAAa,YAAY;IAErB,MAAM,CAAC,KAAK,CAAC,MAAM,CACf,UAA2B,EAC3B,GAAmB,EACnB,KAAkB,EAClB,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,OAAO,GAAG,UAAU,CAAC,kBAAkB,EAAE,CAAC;QAEhD,qBAAW,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAGhD,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,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACvC,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,OAAO,CAAC,CAAC;SACtC;QAGD,OAAO;aACF,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,OAAO,CAAC,eAAe,EAAE,CAAC;QACvD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QACrB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QAErB,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAhDD,oCAgDC"}

package/usecases/interfaces/ICrudRepository.d.ts

@@ -2,11 +2,13 @@ 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';
+import { Type } from '@nestjs/common';
+import SearchQuery from '../base/SearchQuery';
 export interface ICrudRepository<TModel> {
     dbRepository: Repository<any>;
-    search: (query: SteroidsQuery<SearchInputDto>) => Promise<SearchResultDto<TModel>>;
-    findOne: (condition: ICondition) => Promise<TModel>;
+    search: <TItem>(dto: SearchInputDto, searchQuery: SearchQuery) => Promise<SearchResultDto<TModel | Type<TItem>>>;
+    findOne: (conditionOrQuery: ICondition | SearchQuery) => Promise<TModel | null>;
+    findMany: (conditionOrQuery: ICondition | SearchQuery) => Promise<TModel[]>;
     create: (model: TModel) => Promise<TModel>;
     update: (id: number, model: TModel) => Promise<TModel>;
     remove: (id: number) => Promise<void>;

package/usecases/services/CrudService.d.ts

@@ -1,16 +1,24 @@
+import { Type } from '@nestjs/common';
 import { ICrudRepository } from '../interfaces/ICrudRepository';
 import { ISearchInputDto } from '../dtos/SearchInputDto';
 import { SearchResultDto } from '../dtos/SearchResultDto';
-import SteroidsQuery from '../base/SteroidsQuery';
+import SearchQuery from '../base/SearchQuery';
 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;
-    search(query: SteroidsQuery<TSearchDto>): Promise<SearchResultDto<TModel>>;
+    search(dto: TSearchDto): Promise<SearchResultDto<TModel>>;
+    search<TSchema>(dto: TSearchDto, schemaClass: Type<TSchema>): Promise<SearchResultDto<Type<TSchema>>>;
     findById(id: number | string): Promise<TModel>;
+    findById<TSchema>(id: number | string, schemaClass: Type<TSchema>): Promise<Type<TSchema>>;
+    findOne(searchQuery: SearchQuery): Promise<TModel>;
+    findMany(searchQuery: SearchQuery): Promise<TModel[]>;
     create(dto: TSaveDto): Promise<TModel>;
-    update(id: number | string, dto: TSaveDto): Promise<TModel>;
+    create<TSchema>(dto: TSaveDto, schemaClass: Type<TSchema>): Promise<Type<TSchema>>;
+    update<TSchema>(id: number | string, dto: TSaveDto): Promise<TModel>;
+    update<TSchema>(id: number | string, dto: TSaveDto, schemaClass: Type<TSchema>): Promise<Type<TSchema>>;
     remove(id: number | string): Promise<void>;
+    protected modelToSchema<TSchema>(model: TModel, schemaClass: Type<TSchema>): Type<TSchema>;
     protected dtoToModel(dto: TSaveDto): Promise<TModel>;
 }

package/usecases/services/CrudService.js

@@ -4,6 +4,7 @@ exports.CrudService = void 0;
 const lodash_1 = require("lodash");
 const DataMapperHelper_1 = require("../helpers/DataMapperHelper");
 const ValidationHelper_1 = require("../helpers/ValidationHelper");
+const SearchQuery_1 = require("../base/SearchQuery");
 class CrudService {
     constructor() {
         this.primaryKey = 'id';
@@ -12,25 +13,43 @@ class CrudService {
         this.repository = repository;
         this.modelClass = ModelClass;
     }
-    async search(query) {
-        await (0, ValidationHelper_1.validateOrReject)(query.dto);
-        return await this.repository.search(query);
+    async search(dto, schemaClass = null) {
+        await (0, ValidationHelper_1.validateOrReject)(dto);
+        const result = await this.repository.search(dto, SearchQuery_1.default.createFromSchema(schemaClass));
+        if (schemaClass) {
+            result.items = result.items.map((model) => this.modelToSchema(model, schemaClass));
+        }
+        return result;
+    }
+    async findById(id, schemaClass = null) {
+        const searchQuery = SearchQuery_1.default.createFromSchema(schemaClass);
+        searchQuery.condition = { [this.primaryKey]: (0, lodash_1.toInteger)(id) };
+        const model = await this.findOne(searchQuery);
+        return schemaClass ? this.modelToSchema(model, schemaClass) : model;
     }
-    async findById(id) {
-        return this.repository.findOne({ [this.primaryKey]: (0, lodash_1.toInteger)(id) });
+    async findOne(searchQuery) {
+        return await this.repository.findOne(searchQuery);
     }
-    async create(dto) {
+    async findMany(searchQuery) {
+        return await this.repository.findMany(searchQuery);
+    }
+    async create(dto, schemaClass = null) {
         await (0, ValidationHelper_1.validateOrReject)(dto);
-        return this.repository.create(await this.dtoToModel(dto));
+        const model = await this.repository.create(await this.dtoToModel(dto));
+        return schemaClass ? this.findById(model[this.primaryKey], schemaClass) : model;
     }
-    async update(id, dto) {
+    async update(id, dto, schemaClass = null) {
         await (0, ValidationHelper_1.validateOrReject)(dto);
-        return this.repository.update((0, lodash_1.toInteger)(id), await this.dtoToModel(dto));
+        const model = await this.repository.update((0, lodash_1.toInteger)(id), await this.dtoToModel(dto));
+        return schemaClass ? this.findById(id, schemaClass) : model;
     }
     async remove(id) {
         await this.repository.remove((0, lodash_1.toInteger)(id));
     }
-    async dtoToModel(dto) {
+    modelToSchema(model, schemaClass) {
+        return DataMapperHelper_1.DataMapperHelper.anyToSchema(model, schemaClass);
+    }
+    dtoToModel(dto) {
         if (!this.modelClass) {
             throw new Error('Property modelClass is not set in service: ' + this.constructor.name);
         }

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;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"}
+{"version":3,"file":"CrudService.js","sourceRoot":"","sources":["../../../src/usecases/services/CrudService.ts"],"names":[],"mappings":"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"}

package/usecases/base/SteroidsQuery.d.ts

@@ -1,13 +0,0 @@
-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

@@ -1,16 +0,0 @@
-"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

@@ -1 +0,0 @@
-{"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"}