npm - @lenne.tech/nest-server - Versions diffs - 3.2.1 → 3.3.0 - Mend

@lenne.tech/nest-server 3.2.1 → 3.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (131) hide show

package/dist/core/common/args/filter.args.d.ts CHANGED Viewed

@@ -2,4 +2,9 @@ import { FilterInput } from '../inputs/filter.input';
 import { PaginationArgs } from './pagination.args';
 export declare class FilterArgs extends PaginationArgs {
     filter?: FilterInput;
+    map(data: Partial<this> | Record<string, any>, options?: {
+        cloneDeep?: boolean;
+        funcAllowed?: boolean;
+        mapId?: boolean;
+    }): this;
 }

package/dist/core/common/args/filter.args.js CHANGED Viewed

@@ -15,6 +15,16 @@ const graphql_1 = require("@nestjs/graphql");
 const filter_input_1 = require("../inputs/filter.input");
 const pagination_args_1 = require("./pagination.args");
 let FilterArgs = class FilterArgs extends pagination_args_1.PaginationArgs {
+    constructor() {
+        super(...arguments);
+        this.filter = undefined;
+    }
+    map(data, options = {}) {
+        super.map(data, options);
+        this.filter = data.filter ? filter_input_1.FilterInput.map(data.filter, options) : undefined;
+        Object.keys(this).forEach((key) => this[key] === undefined && delete this[key]);
+        return this;
+    }
 };
 __decorate([
     (0, graphql_1.Field)((type) => filter_input_1.FilterInput, {

package/dist/core/common/args/filter.args.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"filter.args.js","sourceRoot":"","sources":["../../../../src/core/common/args/filter.args.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAA6C;AAC7C,6CAAkD;AAClD,yDAAqD;AACrD,uDAAmD;AAGnD,IAAa,UAAU,GAAvB,MAAa,UAAW,SAAQ,gCAAc;~~CAU7C~~,CAAA;~~AADC~~;IALC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,0BAAW,EAAE;QAC5B,WAAW,EAAE,qBAAqB;QAClC,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,4BAAU,GAAE;8BACJ,0BAAW;~~0CAAC~~;~~AATV~~,UAAU;IADtB,IAAA,kBAAQ,GAAE;GACE,UAAU,~~CAUtB~~;~~AAVY~~,gCAAU"}
1	+ {"version":3,"file":"filter.args.js","sourceRoot":"","sources":["../../../../src/core/common/args/filter.args.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAA6C;AAC7C,6CAAkD;AAClD,yDAAqD;AACrD,uDAAmD;AAGnD,IAAa,UAAU,GAAvB,MAAa,UAAW,SAAQ,gCAAc;IAA9C;;QASE,WAAM,GAAiB,SAAS,CAAC;IAsBnC,CAAC;IAbC,GAAG,CACD,IAAyC,EACzC,UAII,EAAE;QAEN,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,0BAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAtBC;IALC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,0BAAW,EAAE;QAC5B,WAAW,EAAE,qBAAqB;QAClC,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,4BAAU,GAAE;8BACJ,0BAAW;0CAAa;AATtB,UAAU;IADtB,IAAA,kBAAQ,GAAE;GACE,UAAU,CA+BtB;AA/BY,gCAAU"}

package/dist/core/common/args/pagination.args.d.ts CHANGED Viewed

@@ -1,8 +1,15 @@
+import { CoreInput } from '../inputs/core-input.input';
 import { SortInput } from '../inputs/sort.input';
-export declare class PaginationArgs {
+export declare class PaginationArgs extends CoreInput {
     limit?: number;
     offset?: number;
     skip?: number;
     sort?: SortInput[];
     take?: number;
+    init(): this;
+    map(data: Partial<this> | Record<string, any>, options?: {
+        cloneDeep?: boolean;
+        funcAllowed?: boolean;
+        mapId?: boolean;
+    }): this;
 }

package/dist/core/common/args/pagination.args.js CHANGED Viewed

@@ -12,13 +12,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaginationArgs = void 0;
 const class_validator_1 = require("class-validator");
 const graphql_1 = require("@nestjs/graphql");
+const model_helper_1 = require("../helpers/model.helper");
+const core_input_input_1 = require("../inputs/core-input.input");
 const sort_input_1 = require("../inputs/sort.input");
-let PaginationArgs = class PaginationArgs {
+let PaginationArgs = class PaginationArgs extends core_input_input_1.CoreInput {
     constructor() {
-        this.limit = 25;
-        this.offset = 0;
-        this.skip = 0;
-        this.take = 25;
+        super(...arguments);
+        this.limit = undefined;
+        this.offset = undefined;
+        this.skip = undefined;
+        this.sort = undefined;
+        this.take = undefined;
+    }
+    init() {
+        super.init();
+        this.limit = this.limit === undefined ? 25 : this.limit;
+        this.offset = this.offset === undefined ? 0 : this.offset;
+        this.skip = this.skip === undefined ? 0 : this.skip;
+        this.take = this.take === undefined ? 0 : this.take;
+        return this;
+    }
+    map(data, options = {}) {
+        super.map(data, options);
+        this.sort = model_helper_1.ModelHelper.maps(data.sort, sort_input_1.SortInput, options.cloneDeep);
+        Object.keys(this).forEach((key) => this[key] === undefined && delete this[key]);
+        return this;
     }
 };
 __decorate([
@@ -44,7 +62,7 @@ __decorate([
     (0, graphql_1.Field)((type) => graphql_1.Int, {
         description: 'Alias for offset',
         nullable: true,
-        defaultValue: 0,
+        defaultValue: undefined,
     }),
     (0, class_validator_1.IsOptional)(),
     __metadata("design:type", Number)

package/dist/core/common/args/pagination.args.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pagination.args.js","sourceRoot":"","sources":["../../../../src/core/common/args/pagination.args.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAkD;AAClD,6CAAuD;AACvD,qDAAiD;AAGjD,IAAa,cAAc,GAA3B,MAAa,~~cAAc~~;~~IAA3B;~~QAWE,UAAK,GAAY,~~EAAE~~,CAAC;~~QAWpB~~,WAAM,GAAY,~~CAAC~~,CAAC;~~QAWpB~~,SAAI,GAAY,CAAC,CAAC;~~QAsBlB~~,SAAI,GAAY,EAAE,CAAC;~~IACrB~~,CAAC;~~CAAA~~,CAAA;~~AA7CC~~;IAPC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAG,EAAE;QACpB,WAAW,EAAE,8EAA8E;QAC3F,QAAQ,EAAE,IAAI;QACd,YAAY,EAAE,EAAE;KACjB,CAAC;IACD,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAG,EAAC,GAAG,CAAC;;~~6CACW~~;~~AAWpB~~;IANC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAG,EAAE;QACpB,WAAW,EAAE,sEAAsE;QACnF,QAAQ,EAAE,IAAI;QACd,YAAY,EAAE,CAAC;KAChB,CAAC;IACD,IAAA,4BAAU,GAAE;;~~8CACO~~;~~AAWpB~~;IANC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAG,EAAE;QACpB,WAAW,EAAE,kBAAkB;QAC/B,QAAQ,EAAE,IAAI;QACd,YAAY,EAAE,~~CAAC~~;~~KAChB~~,CAAC;IACD,IAAA,4BAAU,GAAE;;~~4CACK~~;~~AAUlB~~;IALC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,sBAAS,CAAC,EAAE;QAC5B,WAAW,EAAE,+BAA+B;QAC5C,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,4BAAU,GAAE;;~~4CACM~~;~~AAYnB~~;IAPC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAG,EAAE;QACpB,WAAW,EAAE,iBAAiB;QAC9B,QAAQ,EAAE,IAAI;QACd,YAAY,EAAE,EAAE;KACjB,CAAC;IACD,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAG,EAAC,GAAG,CAAC;;~~4CACU~~;~~AAvDR~~,cAAc;IAD1B,IAAA,kBAAQ,GAAE;GACE,cAAc,~~CAwD1B~~;~~AAxDY~~,wCAAc"}
1	+ {"version":3,"file":"pagination.args.js","sourceRoot":"","sources":["../../../../src/core/common/args/pagination.args.ts"],"names":[],"mappings":"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"}

package/dist/core/common/decorators/restricted.decorator.d.ts CHANGED Viewed

@@ -4,4 +4,7 @@ export declare const getRestricted: (object: unknown, propertyKey: string) => an
 export declare const checkRestricted: (data: any, user: {
     id: any;
     hasRole: (roles: string[]) => boolean;
+}, options?: {
+    ignoreUndefined?: boolean;
+    throwError?: boolean;
 }, processedObjects?: any[]) => any;

package/dist/core/common/decorators/restricted.decorator.js CHANGED Viewed

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkRestricted = exports.getRestricted = exports.Restricted = void 0;
 require("reflect-metadata");
+const common_1 = require("@nestjs/common");
 const role_enum_1 = require("../enums/role.enum");
 const restrictedMetaKey = Symbol('restricted');
 const Restricted = (...roles) => {
@@ -12,7 +13,8 @@ const getRestricted = (object, propertyKey) => {
     return Reflect.getMetadata(restrictedMetaKey, object, propertyKey);
 };
 exports.getRestricted = getRestricted;
-const checkRestricted = (data, user, processedObjects = []) => {
+const checkRestricted = (data, user, options = {}, processedObjects = []) => {
+    const config = Object.assign({ ignoreUndefined: true, throwError: true }, options);
     if (!data || typeof data !== 'object') {
         return data;
     }
@@ -21,9 +23,12 @@ const checkRestricted = (data, user, processedObjects = []) => {
     }
     processedObjects.push(data);
     if (Array.isArray(data)) {
-        return data.map((item) => (0, exports.checkRestricted)(item, user, processedObjects));
+        return data.map((item) => (0, exports.checkRestricted)(item, user, options, processedObjects));
     }
     for (const propertyKey of Object.keys(data)) {
+        if (data[propertyKey] === undefined && config.ignoreUndefined) {
+            continue;
+        }
         const roles = (0, exports.getRestricted)(data, propertyKey);
         if (roles && roles.some((value) => !!value)) {
             if (!user || !user.hasRole(roles)) {
@@ -33,17 +38,21 @@ const checkRestricted = (data, user, processedObjects = []) => {
                         !(data.ownerIds === userId ||
                             (Array.isArray(data.ownerIds) &&
                                 data.ownerIds.some((item) => (item.id ? item.id.toString() === userId : item.toString() === userId))))) {
-                        delete data[propertyKey];
+                        if (config.throwError) {
+                            throw new common_1.UnauthorizedException('Current user is not allowed to set ' + propertyKey);
+                        }
                         continue;
                     }
                 }
                 else {
-                    delete data[propertyKey];
+                    if (config.throwError) {
+                        throw new common_1.UnauthorizedException('Current user is not allowed to set ' + propertyKey);
+                    }
                     continue;
                 }
             }
         }
-        data[propertyKey] = (0, exports.checkRestricted)(data[propertyKey], user, processedObjects);
+        data[propertyKey] = (0, exports.checkRestricted)(data[propertyKey], user, options, processedObjects);
     }
     return data;
 };

package/dist/core/common/decorators/restricted.decorator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"restricted.decorator.js","sourceRoot":"","sources":["../../../../src/core/common/decorators/restricted.decorator.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAC1B,kDAA8C;AAK9C,MAAM,iBAAiB,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAUxC,MAAM,UAAU,GAAG,CAAC,GAAG,KAAe,EAAqB,EAAE;IAClE,OAAO,OAAO,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;AACpD,CAAC,CAAC;AAFW,QAAA,UAAU,cAErB;AAKK,MAAM,aAAa,GAAG,CAAC,MAAe,EAAE,WAAmB,EAAE,EAAE;IACpE,OAAO,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;AACrE,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB;AAKK,MAAM,eAAe,GAAG,CAC7B,IAAS,EACT,IAAwD,EACxD,mBAA0B,EAAE,EAC5B,EAAE;~~IAEF~~,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QACrC,OAAO,IAAI,CAAC;KACb;IAGD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACnC,OAAO,IAAI,CAAC;KACb;IACD,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAG5B,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAEvB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,uBAAe,EAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC;~~KAC1E~~;IAGD,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAE3C,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAG/C,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;YAE3C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAEjC,IAAI,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,oBAAQ,CAAC,KAAK,CAAC,EAAE;oBAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;oBAElC,IACE,CAAC,IAAI,CAAC,QAAQ;wBACd,CAAC,CACC,IAAI,CAAC,QAAQ,KAAK,MAAM;4BACxB,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;gCAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,CACxG,EACD;wBAEA,~~OAAO~~,IAAI,CAAC,WAAW,CAAC,CAAC;~~wBACzB~~,SAAS;qBACV;iBACF;qBAAM;oBAEL,~~OAAO~~,IAAI,CAAC,WAAW,CAAC,CAAC;~~oBACzB~~,SAAS;iBACV;aACF;SACF;QAGD,IAAI,CAAC,WAAW,CAAC,GAAG,IAAA,uBAAe,EAAC,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;~~KAChF~~;IAGD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;~~AA7DW~~,QAAA,eAAe,~~mBA6D1B~~"}
1	+ {"version":3,"file":"restricted.decorator.js","sourceRoot":"","sources":["../../../../src/core/common/decorators/restricted.decorator.ts"],"names":[],"mappings":"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"}

package/dist/core/common/helpers/context.helper.js CHANGED Viewed

@@ -4,18 +4,28 @@ exports.Context = void 0;
 const graphql_1 = require("@nestjs/graphql");
 class Context {
     static getData(context) {
-        var _a;
+        var _a, _b, _c, _d;
         if (!context) {
             return { currentUser: null, args: null };
         }
         let user;
-        const ctx = graphql_1.GqlExecutionContext.create(context).getContext();
-        let args = graphql_1.GqlExecutionContext.create(context).getArgs();
+        let ctx = null;
+        try {
+            ctx = (_a = graphql_1.GqlExecutionContext.create(context)) === null || _a === void 0 ? void 0 : _a.getContext();
+        }
+        catch (e) {
+        }
+        let args;
+        try {
+            args = (_b = graphql_1.GqlExecutionContext.create(context)) === null || _b === void 0 ? void 0 : _b.getArgs();
+        }
+        catch (e) {
+        }
         if (ctx) {
-            user = (ctx === null || ctx === void 0 ? void 0 : ctx.user) || ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.req) === null || _a === void 0 ? void 0 : _a.user);
+            user = (ctx === null || ctx === void 0 ? void 0 : ctx.user) || ((_c = ctx === null || ctx === void 0 ? void 0 : ctx.req) === null || _c === void 0 ? void 0 : _c.user);
         }
         else {
-            const request = context.switchToHttp().getRequest();
+            const request = (context === null || context === void 0 ? void 0 : context.switchToHttp) ? (_d = context.switchToHttp()) === null || _d === void 0 ? void 0 : _d.getRequest() : null;
             if (request) {
                 args = request.body;
                 user = request.user;

package/dist/core/common/helpers/context.helper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"context.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/context.helper.ts"],"names":[],"mappings":";;;AACA,6CAAsD;AAKtD,MAAa,OAAO;IAIX,MAAM,CAAC,OAAO,CAAC,OAAyB;;QAE7C,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;SAC1C;QAGD,IAAI,IAA4B,CAAC;QACjC,~~MAAM~~,GAAG,GAAQ,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,~~CAAC~~,UAAU,EAAE,CAAC;~~QAClE~~,IAAI,IAAI,~~GAAQ~~,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,~~CAAC~~,OAAO,EAAE,CAAC;~~QAG9D~~,IAAI,GAAG,EAAE;YAEP,IAAI,GAAG,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAI,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,GAAG,0CAAE,IAAI,CAAA,CAAC;SACpC;aAAM;YACL,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,~~CAAC~~,UAAU,EAAE,CAAC;~~YACpD~~,IAAI,OAAO,EAAE;gBACX,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;gBAGpB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;aACrB;SACF;QAGD,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACrC,CAAC;CACF;~~AAhCD~~,~~0BAgCC~~"}
1	+ {"version":3,"file":"context.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/context.helper.ts"],"names":[],"mappings":";;;AACA,6CAAsD;AAKtD,MAAa,OAAO;IAIX,MAAM,CAAC,OAAO,CAAC,OAAyB;;QAE7C,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;SAC1C;QAGD,IAAI,IAA4B,CAAC;QACjC,IAAI,GAAG,GAAQ,IAAI,CAAC;QACpB,IAAI;YACF,GAAG,GAAG,MAAA,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,0CAAE,UAAU,EAAE,CAAC;SACzD;QAAC,OAAO,CAAC,EAAE;SAEX;QAED,IAAI,IAAS,CAAC;QACd,IAAI;YACF,IAAI,GAAG,MAAA,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,0CAAE,OAAO,EAAE,CAAC;SACvD;QAAC,OAAO,CAAC,EAAE;SAEX;QAGD,IAAI,GAAG,EAAE;YAEP,IAAI,GAAG,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAI,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,GAAG,0CAAE,IAAI,CAAA,CAAC;SACpC;aAAM;YACL,MAAM,OAAO,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,EAAC,CAAC,CAAC,MAAA,OAAO,CAAC,YAAY,EAAE,0CAAE,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YACpF,IAAI,OAAO,EAAE;gBACX,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;gBAGpB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;aACrB;SACF;QAGD,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACrC,CAAC;CACF;AA3CD,0BA2CC"}

package/dist/core/common/helpers/filter.helper.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { FilterQuery, QueryOptions } from 'mongoose';
 import { FilterArgs } from '../args/filter.args';
 import { FilterInput } from '../inputs/filter.input';
 export declare class Filter {
-    static convertFilterArgsToQuery<T = any>(filterArgs: FilterArgs): [FilterQuery<T>, QueryOptions];
-    static generateFilterQuery<T = any>(filter?: FilterInput): FilterQuery<T> | any;
-    static generateFindOptions<T = any>(filterArgs: FilterArgs): QueryOptions;
+    static convertFilterArgsToQuery<T = any>(filterArgs: Partial<FilterArgs>): [FilterQuery<T>, QueryOptions];
+    static generateFilterQuery<T = any>(filter?: Partial<FilterInput>): FilterQuery<T> | any;
+    static generateFindOptions<T = any>(filterArgs: Partial<FilterArgs>): QueryOptions;
 }

package/dist/core/common/helpers/filter.helper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"filter.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/filter.helper.ts"],"names":[],"mappings":";;;AAEA,gFAA2E;AAC3E,0EAAqE;AAOrE,MAAa,MAAM;IAKV,MAAM,CAAC,wBAAwB,CAAU,~~UAAsB~~;~~QACpE~~,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAC;IACjG,CAAC;IAKM,MAAM,CAAC,mBAAmB,CAAU,~~MAAoB~~;~~QAE7D~~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~~UAAsB~~;~~QAE/D~~,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,EAAE,CAAC;SACX;QAGD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;QAGvD,MAAM,OAAO,GAAiB;YAC5B,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;SAC5B,CAAC;QAEF,IAAI,IAAI,GAAG,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE;YAC1B,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;SACvC;QAGD,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,GAAG,GAAG,EAAE;YACzC,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC;SACpB;QAGD,IAAI,IAAI,EAAE;YACR,OAAO,CAAC,IAAI,GAAG,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,CAAC,CAAC,IAAe,EAAE,EAAE;gBAC/B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACxC,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AA3HD,wBA2HC"}
1	+ {"version":3,"file":"filter.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/filter.helper.ts"],"names":[],"mappings":"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"}

package/dist/core/common/helpers/input.helper.js CHANGED Viewed

@@ -8,17 +8,23 @@ const _ = require("lodash");
 const restricted_decorator_1 = require("../decorators/restricted.decorator");
 class InputHelper {
     static async check(value, user, metatype) {
-        if (!metatype || this.isBasicType(metatype)) {
+        var _a, _b;
+        if (typeof value !== 'object' || !metatype || this.isBasicType(metatype)) {
             return value;
         }
-        value = (0, restricted_decorator_1.checkRestricted)(value, user);
-        if (metatype) {
-            const object = (0, class_transformer_1.plainToClass)(metatype, value);
-            const errors = await (0, class_validator_1.validate)(object);
-            if (errors.length > 0) {
-                throw new common_1.BadRequestException('Validation failed');
+        if (!(value instanceof metatype)) {
+            if ((_a = metatype) === null || _a === void 0 ? void 0 : _a.map) {
+                value = (_b = metatype) === null || _b === void 0 ? void 0 : _b.map(value);
+            }
+            else {
+                value = (0, class_transformer_1.plainToInstance)(metatype, value);
             }
         }
+        const errors = await (0, class_validator_1.validate)(value);
+        if (errors.length > 0) {
+            throw new common_1.BadRequestException('Validation failed');
+        }
+        value = (0, restricted_decorator_1.checkRestricted)(value, user);
         return value;
     }
     static errorFunction(caller) {

package/dist/core/common/helpers/input.helper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"input.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/input.helper.ts"],"names":[],"mappings":";;;AAAA,2CAAqD;AACrD,~~yDAAiD~~;~~AACjD~~,qDAA2C;AAC3C,4BAA4B;AAC5B,6EAAqE;AAKrE,MAAa,WAAW;IAIf,MAAM,CAAC,KAAK,CAAC,KAAK,CACvB,KAAU,EACV,IAAwD,EACxD,QAAS;QAGT,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;~~YAC3C~~,OAAO,KAAK,CAAC;SACd;QAGD,~~KAAK~~,~~GAAG~~,~~IAAA~~,~~sCAAe,EAAC,~~KAAK,~~EAAE~~,~~IAAI~~,CAAC,~~CAAC~~;~~QAGrC~~,IAAI,~~QAAQ~~,EAAE;~~YACZ~~,~~MAAM~~,~~MAAM~~,GAAG,IAAA,~~gCAAY~~,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;~~YAC7C~~,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAQ,EAAC,~~MAAM~~,CAAC,CAAC;~~YACtC~~,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;~~gBACrB~~,MAAM,IAAI,4BAAmB,CAAC,mBAAmB,CAAC,CAAC;~~aACpD~~;~~SACF~~;~~QACD~~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~~AA9ND~~,~~kCA8NC~~"}
1	+ {"version":3,"file":"input.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/input.helper.ts"],"names":[],"mappings":"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"}

package/dist/core/common/helpers/model.helper.js CHANGED Viewed

@@ -25,7 +25,6 @@ class ModelHelper {
         }
         const preparedSource = ModelHelper.prepareMap(source, target, config);
         Object.assign(target, preparedSource);
-        Object.keys(target).forEach((key) => target[key] === undefined && delete target[key]);
         return target;
     }
     static maps(data, targetClass, cloneDeep = true) {

package/dist/core/common/helpers/model.helper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"model.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/model.helper.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAK5B,MAAa,WAAW;IAOf,MAAM,CAAC,UAAU,CACtB,MAAwC,EACxC,MAAS,EACT,UAII,EAAE;QAGN,MAAM,MAAM,mBACV,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,KAAK,IACT,OAAO,CACX,CAAC;QAGF,MAAM,MAAM,GAAG,EAAE,CAAC;QAGlB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACrC,IACE,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC;gBAC9C,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS;gBACzB,CAAC,MAAM,CAAC,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,CAAC,EAC3D;gBACA,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,UAAU,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aACvG;iBAAM,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACxC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;aAC5B;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAKM,MAAM,CAAC,GAAG,CACf,MAAwC,EACxC,MAAS,EACT,UAII,EAAE;QAGN,MAAM,MAAM,mBACV,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,KAAK,IACT,OAAO,CACX,CAAC;QAGF,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAClE,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;SACxD;QAGD,MAAM,cAAc,GAAG,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAGtE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAGtC,~~MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,~~OAAO,~~CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,~~MAAM,CAAC~~,GAAG,CAAC,KAAK,SAAS,IAAI,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC~~;~~QAGtF,OAAO,MAAM,CAAC;~~IAChB,CAAC;IAKM,MAAM,CAAC,IAAI,CAChB,IAA6E,EAC7E,WAAsC,EACtC,SAAS,GAAG,IAAI;QAGhB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YACrC,OAAO,SAAS,CAAC;SAClB;QAGD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACxB,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;SACf;QAGD,OAAQ,IAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAClC,OAAQ,WAAmB,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACL,CAAC;CACF;~~AAxGD~~,~~kCAwGC~~"}
1	+ {"version":3,"file":"model.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/model.helper.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAK5B,MAAa,WAAW;IAOf,MAAM,CAAC,UAAU,CACtB,MAAwC,EACxC,MAAS,EACT,UAII,EAAE;QAGN,MAAM,MAAM,mBACV,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,KAAK,IACT,OAAO,CACX,CAAC;QAGF,MAAM,MAAM,GAAG,EAAE,CAAC;QAGlB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACrC,IACE,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC;gBAC9C,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS;gBACzB,CAAC,MAAM,CAAC,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,CAAC,EAC3D;gBACA,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,UAAU,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aACvG;iBAAM,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACxC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;aAC5B;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAKM,MAAM,CAAC,GAAG,CACf,MAAwC,EACxC,MAAS,EACT,UAII,EAAE;QAGN,MAAM,MAAM,mBACV,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,KAAK,IACT,OAAO,CACX,CAAC;QAGF,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAClE,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;SACxD;QAGD,MAAM,cAAc,GAAG,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAGtE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAGtC,OAAO,MAAM,CAAC;IAChB,CAAC;IAKM,MAAM,CAAC,IAAI,CAChB,IAA6E,EAC7E,WAAsC,EACtC,SAAS,GAAG,IAAI;QAGhB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YACrC,OAAO,SAAS,CAAC;SAClB;QAGD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACxB,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;SACf;QAGD,OAAQ,IAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAClC,OAAQ,WAAmB,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AArGD,kCAqGC"}

package/dist/core/common/helpers/service.helper.d.ts CHANGED Viewed

@@ -1,19 +1,17 @@
 export declare class ServiceHelper {
-    static prepareInput(input: {
-        [key: string]: any;
-    }, currentUser: {
+    static prepareInput(input: Record<string, any>, currentUser: {
         [key: string]: any;
         id: string;
     }, options?: {
         [key: string]: any;
         create?: boolean;
         clone?: boolean;
-    }, ...args: any[]): Promise<{
-        [key: string]: any;
-    }>;
-    static prepareOutput<T = Record<string, any>>(output: any, userModel: new () => any, userService: any, options?: {
+        removeUndefined?: boolean;
+    }): Promise<Record<string, any>>;
+    static prepareOutput<T = Record<string, any>>(output: any, options?: {
         [key: string]: any;
         clone?: boolean;
+        removeUndefined?: boolean;
         targetModel?: Partial<T>;
-    }, ...args: any[]): Promise<any>;
+    }): Promise<any>;
 }

package/dist/core/common/helpers/service.helper.js CHANGED Viewed

@@ -6,13 +6,21 @@ const bcrypt = require("bcrypt");
 const _ = require("lodash");
 const role_enum_1 = require("../enums/role.enum");
 class ServiceHelper {
-    static async prepareInput(input, currentUser, options = {}, ...args) {
+    static async prepareInput(input, currentUser, options = {}) {
         var _a;
-        const config = Object.assign({ checkRoles: false, clone: false, create: false }, options);
+        const config = Object.assign({ checkRoles: false, clone: false, create: false, removeUndefined: false }, options);
         if (config.clone) {
-            input = JSON.parse(JSON.stringify(input));
+            if (input.mapDeep && typeof input.mapDeep === 'function') {
+                input = Object.getPrototypeOf(input).mapDeep(input);
+            }
+            else {
+                input = _.cloneDeep(input);
+            }
         }
-        if (input.roles && config.checkRoles && (!(currentUser === null || currentUser === void 0 ? void 0 : currentUser.hasRole) || !currentUser.hasRole(role_enum_1.RoleEnum.ADMIN))) {
+        if (config.removeUndefined) {
+            Object.keys(input).forEach((key) => input[key] === undefined && delete input[key]);
+        }
+        if (config.checkRoles && input.roles && (!(currentUser === null || currentUser === void 0 ? void 0 : currentUser.hasRole) || !currentUser.hasRole(role_enum_1.RoleEnum.ADMIN))) {
             if (!((_a = currentUser) === null || _a === void 0 ? void 0 : _a.roles)) {
                 throw new common_1.UnauthorizedException('Missing roles of current user');
             }
@@ -36,17 +44,31 @@ class ServiceHelper {
         }
         return input;
     }
-    static async prepareOutput(output, userModel, userService, options = {}, ...args) {
-        const config = Object.assign({ clone: true }, options);
+    static async prepareOutput(output, options = {}) {
+        const config = Object.assign({ clone: false, removeUndefined: false, targetModel: undefined }, options);
         if (config.clone) {
-            output = JSON.parse(JSON.stringify(output));
+            if (output.cloneDeep && typeof output.cloneDeep === 'function') {
+                output = Object.getPrototypeOf(output).cloneDeep(output);
+            }
+            else {
+                output = _.cloneDeep(output);
+            }
+        }
+        if (config.targetModel) {
+            output = config.targetModel.map(output);
+        }
+        if (output.password) {
+            output.password = undefined;
+        }
+        if (output.verificationToken) {
+            output.verificationToken = undefined;
+        }
+        if (output.passwordResetToken) {
+            output.passwordResetToken = undefined;
         }
-        if (options.targetModel) {
-            options.targetModel.map(output);
+        if (config.removeUndefined) {
+            Object.keys(output).forEach((key) => output[key] === undefined && delete output[key]);
         }
-        delete output.password;
-        delete output.verificationToken;
-        delete output.passwordResetToken;
         return output;
     }
 }

package/dist/core/common/helpers/service.helper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"service.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/service.helper.ts"],"names":[],"mappings":";;;AAAA,2CAAuD;AACvD,iCAAiC;AACjC,4BAA4B;AAC5B,kDAA8C;AAK9C,MAAa,aAAa;IAIxB,MAAM,CAAC,KAAK,CAAC,YAAY,CACvB,~~KAA6B~~,~~EAC7B~~,WAA+C,EAC/C,~~UAAqE~~,EAAE~~,EACvE,GAAG,IAAW~~;;~~QAGd~~,MAAM,MAAM,mBACV,UAAU,EAAE,KAAK,EACjB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,KAAK,~~IACV~~,OAAO,CACX,CAAC;QAGF,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,KAAK,~~GAAG~~,IAAI,CAAC,KAAK,CAAC,~~IAAI~~,CAAC,~~SAAS~~,CAAC,KAAK,CAAC,CAAC,CAAC;~~SAC3C~~;QAGD,IAAI,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAA,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,oBAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;YACvG,IAAI,CAAC,CAAA,MAAC,WAAmB,0CAAE,KAAK,CAAA,EAAE;gBAChC,MAAM,IAAI,8BAAqB,CAAC,+BAA+B,CAAC,CAAC;aAClE;iBAAM;gBACL,MAAM,YAAY,GAAG,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,EAAG,WAAmB,CAAC,KAAK,CAAC,CAAC;gBAC7E,IAAI,YAAY,CAAC,MAAM,KAAK,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE;oBAC9C,MAAM,YAAY,GAAG,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAG,WAAmB,CAAC,KAAK,CAAC,CAAC;oBAC3E,MAAM,IAAI,8BAAqB,CAAC,0CAA0C,GAAG,YAAY,CAAC,CAAC;iBAC5F;gBACD,KAAK,CAAC,KAAK,GAAG,YAAY,CAAC;aAC5B;SACF;QAGD,IAAI,KAAK,CAAC,QAAQ,EAAE;YAClB,KAAK,CAAC,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAE,KAAa,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SACjE;QAGD,IAAI,MAAM,CAAC,MAAM,IAAI,WAAW,EAAE;YAChC,KAAK,CAAC,SAAS,GAAG,WAAW,CAAC,EAAE,CAAC;SAClC;QAGD,IAAI,WAAW,EAAE;YACf,KAAK,CAAC,SAAS,GAAG,WAAW,CAAC,EAAE,CAAC;SAClC;QAGD,OAAO,KAAK,CAAC;IACf,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,aAAa,CACxB,MAAW,EACX,~~SAAwB~~,~~EACxB~~,~~WAAgB~~,~~EAChB~~,~~UAA6E~~,EAAE,~~EAC/E~~,~~GAAG~~,~~IAAW;QAGd~~,~~MAAM~~,~~MAAM~~,~~mBACV~~,~~KAAK~~,EAAE,~~IAAI~~,~~IACR~~,OAAO,CACX,CAAC;QAGF,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,MAAM,~~GAAG~~,IAAI,CAAC,KAAK,CAAC,~~IAAI~~,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;~~SAC7C~~;QAGD,IAAI,~~OAAO~~,CAAC,WAAW,EAAE;YACtB,~~OAAO~~,CAAC,WAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;~~SAC1C~~;QAGD,~~OAAO~~,MAAM,CAAC,QAAQ,CAAC;~~QAGvB~~,~~OAAO~~,MAAM,CAAC,iBAAiB,CAAC;~~QAGhC~~,~~OAAO~~,MAAM,CAAC,kBAAkB,CAAC;~~QAGjC~~,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;~~AA9FD~~,~~sCA8FC~~"}
1	+ {"version":3,"file":"service.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/service.helper.ts"],"names":[],"mappings":"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"}

package/dist/core/common/inputs/combined-filter.input.d.ts CHANGED Viewed

@@ -1,6 +1,12 @@
 import { LogicalOperatorEnum } from '../enums/logical-operator.enum';
+import { CoreInput } from './core-input.input';
 import { FilterInput } from './filter.input';
-export declare class CombinedFilterInput {
-    logicalOperator?: LogicalOperatorEnum;
+export declare class CombinedFilterInput extends CoreInput {
+    logicalOperator: LogicalOperatorEnum;
     filters: FilterInput[];
+    map(data: Partial<this> | Record<string, any>, options?: {
+        cloneDeep?: boolean;
+        funcAllowed?: boolean;
+        mapId?: boolean;
+    }): this;
 }

package/dist/core/common/inputs/combined-filter.input.js CHANGED Viewed

@@ -12,20 +12,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CombinedFilterInput = void 0;
 const graphql_1 = require("@nestjs/graphql");
 const logical_operator_enum_1 = require("../enums/logical-operator.enum");
+const model_helper_1 = require("../helpers/model.helper");
+const core_input_input_1 = require("./core-input.input");
 const filter_input_1 = require("./filter.input");
-let CombinedFilterInput = class CombinedFilterInput {
+let CombinedFilterInput = class CombinedFilterInput extends core_input_input_1.CoreInput {
+    constructor() {
+        super(...arguments);
+        this.logicalOperator = undefined;
+        this.filters = undefined;
+    }
+    map(data, options = {}) {
+        super.map(data, options);
+        this.filters = model_helper_1.ModelHelper.maps(data.filters, filter_input_1.FilterInput, options.cloneDeep);
+        Object.keys(this).forEach((key) => this[key] === undefined && delete this[key]);
+        return this;
+    }
 };
 __decorate([
     (0, graphql_1.Field)((type) => logical_operator_enum_1.LogicalOperatorEnum, {
-        description: 'Logical Operator to combine filters. If set the `filters` must be also set.',
-        nullable: true,
+        description: 'Logical Operator to combine filters',
     }),
     __metadata("design:type", String)
 ], CombinedFilterInput.prototype, "logicalOperator", void 0);
 __decorate([
     (0, graphql_1.Field)((type) => [filter_input_1.FilterInput], {
-        description: 'Filters to combine via logical operator. If set `logicalOperator` must be also set.',
-        nullable: true,
+        description: 'Filters to combine via logical operator',
     }),
     __metadata("design:type", Array)
 ], CombinedFilterInput.prototype, "filters", void 0);

package/dist/core/common/inputs/combined-filter.input.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"combined-filter.input.js","sourceRoot":"","sources":["../../../../src/core/common/inputs/combined-filter.input.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAmD;AACnD,0EAAqE;AACrE,iDAA6C;AAK7C,IAAa,mBAAmB,GAAhC,MAAa,~~mBAAmB~~;~~CAkB/B~~,CAAA;~~AAVC~~;~~IAJC~~,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,2CAAmB,EAAE;QACpC,WAAW,EAAE,~~6EAA6E~~;~~QAC1F~~,~~QAAQ,EAAE,IAAI;KACf,~~CAAC;;~~4DACoC~~;~~AAStC~~;~~IAJC~~,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,0BAAW,CAAC,EAAE;QAC9B,WAAW,EAAE,~~qFAAqF~~;~~QAClG~~,~~QAAQ,EAAE,IAAI;KACf,~~CAAC;;~~oDACqB~~;~~AAjBZ~~,mBAAmB;IAH/B,IAAA,mBAAS,EAAC;QACT,WAAW,EAAE,sDAAsD;KACpE,CAAC;GACW,mBAAmB,~~CAkB~~/B;~~AAlBY~~,kDAAmB"}
1	+ {"version":3,"file":"combined-filter.input.js","sourceRoot":"","sources":["../../../../src/core/common/inputs/combined-filter.input.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAmD;AACnD,0EAAqE;AACrE,0DAAsD;AACtD,yDAA+C;AAC/C,iDAA6C;AAK7C,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,4BAAS;IAAlD;;QAOE,oBAAe,GAAwB,SAAS,CAAC;QAQjD,YAAO,GAAkB,SAAS,CAAC;IAsBrC,CAAC;IAbC,GAAG,CACD,IAAyC,EACzC,UAII,EAAE;QAEN,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,0BAAW,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,0BAAW,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAC9E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA9BC;IAHC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,2CAAmB,EAAE;QACpC,WAAW,EAAE,qCAAqC;KACnD,CAAC;;4DAC+C;AAQjD;IAHC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,0BAAW,CAAC,EAAE;QAC9B,WAAW,EAAE,yCAAyC;KACvD,CAAC;;oDACiC;AAfxB,mBAAmB;IAH/B,IAAA,mBAAS,EAAC;QACT,WAAW,EAAE,sDAAsD;KACpE,CAAC;GACW,mBAAmB,CAqC/B;AArCY,kDAAmB"}

package/dist/core/common/inputs/core-input.input.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+import { CoreModel } from '../models/core-model.model';
+export declare abstract class CoreInput extends CoreModel {
+    map(data: Partial<this> | Record<string, any>, options?: {
+        cloneDeep?: boolean;
+        funcAllowed?: boolean;
+        mapId?: boolean;
+    }): this;
+}

package/dist/core/common/inputs/core-input.input.js ADDED Viewed

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CoreInput = void 0;
+const model_helper_1 = require("../helpers/model.helper");
+const core_model_model_1 = require("../models/core-model.model");
+class CoreInput extends core_model_model_1.CoreModel {
+    map(data, options = {}) {
+        const config = Object.assign({ cloneDeep: false, funcAllowed: false, mapId: false }, options);
+        const coreInput = model_helper_1.ModelHelper.map(data, this, config);
+        Object.keys(coreInput).forEach((key) => coreInput[key] === undefined && delete coreInput[key]);
+        return coreInput;
+    }
+}
+exports.CoreInput = CoreInput;
+//# sourceMappingURL=core-input.input.js.map

package/dist/core/common/inputs/core-input.input.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"core-input.input.js","sourceRoot":"","sources":["../../../../src/core/common/inputs/core-input.input.ts"],"names":[],"mappings":";;;AAAA,0DAAsD;AACtD,iEAAuD;AAYvD,MAAsB,SAAU,SAAQ,4BAAS;IAIxC,GAAG,CACR,IAAyC,EACzC,UAII,EAAE;QAEN,MAAM,MAAM,mBACV,SAAS,EAAE,KAAK,EAChB,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,KAAK,IACT,OAAO,CACX,CAAC;QACF,MAAM,SAAS,GAAG,0BAAW,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/F,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAtBD,8BAsBC"}

package/dist/core/common/inputs/filter.input.d.ts CHANGED Viewed

@@ -1,6 +1,12 @@
 import { CombinedFilterInput } from './combined-filter.input';
+import { CoreInput } from './core-input.input';
 import { SingleFilterInput } from './single-filter.input';
-export declare class FilterInput {
+export declare class FilterInput extends CoreInput {
     combinedFilter?: CombinedFilterInput;
     singleFilter?: SingleFilterInput;
+    map(data: Partial<this> | Record<string, any>, options?: {
+        cloneDeep?: boolean;
+        funcAllowed?: boolean;
+        mapId?: boolean;
+    }): this;
 }

package/dist/core/common/inputs/filter.input.js CHANGED Viewed

@@ -12,8 +12,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterInput = void 0;
 const graphql_1 = require("@nestjs/graphql");
 const combined_filter_input_1 = require("./combined-filter.input");
+const core_input_input_1 = require("./core-input.input");
 const single_filter_input_1 = require("./single-filter.input");
-let FilterInput = class FilterInput {
+let FilterInput = class FilterInput extends core_input_input_1.CoreInput {
+    constructor() {
+        super(...arguments);
+        this.combinedFilter = undefined;
+        this.singleFilter = undefined;
+    }
+    map(data, options = {}) {
+        super.map(data, options);
+        this.combinedFilter = data.combinedFilter ? combined_filter_input_1.CombinedFilterInput.map(data.combinedFilter, options) : undefined;
+        this.singleFilter = data.singleFilter ? single_filter_input_1.SingleFilterInput.map(data.singleFilter, options) : undefined;
+        Object.keys(this).forEach((key) => this[key] === undefined && delete this[key]);
+        return this;
+    }
 };
 __decorate([
     (0, graphql_1.Field)((type) => combined_filter_input_1.CombinedFilterInput, {

package/dist/core/common/inputs/filter.input.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"filter.input.js","sourceRoot":"","sources":["../../../../src/core/common/inputs/filter.input.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAmD;~~AACnD~~,mEAA8D;AAC9D,+DAA0D;AAQ1D,IAAa,WAAW,GAAxB,MAAa,~~WAAW~~;~~CAkBvB~~,CAAA;~~AAVC~~;IAJC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,2CAAmB,EAAE;QACpC,WAAW,EAAE,sDAAsD;QACnE,QAAQ,EAAE,IAAI;KACf,CAAC;8BACe,2CAAmB;~~mDAAC~~;~~AASrC~~;IAJC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,uCAAiB,EAAE;QAClC,WAAW,EAAE,8BAA8B;QAC3C,QAAQ,EAAE,IAAI;KACf,CAAC;8BACa,uCAAiB;~~iDAAC~~;~~AAjBtB~~,WAAW;IAHvB,IAAA,mBAAS,EAAC;QACT,WAAW,EAAE,yFAAyF;KACvG,CAAC;GACW,WAAW,~~CAkBvB~~;~~AAlBY~~,kCAAW"}
1	+ {"version":3,"file":"filter.input.js","sourceRoot":"","sources":["../../../../src/core/common/inputs/filter.input.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAmD;AAEnD,mEAA8D;AAC9D,yDAA+C;AAC/C,+DAA0D;AAQ1D,IAAa,WAAW,GAAxB,MAAa,WAAY,SAAQ,4BAAS;IAA1C;;QAQE,mBAAc,GAAyB,SAAS,CAAC;QASjD,iBAAY,GAAuB,SAAS,CAAC;IAuB/C,CAAC;IAdC,GAAG,CACD,IAAyC,EACzC,UAII,EAAE;QAEN,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,2CAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9G,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,uCAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACtG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAhCC;IAJC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,2CAAmB,EAAE;QACpC,WAAW,EAAE,sDAAsD;QACnE,QAAQ,EAAE,IAAI;KACf,CAAC;8BACe,2CAAmB;mDAAa;AASjD;IAJC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,uCAAiB,EAAE;QAClC,WAAW,EAAE,8BAA8B;QAC3C,QAAQ,EAAE,IAAI;KACf,CAAC;8BACa,uCAAiB;iDAAa;AAjBlC,WAAW;IAHvB,IAAA,mBAAS,EAAC;QACT,WAAW,EAAE,yFAAyF;KACvG,CAAC;GACW,WAAW,CAwCvB;AAxCY,kCAAW"}

package/dist/core/common/inputs/single-filter.input.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { ComparisonOperatorEnum } from '../enums/comparison-operator.enum';
-export declare class SingleFilterInput {
+import { CoreInput } from './core-input.input';
+export declare class SingleFilterInput extends CoreInput {
     field: string;
     not?: boolean;
     operator: ComparisonOperatorEnum;