@steroidsjs/nest 1.1.1 → 1.1.2

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

@@ -18,6 +18,7 @@ export interface IBaseFieldOptions {
     min?: number;
     max?: number;
     items?: string;
+    plainName?: string;
 }
 export interface IInternalFieldOptions {
     appType?: AppColumnType;

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

@@ -1 +1 @@
-{"version":3,"file":"BaseField.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/fields/BaseField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,6CAA4C;AAE5C,qDAA2C;AAE9B,QAAA,cAAc,GAAG,MAAM,CAAC;AACxB,QAAA,0BAA0B,GAAG,2BAA2B,CAAC;AACzD,QAAA,qBAAqB,GAAG,kBAAkB,CAAC;AA8BxD,MAAM,mBAAmB,GAAG,CAAC,OAA0B,EAAE,eAAsC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE;IACzH,OAAO,CAAC,cAAc,CAAC,sBAAc,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IACtE,OAAO,CAAC,cAAc,CAAC,kCAA0B,EAAE,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAGxG,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,6BAAqB,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;IAC5E,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9B,OAAO,CAAC,cAAc,CAAC,6BAAqB,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;AACtE,CAAC,CAAC;AAEF,SAAgB,SAAS,CAAC,UAA6B,IAAI,EAAE,eAAsC;IAC/F,OAAO,IAAA,wBAAe,EAClB,GAAG;QACC,mBAAmB,+BACf,KAAK,EAAE,IAAI,EACX,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,IAAI,IACR,OAAO,KACV,OAAO,EAAE,eAAe,CAAC,OAAO,IAAI,IAAI,EACxC,OAAO,EAAE,eAAe,CAAC,OAAO,IAAI,IAAI,KACzC,eAAe,CAAC;QACnB,IAAA,qBAAW,EAAC;YACR,IAAI,EAAE,OAAO,CAAC,MAAM;YACpB,WAAW,EAAE,OAAO,CAAC,KAAK,IAAI,SAAS;YACvC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,SAAS;YACrC,QAAQ,EAAE,OAAO,CAAC,QAAQ,KAAK,KAAK;YACpC,OAAO,EAAE,OAAO,CAAC,OAAO;SAC3B,CAAC;QACF,OAAO,CAAC,QAAQ,IAAI,IAAA,4BAAU,GAAE;KACnC,CAAC,MAAM,CAAC,OAAO,CAAC,CACpB,CAAC;AACN,CAAC;AArBD,8BAqBC"}
+{"version":3,"file":"BaseField.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/fields/BaseField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,6CAA4C;AAE5C,qDAA2C;AAE9B,QAAA,cAAc,GAAG,MAAM,CAAC;AACxB,QAAA,0BAA0B,GAAG,2BAA2B,CAAC;AACzD,QAAA,qBAAqB,GAAG,kBAAkB,CAAC;AA+BxD,MAAM,mBAAmB,GAAG,CAAC,OAA0B,EAAE,eAAsC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE;IACzH,OAAO,CAAC,cAAc,CAAC,sBAAc,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IACtE,OAAO,CAAC,cAAc,CAAC,kCAA0B,EAAE,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAGxG,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,6BAAqB,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;IAC5E,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9B,OAAO,CAAC,cAAc,CAAC,6BAAqB,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;AACtE,CAAC,CAAC;AAEF,SAAgB,SAAS,CAAC,UAA6B,IAAI,EAAE,eAAsC;IAC/F,OAAO,IAAA,wBAAe,EAClB,GAAG;QACC,mBAAmB,+BACf,KAAK,EAAE,IAAI,EACX,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,IAAI,IACR,OAAO,KACV,OAAO,EAAE,eAAe,CAAC,OAAO,IAAI,IAAI,EACxC,OAAO,EAAE,eAAe,CAAC,OAAO,IAAI,IAAI,KACzC,eAAe,CAAC;QACnB,IAAA,qBAAW,EAAC;YACR,IAAI,EAAE,OAAO,CAAC,MAAM;YACpB,WAAW,EAAE,OAAO,CAAC,KAAK,IAAI,SAAS;YACvC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,SAAS;YACrC,QAAQ,EAAE,OAAO,CAAC,QAAQ,KAAK,KAAK;YACpC,OAAO,EAAE,OAAO,CAAC,OAAO;SAC3B,CAAC;QACF,OAAO,CAAC,QAAQ,IAAI,IAAA,4BAAU,GAAE;KACnC,CAAC,MAAM,CAAC,OAAO,CAAC,CACpB,CAAC;AACN,CAAC;AArBD,8BAqBC"}

package/infrastructure/helpers/MetaHelper.d.ts

@@ -1,6 +1,6 @@
 import { IAllFieldOptions } from '../decorators/fields';
 import { ISchemaOptions } from '../decorators/SteroidsSchema';
-import { IQueryRelation } from '../../usecases/base/SteroidsQuery';
+import { IQueryRelation } from '../../usecases/base/SearchQuery';
 export declare class MetaHelper {
     static getFieldOptions(ModelClass: any, fieldName: any): IAllFieldOptions;
     static getFieldNames(AnyClass: any): string[];

package/infrastructure/pipes/SchemaSerializer.d.ts

@@ -0,0 +1,5 @@
+import { ClassSerializerInterceptor, PlainLiteralObject } from '@nestjs/common';
+import { ClassTransformOptions } from '@nestjs/common/interfaces/external/class-transform-options.interface';
+export declare class SchemaSerializer extends ClassSerializerInterceptor {
+    transformToPlain(data: any, options: ClassTransformOptions): PlainLiteralObject;
+}

package/infrastructure/pipes/SchemaSerializer.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchemaSerializer = void 0;
+const common_1 = require("@nestjs/common");
+const DataMapperHelper_1 = require("../../usecases/helpers/DataMapperHelper");
+class SchemaSerializer extends common_1.ClassSerializerInterceptor {
+    transformToPlain(data, options) {
+        return DataMapperHelper_1.DataMapperHelper.anyToPlain(data);
+    }
+}
+exports.SchemaSerializer = SchemaSerializer;
+//# sourceMappingURL=SchemaSerializer.js.map

package/infrastructure/pipes/SchemaSerializer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SchemaSerializer.js","sourceRoot":"","sources":["../../../src/infrastructure/pipes/SchemaSerializer.ts"],"names":[],"mappings":";;;AAAA,2CAA8E;AAE9E,8EAAyE;AAEzE,MAAa,gBAAiB,SAAQ,mCAA0B;IAC5D,gBAAgB,CAAC,IAAS,EAAE,OAA8B;QAEtD,OAAO,mCAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;CACJ;AALD,4CAKC"}

package/infrastructure/repositories/CrudRepository.d.ts

@@ -1,16 +1,19 @@
 import { Repository } from 'typeorm';
 import { ICrudRepository } from '../../usecases/interfaces/ICrudRepository';
 import { SearchInputDto } from '../../usecases/dtos/SearchInputDto';
-import { ICondition } from '../helpers/ConditionHelper';
 import { SearchResultDto } from '../../usecases/dtos/SearchResultDto';
-import SteroidsQuery from '../../usecases/base/SteroidsQuery';
+import SearchQuery from '../../usecases/base/SearchQuery';
+import { ICondition } from '../helpers/ConditionHelper';
+import { SelectQueryBuilder } from 'typeorm/query-builder/SelectQueryBuilder';
 export declare class CrudRepository<TModel> implements ICrudRepository<TModel> {
     primaryKey: string;
     dbRepository: Repository<any>;
     protected modelClass: any;
     init(dbRepository: Repository<any>, modelClass: any): void;
-    search(query: SteroidsQuery<SearchInputDto>): Promise<SearchResultDto<TModel>>;
-    findOne(condition: ICondition): Promise<TModel | null>;
+    search(dto: SearchInputDto, searchQuery: SearchQuery): Promise<SearchResultDto<TModel>>;
+    findOne(conditionOrQuery: ICondition | SearchQuery): Promise<TModel | null>;
+    findMany(conditionOrQuery: ICondition | SearchQuery): Promise<TModel[]>;
+    protected createQueryBuilder(conditionOrQuery: ICondition | SearchQuery): SelectQueryBuilder<any>;
     create(model: TModel): Promise<TModel>;
     update(id: number, model: TModel): Promise<TModel>;
     remove(id: number): Promise<void>;

package/infrastructure/repositories/CrudRepository.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrudRepository = void 0;
-const class_transformer_1 = require("class-transformer");
 const SearchHelper_1 = require("../../usecases/helpers/SearchHelper");
-const ConditionHelper_1 = require("../helpers/ConditionHelper");
+const SearchQuery_1 = require("../../usecases/base/SearchQuery");
+const DataMapperHelper_1 = require("../../usecases/helpers/DataMapperHelper");
 class CrudRepository {
     constructor() {
         this.primaryKey = 'id';
@@ -12,16 +12,28 @@ class CrudRepository {
         this.dbRepository = dbRepository;
         this.modelClass = modelClass;
     }
-    async search(query) {
-        const result = await SearchHelper_1.SearchHelper.search(this.dbRepository, query, null);
+    async search(dto, searchQuery) {
+        const result = await SearchHelper_1.SearchHelper.search(this.dbRepository, dto, searchQuery, null);
         result.items = result.items.map(item => this.entityToModel(item));
         return result;
     }
-    async findOne(condition) {
-        const entity = await this.dbRepository.findOne({
-            where: ConditionHelper_1.ConditionHelper.toTypeOrm(condition),
-        });
-        return entity ? this.entityToModel(entity) : null;
+    async findOne(conditionOrQuery) {
+        const dbQuery = this.createQueryBuilder(conditionOrQuery);
+        const row = await dbQuery.getOne();
+        return row ? this.entityToModel(row) : null;
+    }
+    async findMany(conditionOrQuery) {
+        const dbQuery = this.createQueryBuilder(conditionOrQuery);
+        const rows = await dbQuery.getMany();
+        return rows.map(row => this.entityToModel(row));
+    }
+    createQueryBuilder(conditionOrQuery) {
+        const searchQuery = !(conditionOrQuery instanceof SearchQuery_1.default)
+            ? new SearchQuery_1.default({ condition: conditionOrQuery })
+            : conditionOrQuery;
+        const dbQuery = this.dbRepository.createQueryBuilder();
+        SearchQuery_1.default.prepare(this.dbRepository, dbQuery, searchQuery);
+        return dbQuery;
     }
     async create(model) {
         const entity = await this.dbRepository.manager.save(this.modelToEntity(model));
@@ -39,14 +51,13 @@ class CrudRepository {
         await this.dbRepository.delete(id);
     }
     modelToEntity(model) {
-        const entity = this.dbRepository.create(model);
-        return entity;
+        return this.dbRepository.create(model);
     }
     entityToModel(obj) {
-        const ModelClass = this.modelClass;
-        const model = new ModelClass();
-        Object.assign(model, (0, class_transformer_1.instanceToPlain)(obj));
-        return model;
+        if (!this.modelClass) {
+            throw new Error('Property modelClass is not set in repository: ' + this.constructor.name);
+        }
+        return DataMapperHelper_1.DataMapperHelper.anyToModel(obj, this.modelClass);
     }
 }
 exports.CrudRepository = CrudRepository;

package/infrastructure/repositories/CrudRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"CrudRepository.js","sourceRoot":"","sources":["../../../src/infrastructure/repositories/CrudRepository.ts"],"names":[],"mappings":";;;AACA,yDAAkD;AAClD,sEAAiE;AAGjE,gEAAuE;AAOvE,MAAa,cAAc;IAA3B;QAIW,eAAU,GAAW,IAAI,CAAC;IAgGrC,CAAC;IAlFU,IAAI,CAAC,YAA6B,EAAE,UAAe;QACtD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,KAAoC;QAC7C,MAAM,MAAM,GAAG,MAAM,2BAAY,CAAC,MAAM,CAAS,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QACjF,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QAClE,OAAO,MAAM,CAAC;IAClB,CAAC;IAMD,KAAK,CAAC,OAAO,CAAC,SAAqB;QAC/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;YAC3C,KAAK,EAAE,iCAAe,CAAC,SAAS,CAAC,SAAS,CAAC;SAC9C,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACtD,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,KAAa;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/E,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,KAAa;QAClC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,EAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,EAAE,CAAC,CAAC;SACnD;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,iCAAK,SAAS,GAAK,KAAK,EAAE,CAAC,CAAC;QAC/F,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAC3C,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC;IAOS,aAAa,CAAC,KAAK;QAIzB,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC;IAClB,CAAC;IAOS,aAAa,CAAC,GAAQ;QAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAiB,CAAC;QAC1C,MAAM,KAAK,GAAG,IAAI,UAAU,EAAE,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAA,mCAAe,EAAC,GAAG,CAAC,CAAC,CAAC;QAE3C,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AApGD,wCAoGC"}
+{"version":3,"file":"CrudRepository.js","sourceRoot":"","sources":["../../../src/infrastructure/repositories/CrudRepository.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steroidsjs/nest",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "scripts": {
     "build": "tsc && copyfiles ./{package.json,LICENSE,README.md} dist/"
   },