@steroidsjs/nest 1.0.12 → 1.1.0

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.prototype, 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,CAAC,SAAS,EAAE,SAAS,CAA0B,CAAC;oBACvG,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/services/CrudService.d.ts

@@ -12,5 +12,5 @@ export declare class CrudService<TModel, TSearchDto = ISearchInputDto, TSaveDto
     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';
@@ -18,32 +18,27 @@ class CrudService {
     }
     async search(dto) {
         await (0, ValidationHelper_1.validateOrReject)(dto);
-        const repositoryResult = await this.repository.search(dto);
-        return repositoryResult;
+        return await this.repository.search(dto);
     }
     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;AAK7D,MAAa,WAAW;IAAxB;QAQc,eAAU,GAAW,IAAI,CAAC;IAiFxC,CAAC;IAlEG,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,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7C,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;AAzFD,kCAyFC"}

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"}