@recursyve/nestjs-data-filter 7.2.0-beta.7 → 8.0.0-beta.28

package/lib/scanners/sequelize-model.scanner.js

@@ -8,6 +8,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SequelizeModelScanner = void 0;
 const common_1 = require("@nestjs/common");
+const nestjs_common_1 = require("@recursyve/nestjs-common");
+const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
 const sequelize_utils_1 = require("../sequelize.utils");
 let SequelizeModelScanner = class SequelizeModelScanner {
@@ -19,6 +21,7 @@ let SequelizeModelScanner = class SequelizeModelScanner {
         }
         const result = [];
         let includes = result;
+        let i = 0;
         for (const obj of objects) {
             const association = this.findAssociation(model, obj);
             includes.push({
@@ -28,7 +31,7 @@ let SequelizeModelScanner = class SequelizeModelScanner {
                 include: [],
                 required: false
             });
-            if (obj !== objects[objects.length - 1]) {
+            if (i++ < objects.length - 1) {
                 model = includes[0].model;
                 includes = includes[0].include;
             }
@@ -40,17 +43,25 @@ let SequelizeModelScanner = class SequelizeModelScanner {
             includes[0].where = sequelize_utils_1.SequelizeUtils.mergeWhere(includes[0].where, path.where);
             includes[0].required = !!path.required;
         }
+        if (path.required) {
+            includes[0].required = true;
+        }
         includes[0].paranoid = !!path.paranoid;
         includes[0].separate = !!path.separate;
         includes[0].order = path.order;
+        if (nestjs_common_1.TypeUtils.isNotNullOrUndefined(path.subQuery)) {
+            includes[0].subQuery = path.subQuery;
+        }
         const addIncludes = [];
         for (const include of additionalIncludes) {
             addIncludes.push(this.getIncludes(includes[0].model, {
                 path: include.path,
+                order: include.order,
                 where: include.where,
                 required: include.required,
                 separate: include.separate,
-                paranoid: include.paranoid
+                paranoid: include.paranoid,
+                subQuery: include.subQuery
             }, [], include.attributes, ignoreAttributes));
         }
         includes[0].include.push(...sequelize_utils_1.SequelizeUtils.reduceIncludes(addIncludes, ignoreAttributes));
@@ -95,20 +106,24 @@ let SequelizeModelScanner = class SequelizeModelScanner {
         if (!orderObj || !orderObj.column || orderObj.direction === "") {
             return;
         }
-        const order = [];
         const values = orderObj.column.split(".");
         const column = values.pop();
         for (const value of values) {
             const association = this.findAssociation(model, value);
             model = association.getAssociatedClass();
-            order.push({
-                model,
-                as: association.getAs()
-            });
         }
-        order.push(column);
-        order.push(orderObj.direction.toUpperCase());
-        return [order];
+        const col = sequelize_utils_1.SequelizeUtils.findColumnFieldName(model, column);
+        let literalOrder = values.length ?
+            sequelize_utils_1.SequelizeUtils.getLiteralFullName(col, values) :
+            `\`${model.name}\`.\`${col}\``;
+        if (orderObj.nullLast && orderObj.direction === "asc") {
+            literalOrder = `-${literalOrder}`;
+            orderObj.direction = "desc";
+        }
+        if (orderObj.direction === "desc") {
+            literalOrder += ` DESC`;
+        }
+        return (0, sequelize_1.literal)(literalOrder);
     }
     getGroup(model, orderObj) {
         if (!orderObj || !orderObj.column || orderObj.direction === "") {
@@ -138,6 +153,7 @@ let SequelizeModelScanner = class SequelizeModelScanner {
         const column = values.pop();
         const result = [];
         let includes = result;
+        let i = 0;
         for (const value of values) {
             const association = this.findAssociation(model, value);
             includes.push({
@@ -150,7 +166,7 @@ let SequelizeModelScanner = class SequelizeModelScanner {
                     attributes: []
                 } : undefined
             });
-            if (value !== values[values.length - 1]) {
+            if (i++ < values.length - 1) {
                 model = includes[0].model;
                 includes = includes[0].include;
             }
@@ -159,7 +175,7 @@ let SequelizeModelScanner = class SequelizeModelScanner {
         return result;
     }
     findAssociation(model, obj) {
-        const associations = sequelize_typescript_1.getAssociations(model.prototype);
+        const associations = (0, sequelize_typescript_1.getAssociations)(model.prototype);
         const association = associations.find(a => a.getAs() === obj);
         if (!association) {
             throw new Error(`Unable to load association for ${obj}`);
@@ -168,8 +184,8 @@ let SequelizeModelScanner = class SequelizeModelScanner {
     }
 };
 SequelizeModelScanner = __decorate([
-    common_1.Injectable()
+    (0, common_1.Injectable)()
 ], SequelizeModelScanner);
 exports.SequelizeModelScanner = SequelizeModelScanner;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/scanners/sequelize-model.scanner.ts"],"names":[],"mappings":"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","file":"lib/scanners/sequelize-model.scanner.js","sourcesContent":["import { Injectable } from \"@nestjs/common\";\nimport { FindAttributeOptions, IncludeOptions, Order } from \"sequelize\";\nimport { Association, BaseAssociation, getAssociations, Model } from \"sequelize-typescript\";\nimport { OrderModel } from \"..\";\nimport { IncludeModel } from \"..\";\nimport { PathModel } from \"../models/path.model\";\nimport { SearchAttributesModel } from \"../models/search-attributes.model\";\nimport { M, SequelizeUtils } from \"../sequelize.utils\";\n\n@Injectable()\nexport class SequelizeModelScanner {\n    public getIncludes(\n        model: typeof Model,\n        path: PathModel,\n        additionalIncludes: IncludeModel[],\n        attributes?: FindAttributeOptions,\n        ignoreAttributes = false\n    ): IncludeOptions[] {\n        const objects = path?.path?.split(\".\");\n        if (!objects?.length) {\n            return [];\n        }\n\n        const result: IncludeOptions[] = [];\n        let includes: IncludeOptions[] = result;\n        for (const obj of objects) {\n            const association = this.findAssociation(model, obj);\n            includes.push({\n                as: association.getAs() as string,\n                model: association.getAssociatedClass(),\n                attributes: ignoreAttributes ? [] : undefined,\n                include: [],\n                required: false\n            });\n\n            if (obj !== objects[objects.length - 1]) {\n                model = includes[0].model as unknown as typeof Model;\n                includes = includes[0].include as IncludeOptions[];\n            }\n        }\n\n        if (attributes) {\n            includes[0].attributes = ignoreAttributes ? [] : SequelizeUtils.mergeAttributes(includes[0], { attributes: attributes });\n        }\n        if (path.where) {\n            includes[0].where = SequelizeUtils.mergeWhere(includes[0].where, path.where);\n            includes[0].required = !!path.required;\n        }\n\n        includes[0].paranoid = !!path.paranoid;\n        includes[0].separate = !!path.separate;\n        includes[0].order = path.order;\n\n        const addIncludes: IncludeOptions[][] = [];\n        for (const include of additionalIncludes) {\n            addIncludes.push(\n                this.getIncludes(\n                    includes[0].model as unknown as typeof Model,\n                    {\n                        path: include.path,\n                        where: include.where,\n                        required: include.required,\n                        separate: include.separate,\n                        paranoid: include.paranoid\n                    },\n                    [],\n                    include.attributes,\n                    ignoreAttributes\n                )\n            );\n        }\n\n        includes[0].include.push(...SequelizeUtils.reduceIncludes(addIncludes, ignoreAttributes));\n\n        return result;\n    }\n\n    public getAttributes(\n        model: typeof Model,\n        path: PathModel,\n        additionalIncludes: IncludeModel[],\n        attributes?: FindAttributeOptions\n    ): SearchAttributesModel[] {\n        const objects = path.path.split(\".\");\n        if (!objects.length) {\n            return [];\n        }\n\n        const result: SearchAttributesModel[] = [];\n        for (const obj of objects) {\n            const association = this.findAssociation(model, obj);\n            model = association.getAssociatedClass() as unknown as typeof Model;\n        }\n        attributes = attributes ?\n            SequelizeUtils.getModelSearchableFieldAttributes(model as typeof M, attributes as string[]) :\n            SequelizeUtils.getModelSearchableAttributes(model as typeof M);\n        result.push(\n            ...(attributes as string[]).map(a => ({\n                name: a,\n                key: SequelizeUtils.getAttributeFullName(a, path.path),\n                literalKey: SequelizeUtils.getLiteralFullName(a, path.path),\n                isJson: SequelizeUtils.isColumnJson(model as typeof M, a)\n            }))\n        );\n\n        for (const include of additionalIncludes) {\n            if (include.ignoreInSearch) {\n                continue;\n            }\n\n            result.push(\n                ...this.getAttributes(\n                    model as typeof Model,\n                    {\n                        path: include.path\n                    },\n                    [],\n                    include.searchableAttributes ?? include.attributes\n                ).map(a => ({\n                    name: a.name,\n                    key: SequelizeUtils.getAttributeFullName(a.name, [path.path, include.path].join(\".\")),\n                    literalKey: SequelizeUtils.getLiteralFullName(a.name, [path.path, include.path].join(\".\")),\n                    isJson: a.isJson\n                }))\n            );\n        }\n\n        return result;\n    }\n\n    public getOrder(model: typeof Model, orderObj: OrderModel): Order {\n        if (!orderObj || !orderObj.column || orderObj.direction === \"\") {\n            return;\n        }\n\n        const order = [];\n        const values = orderObj.column.split(\".\");\n        const column = values.pop();\n        for (const value of values) {\n            const association = this.findAssociation(model, value);\n            model = association.getAssociatedClass() as unknown as typeof Model;\n            order.push({\n                model,\n                as: association.getAs()\n            } as any);\n        }\n        order.push(column);\n        order.push(orderObj.direction.toUpperCase());\n        return [order] as Order;\n    }\n\n    public getGroup(model: typeof Model, orderObj: OrderModel): string[] {\n        if (!orderObj || !orderObj.column || orderObj.direction === \"\") {\n            return;\n        }\n\n        const group: string[] = [];\n        const values = orderObj.column.split(\".\");\n        const column = values.pop();\n        for (const value of values) {\n            const association = this.findAssociation(model, value);\n            model = association.getAssociatedClass() as unknown as typeof Model;\n            group.push(value);\n        }\n        return [\n            SequelizeUtils.getOrderFullName(\"id\", group),\n            SequelizeUtils.getOrderFullName(SequelizeUtils.findColumnFieldName(model as typeof M, column), group)\n        ];\n    }\n\n    public getOrderIncludes(model: typeof Model, orderObj: OrderModel): IncludeOptions[] {\n        if (!orderObj || !orderObj.column || orderObj.direction === \"\") {\n            return [];\n        }\n\n        const values = orderObj.column.split(\".\");\n        if (values.length <= 1) {\n            return [];\n        }\n\n        const column = values.pop();\n        const result: IncludeOptions[] = [];\n        let includes: IncludeOptions[] = result;\n        for (const value of values) {\n            const association = this.findAssociation(model, value);\n            includes.push({\n                as: association.getAs() as string,\n                model: association.getAssociatedClass(),\n                attributes: [],\n                include: [],\n                required: false,\n                through: association.getAssociation() === Association.BelongsToMany ? {\n                    attributes: []\n                } : undefined\n            });\n\n            if (value !== values[values.length - 1]) {\n                model = includes[0].model as unknown as typeof Model;\n                includes = includes[0].include as IncludeOptions[];\n            }\n        }\n\n        includes[0].attributes = [column];\n        return result;\n    }\n\n    private findAssociation(model: typeof Model, obj: string): BaseAssociation<any, any> {\n        const associations = getAssociations(model.prototype);\n\n        const association = associations.find(a => a.getAs() === obj);\n        if (!association) {\n            throw new Error(`Unable to load association for ${obj}`);\n        }\n        return association;\n    }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/scanners/sequelize-model.scanner.ts"],"names":[],"mappings":"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","file":"lib/scanners/sequelize-model.scanner.js","sourcesContent":["import { Injectable } from \"@nestjs/common\";\nimport { TypeUtils } from \"@recursyve/nestjs-common\";\nimport { FindAttributeOptions, IncludeOptions, literal, Order } from \"sequelize\";\nimport { Association, BaseAssociation, getAssociations, Model } from \"sequelize-typescript\";\nimport { OrderModel } from \"..\";\nimport { IncludeModel } from \"..\";\nimport { PathModel } from \"../models/path.model\";\nimport { SearchAttributesModel } from \"../models/search-attributes.model\";\nimport { M, SequelizeUtils } from \"../sequelize.utils\";\n\n@Injectable()\nexport class SequelizeModelScanner {\n    public getIncludes(\n        model: typeof Model,\n        path: PathModel,\n        additionalIncludes: IncludeModel[],\n        attributes?: FindAttributeOptions,\n        ignoreAttributes = false\n    ): IncludeOptions[] {\n        const objects = path?.path?.split(\".\");\n        if (!objects?.length) {\n            return [];\n        }\n\n        const result: IncludeOptions[] = [];\n        let includes: IncludeOptions[] = result;\n        let i = 0;\n        for (const obj of objects) {\n            const association = this.findAssociation(model, obj);\n            includes.push({\n                as: association.getAs() as string,\n                model: association.getAssociatedClass(),\n                attributes: ignoreAttributes ? [] : undefined,\n                include: [],\n                required: false\n            });\n\n            if (i++ < objects.length - 1) {\n                model = includes[0].model as unknown as typeof Model;\n                includes = includes[0].include as IncludeOptions[];\n            }\n        }\n\n        if (attributes) {\n            includes[0].attributes = ignoreAttributes ? [] : SequelizeUtils.mergeAttributes(includes[0], { attributes: attributes });\n        }\n        if (path.where) {\n            includes[0].where = SequelizeUtils.mergeWhere(includes[0].where, path.where);\n            includes[0].required = !!path.required;\n        }\n        if (path.required) {\n            includes[0].required = true;\n        }\n\n        includes[0].paranoid = !!path.paranoid;\n        includes[0].separate = !!path.separate;\n        includes[0].order = path.order;\n\n        if (TypeUtils.isNotNullOrUndefined(path.subQuery)) {\n            includes[0].subQuery = path.subQuery;\n        }\n\n        const addIncludes: IncludeOptions[][] = [];\n        for (const include of additionalIncludes) {\n            addIncludes.push(\n                this.getIncludes(\n                    includes[0].model as unknown as typeof Model,\n                    {\n                        path: include.path,\n                        order: include.order,\n                        where: include.where,\n                        required: include.required,\n                        separate: include.separate,\n                        paranoid: include.paranoid,\n                        subQuery: include.subQuery\n                    },\n                    [],\n                    include.attributes,\n                    ignoreAttributes\n                )\n            );\n        }\n\n        includes[0].include.push(...SequelizeUtils.reduceIncludes(addIncludes, ignoreAttributes));\n\n        return result;\n    }\n\n    public getAttributes(\n        model: typeof Model,\n        path: PathModel,\n        additionalIncludes: IncludeModel[],\n        attributes?: FindAttributeOptions\n    ): SearchAttributesModel[] {\n        const objects = path.path.split(\".\");\n        if (!objects.length) {\n            return [];\n        }\n\n        const result: SearchAttributesModel[] = [];\n        for (const obj of objects) {\n            const association = this.findAssociation(model, obj);\n            model = association.getAssociatedClass() as unknown as typeof Model;\n        }\n        attributes = attributes ?\n            SequelizeUtils.getModelSearchableFieldAttributes(model as typeof M, attributes as string[]) :\n            SequelizeUtils.getModelSearchableAttributes(model as typeof M);\n        result.push(\n            ...(attributes as string[]).map(a => ({\n                name: a,\n                key: SequelizeUtils.getAttributeFullName(a, path.path),\n                literalKey: SequelizeUtils.getLiteralFullName(a, path.path),\n                isJson: SequelizeUtils.isColumnJson(model as typeof M, a)\n            }))\n        );\n\n        for (const include of additionalIncludes) {\n            if (include.ignoreInSearch) {\n                continue;\n            }\n\n            result.push(\n                ...this.getAttributes(\n                    model as typeof Model,\n                    {\n                        path: include.path\n                    },\n                    [],\n                    include.searchableAttributes ?? include.attributes\n                ).map(a => ({\n                    name: a.name,\n                    key: SequelizeUtils.getAttributeFullName(a.name, [path.path, include.path].join(\".\")),\n                    literalKey: SequelizeUtils.getLiteralFullName(a.name, [path.path, include.path].join(\".\")),\n                    isJson: a.isJson\n                }))\n            );\n        }\n\n        return result;\n    }\n\n    public getOrder(model: typeof Model, orderObj: OrderModel): Order {\n        if (!orderObj || !orderObj.column || orderObj.direction === \"\") {\n            return;\n        }\n\n        const values = orderObj.column.split(\".\");\n        const column = values.pop();\n        for (const value of values) {\n            const association = this.findAssociation(model, value);\n            model = association.getAssociatedClass() as unknown as typeof Model;\n        }\n        const col = SequelizeUtils.findColumnFieldName(model as typeof M, column);\n        let literalOrder = values.length ?\n            SequelizeUtils.getLiteralFullName(col, values) :\n            `\\`${model.name}\\`.\\`${col}\\``;\n        if (orderObj.nullLast && orderObj.direction === \"asc\") {\n            literalOrder = `-${literalOrder}`;\n            orderObj.direction = \"desc\";\n        }\n        if (orderObj.direction === \"desc\") {\n            literalOrder += ` DESC`;\n        }\n        return literal(literalOrder) as Order;\n    }\n\n    public getGroup(model: typeof Model, orderObj: OrderModel): string[] {\n        if (!orderObj || !orderObj.column || orderObj.direction === \"\") {\n            return;\n        }\n\n        const group: string[] = [];\n        const values = orderObj.column.split(\".\");\n        const column = values.pop();\n        for (const value of values) {\n            const association = this.findAssociation(model, value);\n            model = association.getAssociatedClass() as unknown as typeof Model;\n            group.push(value);\n        }\n        return [\n            SequelizeUtils.getOrderFullName(\"id\", group),\n            SequelizeUtils.getOrderFullName(SequelizeUtils.findColumnFieldName(model as typeof M, column), group)\n        ];\n    }\n\n    public getOrderIncludes(model: typeof Model, orderObj: OrderModel): IncludeOptions[] {\n        if (!orderObj || !orderObj.column || orderObj.direction === \"\") {\n            return [];\n        }\n\n        const values = orderObj.column.split(\".\");\n        if (values.length <= 1) {\n            return [];\n        }\n\n        const column = values.pop();\n        const result: IncludeOptions[] = [];\n        let includes: IncludeOptions[] = result;\n        let i = 0;\n        for (const value of values) {\n            const association = this.findAssociation(model, value);\n            includes.push({\n                as: association.getAs() as string,\n                model: association.getAssociatedClass(),\n                attributes: [],\n                include: [],\n                required: false,\n                through: association.getAssociation() === Association.BelongsToMany ? {\n                    attributes: []\n                } : undefined\n            });\n\n            if (i++ < values.length - 1) {\n                model = includes[0].model as unknown as typeof Model;\n                includes = includes[0].include as IncludeOptions[];\n            }\n        }\n\n        includes[0].attributes = [column];\n        return result;\n    }\n\n    private findAssociation(model: typeof Model, obj: string): BaseAssociation<any, any> {\n        const associations = getAssociations(model.prototype);\n\n        const association = associations.find(a => a.getAs() === obj);\n        if (!association) {\n            throw new Error(`Unable to load association for ${obj}`);\n        }\n        return association;\n    }\n}\n"]}

package/lib/sequelize.utils.d.ts

@@ -1,5 +1,5 @@
 import { Model } from "sequelize-typescript";
-import { FindAttributeOptions, Includeable, IncludeOptions, WhereOptions, WhereValue } from "sequelize";
+import { FindAttributeOptions, Includeable, IncludeOptions, Order, WhereOptions, WhereValue } from "sequelize";
 import { RuleModel } from "./filter";
 export interface GeoPoint {
     type: "point";
@@ -12,6 +12,7 @@ export declare class SequelizeUtils {
     static mergeIncludes(a?: IncludeOptions[], b?: IncludeOptions[], ignoreAttributes?: boolean): IncludeOptions[];
     static mergeAttributes(a: IncludeOptions, b: IncludeOptions): FindAttributeOptions;
     static mergeWhere(a: WhereOptions, b: WhereOptions): WhereOptions;
+    static mergeOrder(a: Order, b: Order): Order;
     static generateWhereValue(rule: RuleModel): WhereValue;
     static getAttributeFullName(attribute: string, path: string): string;
     static getLiteralFullName(attribute: string, path: string | string[]): string;

package/lib/sequelize.utils.js

@@ -16,7 +16,7 @@ class SequelizeUtils {
         return include;
     }
     static mergeIncludes(a = [], b = [], ignoreAttributes = false) {
-        var _a, _b;
+        var _a, _b, _c;
         for (const bChild of b) {
             const aChild = a.find(value => value.model === bChild.model && value.as === bChild.as);
             if (aChild) {
@@ -28,6 +28,20 @@ class SequelizeUtils {
                 if (where) {
                     aChild.where = where;
                 }
+                const order = this.mergeOrder(aChild.order, bChild.order);
+                if (order) {
+                    aChild.order = order;
+                }
+                if (aChild.required || bChild.required) {
+                    aChild.required = true;
+                }
+                if (aChild.separate || bChild.separate) {
+                    aChild.separate = true;
+                }
+                aChild.paranoid = !(aChild.paranoid === false || bChild.paranoid === false);
+                if (nestjs_common_1.TypeUtils.isNotNullOrUndefined(aChild.subQuery) || nestjs_common_1.TypeUtils.isNotNullOrUndefined(bChild.subQuery)) {
+                    aChild.subQuery = (_c = aChild.subQuery) !== null && _c !== void 0 ? _c : bChild.subQuery;
+                }
             }
             else {
                 a.push(bChild);
@@ -81,6 +95,31 @@ class SequelizeUtils {
         }
         return Object.assign(a !== null && a !== void 0 ? a : {}, b !== null && b !== void 0 ? b : {});
     }
+    static mergeOrder(a, b) {
+        if (!a && !b) {
+            return null;
+        }
+        if (a && !b) {
+            return a;
+        }
+        if (!a && b) {
+            return b;
+        }
+        const res = [];
+        if (a instanceof Array) {
+            res.push(...a);
+        }
+        else {
+            res.push(a);
+        }
+        if (b instanceof Array) {
+            res.push(...b);
+        }
+        else {
+            res.push(b);
+        }
+        return res;
+    }
     static generateWhereValue(rule) {
         switch (rule.operation) {
             case "equal":
@@ -120,7 +159,7 @@ class SequelizeUtils {
             case "not_ends_with":
                 return { [sequelize_1.Op.notLike]: `%${rule.value}` };
             case "is_empty":
-                return { [sequelize_1.Op.eq]: "" };
+                return "";
             case "is_not_empty":
                 return { [sequelize_1.Op.ne]: "" };
         }
@@ -214,4 +253,4 @@ class SequelizeUtils {
 }
 exports.SequelizeUtils = SequelizeUtils;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/sequelize.utils.ts"],"names":[],"mappings":"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","file":"lib/sequelize.utils.js","sourcesContent":["import { Model } from \"sequelize-typescript\";\nimport {\n    AbstractDataTypeConstructor,\n    FindAttributeOptions,\n    Includeable,\n    IncludeOptions, literal,\n    Op, Utils,\n    WhereOptions,\n    WhereValue\n} from \"sequelize\";\nimport { RuleModel } from \"./filter\";\nimport { ArrayUtils } from \"@recursyve/nestjs-common\";\n\nexport interface GeoPoint {\n    type: \"point\",\n    coordinates: number[];\n}\n\nexport class M extends Model {}\n\nexport class SequelizeUtils {\n    public static reduceIncludes(includes: IncludeOptions[][], ignoreAttributes = false): Includeable[] {\n        let include: IncludeOptions[] = [];\n        for (const i of includes) {\n            include = this.mergeIncludes(include, i, ignoreAttributes);\n        }\n\n        return include;\n    }\n\n    public static mergeIncludes(a: IncludeOptions[] = [], b: IncludeOptions[] = [], ignoreAttributes = false) {\n        for (const bChild of b) {\n            const aChild = a.find(value => value.model === bChild.model && value.as === bChild.as);\n            if (aChild) {\n                aChild.include = this.mergeIncludes(\n                    (aChild.include as IncludeOptions[]) ?? [],\n                    (bChild.include as IncludeOptions[]) ?? [],\n                    ignoreAttributes\n                );\n                if ((aChild.attributes || bChild.attributes) && !ignoreAttributes) {\n                    aChild.attributes = this.mergeAttributes(aChild, bChild);\n                }\n                const where = this.mergeWhere(aChild.where, bChild.where);\n                if (where) {\n                    aChild.where = where;\n                }\n            } else {\n                a.push(bChild);\n            }\n        }\n\n        return a;\n    }\n\n    public static mergeAttributes(a: IncludeOptions, b: IncludeOptions): FindAttributeOptions {\n        if (a.attributes instanceof Array && b.attributes instanceof Array) {\n            return ArrayUtils.uniqueValues([...a.attributes, ...b.attributes, \"id\"], x => x);\n        } else if (a.attributes instanceof Array) {\n            return ArrayUtils.uniqueValues([...a.attributes, \"id\"], x => x);\n        } else if (b.attributes instanceof Array) {\n            return ArrayUtils.uniqueValues([...b.attributes, \"id\"], x => x);\n        } else if (a.attributes || b.attributes) {\n            const aAttributes = (a.attributes ?? {}) as { include: string[]; exclude: string[] };\n            const bAttributes = (b.attributes ?? {}) as { include: string[]; exclude: string[] };\n            const result: { include?: string[]; exclude?: string[] } = {};\n\n            if (aAttributes.include?.length) {\n                result.include = [...aAttributes.include];\n            }\n            if (bAttributes.include?.length) {\n                result.include = [...(result.include ?? []), ...bAttributes.include];\n            }\n\n            if (aAttributes.exclude?.length) {\n                result.exclude = [...aAttributes.exclude];\n            }\n            if (bAttributes.exclude?.length) {\n                result.exclude = [...(result.exclude ?? []), ...bAttributes.exclude];\n            }\n\n            if (result.include) {\n                result.include = ArrayUtils.uniqueValues(result.include, x => x);\n            }\n            if (result.exclude) {\n                result.exclude = ArrayUtils.uniqueValues(result.exclude, x => x);\n            }\n\n            if (!result.include && !result.exclude) {\n                return undefined;\n            }\n\n            return result as FindAttributeOptions;\n        }\n        return undefined;\n    }\n\n    public static mergeWhere(a: WhereOptions, b: WhereOptions): WhereOptions {\n        if (!a && !b) {\n            return null;\n        }\n        return Object.assign(a ?? {}, b ?? {});\n    }\n\n    public static generateWhereValue(rule: RuleModel): WhereValue {\n        switch (rule.operation) {\n            case \"equal\":\n                return rule.value as any;\n\n            case \"not_equal\":\n                return { [Op.ne]: rule.value };\n\n            case \"in\":\n                return { [Op.in]: rule.value as any[] };\n\n            case \"not_in\":\n                return { [Op.notIn]: rule.value as any[] };\n\n            case \"less\":\n                return { [Op.lt]: rule.value as any};\n\n            case \"less_or_equal\":\n                return { [Op.lte]: rule.value as any};\n\n            case \"greater\":\n                return { [Op.gt]: rule.value as any};\n\n            case \"greater_or_equal\":\n                return { [Op.gte]: rule.value as any};\n\n            case \"between\":\n                return { [Op.between]: rule.value as any };\n\n            case \"not_between\":\n                return { [Op.notBetween]: rule.value as any };\n\n            case \"is_null\":\n                return { [Op.eq]: null };\n\n            case \"is_not_null\":\n                return { [Op.ne]: null };\n\n            case \"begins_with\":\n                return { [Op.like]: `${rule.value}%` };\n\n            case \"not_begins_with\":\n                return { [Op.notLike]: `${rule.value}%` };\n\n            case \"contains\":\n                return { [Op.like]: `%${rule.value}%` };\n\n            case \"not_contains\":\n                return { [Op.notLike]: `%${rule.value}%` };\n\n            case \"ends_with\":\n                return { [Op.like]: `%${rule.value}` };\n\n            case \"not_ends_with\":\n                return { [Op.notLike]: `%${rule.value}` };\n\n            case \"is_empty\":\n                return { [Op.eq]: \"\" };\n\n            case \"is_not_empty\":\n                return { [Op.ne]: \"\" };\n        }\n    }\n\n    public static getAttributeFullName(attribute: string, path: string) {\n        return `$${path}.${attribute}$`;\n    }\n\n    public static getLiteralFullName(attribute: string, path: string | string[]) {\n        if (typeof path === \"string\") {\n            path = path.split(\".\");\n        }\n        return `\\`${path.join(\"->\")}\\`.\\`${attribute}\\``;\n    }\n\n    public static getOrderFullName(attribute: string, path: string[]) {\n        return `${path.join(\"->\")}.${attribute}`;\n    }\n\n    public static getModelSearchableAttributes(model: typeof M): string[] {\n        return Object.keys(model.rawAttributes).filter(\n            a => ![\"DATE\", \"DATEONLY\", \"VIRTUAL\"].some(t => t === (model.rawAttributes[a].type as AbstractDataTypeConstructor).key)\n        ).map(x => {\n            const attr = model.rawAttributes[x];\n            if (!attr) {\n                return x;\n            }\n            return attr.field ? attr.field : x;\n        });\n    }\n\n    public static getModelSearchableFieldAttributes(model: typeof M, fields: string[]): string[] {\n        const attributes = model.rawAttributes;\n        return fields\n            .filter(x => {\n                const attr = attributes[x];\n                if (!attr) {\n                    return false;\n                }\n\n                return ![\"DATE\", \"DATEONLY\", \"VIRTUAL\"].some(t => t === (attr.type as AbstractDataTypeConstructor).key);\n            }).\n            map(x => {\n                const attr = attributes[x];\n                if (!attr) {\n                    return x;\n                }\n\n                return attr.field ? attr.field : x;\n            })\n    }\n\n    public static reduceModelFromPath(model: M, path: string) {\n        const steps = path.split(\".\");\n\n        let step = steps.shift();\n        while (step) {\n            if (model[step] instanceof Array) {\n                if (!steps.length) {\n                    return model[step];\n                }\n\n                return (model[step] as Array<any>)\n                    .map(x => this.reduceModelFromPath(x, steps.join(\".\")))\n                    .reduce((all, current) => {\n                        if (current instanceof Array) {\n                            return [...all, ...current];\n                        }\n                        return [...all, current];\n                    }, []);\n            }\n\n            model = model[step];\n            if (!model) {\n                return undefined;\n            }\n\n            step = steps.shift();\n        }\n\n        return model;\n    }\n\n    public static findColumnFieldName(model: typeof M, name: string): string {\n        const field = Object.keys(model.rawAttributes).find((key) => {\n            if (key === name) {\n                return true;\n            }\n\n            return model.rawAttributes[key].field === name;\n        });\n        return model.rawAttributes[field].field ?? name;\n    }\n\n    public static isColumnJson(model: typeof M, name: string): boolean {\n        return (model.rawAttributes[name]?.type as AbstractDataTypeConstructor)?.key === \"JSON\";\n    }\n\n    public static getGroupLiteral(model: typeof M, group: string): string {\n        const items = group.split(\".\");\n        if (items.length > 1) {\n            const column = items[items.length - 1];\n            return SequelizeUtils.getLiteralFullName(column, items.slice(0, items.length - 1));\n        }\n\n        return `\\`${model.name}\\`.\\`${group}\\``;\n    }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/sequelize.utils.ts"],"names":[],"mappings":"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","file":"lib/sequelize.utils.js","sourcesContent":["import { Model } from \"sequelize-typescript\";\nimport {\n    AbstractDataTypeConstructor,\n    FindAttributeOptions,\n    Includeable,\n    IncludeOptions, literal,\n    Op, Order, OrderItem, Utils,\n    WhereOptions,\n    WhereValue\n} from \"sequelize\";\nimport { RuleModel } from \"./filter\";\nimport { ArrayUtils, TypeUtils } from \"@recursyve/nestjs-common\";\n\nexport interface GeoPoint {\n    type: \"point\",\n    coordinates: number[];\n}\n\nexport class M extends Model {}\n\nexport class SequelizeUtils {\n    public static reduceIncludes(includes: IncludeOptions[][], ignoreAttributes = false): Includeable[] {\n        let include: IncludeOptions[] = [];\n        for (const i of includes) {\n            include = this.mergeIncludes(include, i, ignoreAttributes);\n        }\n\n        return include;\n    }\n\n    public static mergeIncludes(a: IncludeOptions[] = [], b: IncludeOptions[] = [], ignoreAttributes = false) {\n        for (const bChild of b) {\n            const aChild = a.find(value => value.model === bChild.model && value.as === bChild.as);\n            if (aChild) {\n                aChild.include = this.mergeIncludes(\n                    (aChild.include as IncludeOptions[]) ?? [],\n                    (bChild.include as IncludeOptions[]) ?? [],\n                    ignoreAttributes\n                );\n                if ((aChild.attributes || bChild.attributes) && !ignoreAttributes) {\n                    aChild.attributes = this.mergeAttributes(aChild, bChild);\n                }\n                const where = this.mergeWhere(aChild.where, bChild.where);\n                if (where) {\n                    aChild.where = where;\n                }\n                const order = this.mergeOrder(aChild.order, bChild.order);\n                if (order) {\n                    aChild.order = order;\n                }\n                if (aChild.required || bChild.required) {\n                    aChild.required = true;\n                }\n                if (aChild.separate || bChild.separate) {\n                    aChild.separate = true;\n                }\n                aChild.paranoid = !(aChild.paranoid === false || bChild.paranoid === false);\n                if (TypeUtils.isNotNullOrUndefined(aChild.subQuery) || TypeUtils.isNotNullOrUndefined(bChild.subQuery)) {\n                    aChild.subQuery = aChild.subQuery ?? bChild.subQuery;\n                }\n            } else {\n                a.push(bChild);\n            }\n        }\n\n        return a;\n    }\n\n    public static mergeAttributes(a: IncludeOptions, b: IncludeOptions): FindAttributeOptions {\n        if (a.attributes instanceof Array && b.attributes instanceof Array) {\n            return ArrayUtils.uniqueValues([...a.attributes, ...b.attributes, \"id\"], x => x);\n        } else if (a.attributes instanceof Array) {\n            return ArrayUtils.uniqueValues([...a.attributes, \"id\"], x => x);\n        } else if (b.attributes instanceof Array) {\n            return ArrayUtils.uniqueValues([...b.attributes, \"id\"], x => x);\n        } else if (a.attributes || b.attributes) {\n            const aAttributes = (a.attributes ?? {}) as { include: string[]; exclude: string[] };\n            const bAttributes = (b.attributes ?? {}) as { include: string[]; exclude: string[] };\n            const result: { include?: string[]; exclude?: string[] } = {};\n\n            if (aAttributes.include?.length) {\n                result.include = [...aAttributes.include];\n            }\n            if (bAttributes.include?.length) {\n                result.include = [...(result.include ?? []), ...bAttributes.include];\n            }\n\n            if (aAttributes.exclude?.length) {\n                result.exclude = [...aAttributes.exclude];\n            }\n            if (bAttributes.exclude?.length) {\n                result.exclude = [...(result.exclude ?? []), ...bAttributes.exclude];\n            }\n\n            if (result.include) {\n                result.include = ArrayUtils.uniqueValues(result.include, x => x);\n            }\n            if (result.exclude) {\n                result.exclude = ArrayUtils.uniqueValues(result.exclude, x => x);\n            }\n\n            if (!result.include && !result.exclude) {\n                return undefined;\n            }\n\n            return result as FindAttributeOptions;\n        }\n        return undefined;\n    }\n\n    public static mergeWhere(a: WhereOptions, b: WhereOptions): WhereOptions {\n        if (!a && !b) {\n            return null;\n        }\n        return Object.assign(a ?? {}, b ?? {});\n    }\n\n    public static mergeOrder(a: Order, b: Order): Order {\n        if (!a && !b) {\n            return null;\n        }\n        if (a && !b) {\n            return a;\n        }\n        if (!a && b) {\n            return b;\n        }\n\n        const res: OrderItem[] = [];\n        if (a instanceof Array) {\n            res.push(...a);\n        } else {\n            res.push(a);\n        }\n        if (b instanceof Array) {\n            res.push(...b);\n        } else {\n            res.push(b);\n        }\n        return res;\n    }\n\n    public static generateWhereValue(rule: RuleModel): WhereValue {\n        switch (rule.operation) {\n            case \"equal\":\n                return rule.value as any;\n\n            case \"not_equal\":\n                return { [Op.ne]: rule.value };\n\n            case \"in\":\n                return { [Op.in]: rule.value as any[] };\n\n            case \"not_in\":\n                return { [Op.notIn]: rule.value as any[] };\n\n            case \"less\":\n                return { [Op.lt]: rule.value as any};\n\n            case \"less_or_equal\":\n                return { [Op.lte]: rule.value as any};\n\n            case \"greater\":\n                return { [Op.gt]: rule.value as any};\n\n            case \"greater_or_equal\":\n                return { [Op.gte]: rule.value as any};\n\n            case \"between\":\n                return { [Op.between]: rule.value as any };\n\n            case \"not_between\":\n                return { [Op.notBetween]: rule.value as any };\n\n            case \"is_null\":\n                return { [Op.eq]: null };\n\n            case \"is_not_null\":\n                return { [Op.ne]: null };\n\n            case \"begins_with\":\n                return { [Op.like]: `${rule.value}%` };\n\n            case \"not_begins_with\":\n                return { [Op.notLike]: `${rule.value}%` };\n\n            case \"contains\":\n                return { [Op.like]: `%${rule.value}%` };\n\n            case \"not_contains\":\n                return { [Op.notLike]: `%${rule.value}%` };\n\n            case \"ends_with\":\n                return { [Op.like]: `%${rule.value}` };\n\n            case \"not_ends_with\":\n                return { [Op.notLike]: `%${rule.value}` };\n\n            case \"is_empty\":\n                return \"\";\n\n            case \"is_not_empty\":\n                return { [Op.ne]: \"\" };\n        }\n    }\n\n    public static getAttributeFullName(attribute: string, path: string) {\n        return `$${path}.${attribute}$`;\n    }\n\n    public static getLiteralFullName(attribute: string, path: string | string[]) {\n        if (typeof path === \"string\") {\n            path = path.split(\".\");\n        }\n        return `\\`${path.join(\"->\")}\\`.\\`${attribute}\\``;\n    }\n\n    public static getOrderFullName(attribute: string, path: string[]) {\n        return `${path.join(\"->\")}.${attribute}`;\n    }\n\n    public static getModelSearchableAttributes(model: typeof M): string[] {\n        return Object.keys(model.rawAttributes).filter(\n            a => ![\"DATE\", \"DATEONLY\", \"VIRTUAL\"].some(t => t === (model.rawAttributes[a].type as AbstractDataTypeConstructor).key)\n        ).map(x => {\n            const attr = model.rawAttributes[x];\n            if (!attr) {\n                return x;\n            }\n            return attr.field ? attr.field : x;\n        });\n    }\n\n    public static getModelSearchableFieldAttributes(model: typeof M, fields: string[]): string[] {\n        const attributes = model.rawAttributes;\n        return fields\n            .filter(x => {\n                const attr = attributes[x];\n                if (!attr) {\n                    return false;\n                }\n\n                return ![\"DATE\", \"DATEONLY\", \"VIRTUAL\"].some(t => t === (attr.type as AbstractDataTypeConstructor).key);\n            }).\n            map(x => {\n                const attr = attributes[x];\n                if (!attr) {\n                    return x;\n                }\n\n                return attr.field ? attr.field : x;\n            })\n    }\n\n    public static reduceModelFromPath(model: M, path: string) {\n        const steps = path.split(\".\");\n\n        let step = steps.shift();\n        while (step) {\n            if (model[step] instanceof Array) {\n                if (!steps.length) {\n                    return model[step];\n                }\n\n                return (model[step] as Array<any>)\n                    .map(x => this.reduceModelFromPath(x, steps.join(\".\")))\n                    .reduce((all, current) => {\n                        if (current instanceof Array) {\n                            return [...all, ...current];\n                        }\n                        return [...all, current];\n                    }, []);\n            }\n\n            model = model[step];\n            if (!model) {\n                return undefined;\n            }\n\n            step = steps.shift();\n        }\n\n        return model;\n    }\n\n    public static findColumnFieldName(model: typeof M, name: string): string {\n        const field = Object.keys(model.rawAttributes).find((key) => {\n            if (key === name) {\n                return true;\n            }\n\n            return model.rawAttributes[key].field === name;\n        });\n        return model.rawAttributes[field].field ?? name;\n    }\n\n    public static isColumnJson(model: typeof M, name: string): boolean {\n        return (model.rawAttributes[name]?.type as AbstractDataTypeConstructor)?.key === \"JSON\";\n    }\n\n    public static getGroupLiteral(model: typeof M, group: string): string {\n        const items = group.split(\".\");\n        if (items.length > 1) {\n            const column = items[items.length - 1];\n            return SequelizeUtils.getLiteralFullName(column, items.slice(0, items.length - 1));\n        }\n\n        return `\\`${model.name}\\`.\\`${group}\\``;\n    }\n}\n"]}

package/lib/utils/csv.utils.js

@@ -17,10 +17,10 @@ class CsvUtils {
         if (header) {
             aoa.unshift(header);
         }
-        const csvAsPromise = util_1.promisify(csv);
+        const csvAsPromise = (0, util_1.promisify)(csv);
         return Buffer.from(await csvAsPromise(aoa));
     }
 }
 exports.CsvUtils = CsvUtils;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi91dGlscy9jc3YudXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNERBQXVEO0FBQ3ZELHFDQUFxQztBQUNyQywrQkFBaUM7QUFFakMsTUFBYSxRQUFRO0lBQ1YsTUFBTSxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFjLEVBQUUsTUFBaUI7UUFDbEUsNkJBQTZCO1FBQzdCLElBQUksR0FBRyxHQUFZLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFXLEVBQUUsRUFBRTtZQUN4Qyw0QkFBNEI7WUFDNUIsMkJBQVcsQ0FBQyxlQUFlLENBQUMsR0FBRyxFQUFFLENBQUMsS0FBVSxFQUFFLEVBQUU7Z0JBQzVDLE9BQU8sS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztZQUNqQyxDQUFDLENBQUMsQ0FBQztZQUVILE9BQU8sMkJBQVcsQ0FBQyx5QkFBeUIsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN0RCxDQUFDLENBQUMsQ0FBQztRQUVILElBQUksTUFBTSxFQUFFO1lBQ1IsR0FBRyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztTQUN2QjtRQUVELE1BQU0sWUFBWSxHQUFHLGdCQUFTLENBQWtCLEdBQUcsQ0FBQyxDQUFDO1FBQ3JELE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0lBQ2hELENBQUM7Q0FDSjtBQW5CRCw0QkFtQkMiLCJmaWxlIjoibGliL3V0aWxzL2Nzdi51dGlscy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE9iamVjdFV0aWxzIH0gZnJvbSBcIkByZWN1cnN5dmUvbmVzdGpzLWNvbW1vblwiO1xuaW1wb3J0ICogYXMgY3N2IGZyb20gXCJjc3Ytc3RyaW5naWZ5XCI7XG5pbXBvcnQgeyBwcm9taXNpZnkgfSBmcm9tIFwidXRpbFwiO1xuXG5leHBvcnQgY2xhc3MgQ3N2VXRpbHMge1xuICAgIHB1YmxpYyBzdGF0aWMgYXN5bmMgYXJyYXlUb0NzdkJ1ZmZlcihyb3dzOiBPYmplY3RbXSwgaGVhZGVyPzogc3RyaW5nW10pOiBQcm9taXNlPEJ1ZmZlcj4ge1xuICAgICAgICAvLyBDb252ZXJ0IHRvIGFycmF5IG9mIGFycmF5LlxuICAgICAgICBsZXQgYW9hOiBhbnlbXVtdID0gcm93cy5tYXAoKHJvdzogT2JqZWN0KSA9PiB7XG4gICAgICAgICAgICAvLyBSZXBsYWNlIHVuZGVmaW5lZCB2YWx1ZXMuXG4gICAgICAgICAgICBPYmplY3RVdGlscy5mb3JFYWNoUHJvcGVydHkocm93LCAodmFsdWU6IGFueSkgPT4ge1xuICAgICAgICAgICAgICAgIHJldHVybiB2YWx1ZSA/IHZhbHVlIDogXCJOL0FcIjtcbiAgICAgICAgICAgIH0pO1xuXG4gICAgICAgICAgICByZXR1cm4gT2JqZWN0VXRpbHMub2JqZWN0VG9BcnJheU9mUHJvcGVydGllcyhyb3cpO1xuICAgICAgICB9KTtcblxuICAgICAgICBpZiAoaGVhZGVyKSB7XG4gICAgICAgICAgICBhb2EudW5zaGlmdChoZWFkZXIpO1xuICAgICAgICB9XG5cbiAgICAgICAgY29uc3QgY3N2QXNQcm9taXNlID0gcHJvbWlzaWZ5PGFueVtdW10sIHN0cmluZz4oY3N2KTtcbiAgICAgICAgcmV0dXJuIEJ1ZmZlci5mcm9tKGF3YWl0IGNzdkFzUHJvbWlzZShhb2EpKTtcbiAgICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi91dGlscy9jc3YudXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNERBQXVEO0FBQ3ZELHFDQUFxQztBQUNyQywrQkFBaUM7QUFFakMsTUFBYSxRQUFRO0lBQ1YsTUFBTSxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFjLEVBQUUsTUFBaUI7UUFDbEUsNkJBQTZCO1FBQzdCLElBQUksR0FBRyxHQUFZLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFXLEVBQUUsRUFBRTtZQUN4Qyw0QkFBNEI7WUFDNUIsMkJBQVcsQ0FBQyxlQUFlLENBQUMsR0FBRyxFQUFFLENBQUMsS0FBVSxFQUFFLEVBQUU7Z0JBQzVDLE9BQU8sS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztZQUNqQyxDQUFDLENBQUMsQ0FBQztZQUVILE9BQU8sMkJBQVcsQ0FBQyx5QkFBeUIsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN0RCxDQUFDLENBQUMsQ0FBQztRQUVILElBQUksTUFBTSxFQUFFO1lBQ1IsR0FBRyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztTQUN2QjtRQUVELE1BQU0sWUFBWSxHQUFHLElBQUEsZ0JBQVMsRUFBa0IsR0FBRyxDQUFDLENBQUM7UUFDckQsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDaEQsQ0FBQztDQUNKO0FBbkJELDRCQW1CQyIsImZpbGUiOiJsaWIvdXRpbHMvY3N2LnV0aWxzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgT2JqZWN0VXRpbHMgfSBmcm9tIFwiQHJlY3Vyc3l2ZS9uZXN0anMtY29tbW9uXCI7XG5pbXBvcnQgKiBhcyBjc3YgZnJvbSBcImNzdi1zdHJpbmdpZnlcIjtcbmltcG9ydCB7IHByb21pc2lmeSB9IGZyb20gXCJ1dGlsXCI7XG5cbmV4cG9ydCBjbGFzcyBDc3ZVdGlscyB7XG4gICAgcHVibGljIHN0YXRpYyBhc3luYyBhcnJheVRvQ3N2QnVmZmVyKHJvd3M6IE9iamVjdFtdLCBoZWFkZXI/OiBzdHJpbmdbXSk6IFByb21pc2U8QnVmZmVyPiB7XG4gICAgICAgIC8vIENvbnZlcnQgdG8gYXJyYXkgb2YgYXJyYXkuXG4gICAgICAgIGxldCBhb2E6IGFueVtdW10gPSByb3dzLm1hcCgocm93OiBPYmplY3QpID0+IHtcbiAgICAgICAgICAgIC8vIFJlcGxhY2UgdW5kZWZpbmVkIHZhbHVlcy5cbiAgICAgICAgICAgIE9iamVjdFV0aWxzLmZvckVhY2hQcm9wZXJ0eShyb3csICh2YWx1ZTogYW55KSA9PiB7XG4gICAgICAgICAgICAgICAgcmV0dXJuIHZhbHVlID8gdmFsdWUgOiBcIk4vQVwiO1xuICAgICAgICAgICAgfSk7XG5cbiAgICAgICAgICAgIHJldHVybiBPYmplY3RVdGlscy5vYmplY3RUb0FycmF5T2ZQcm9wZXJ0aWVzKHJvdyk7XG4gICAgICAgIH0pO1xuXG4gICAgICAgIGlmIChoZWFkZXIpIHtcbiAgICAgICAgICAgIGFvYS51bnNoaWZ0KGhlYWRlcik7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBjc3ZBc1Byb21pc2UgPSBwcm9taXNpZnk8YW55W11bXSwgc3RyaW5nPihjc3YpO1xuICAgICAgICByZXR1cm4gQnVmZmVyLmZyb20oYXdhaXQgY3N2QXNQcm9taXNlKGFvYSkpO1xuICAgIH1cbn1cbiJdfQ==

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@recursyve/nestjs-data-filter",
-    "version": "7.2.0-beta.7",
+    "version": "8.0.0-beta.28",
     "description": "NestJs DataFilter library",
     "main": "index.js",
     "scripts": {
@@ -19,38 +19,37 @@
     "author": "Recursyve",
     "license": "MIT",
     "peerDependencies": {
-        "@nestjs/common": "^7.0.0",
-        "@nestjs/core": "^7.0.0",
-        "@recursyve/nestjs-common": "^7.0.0",
-        "moment": "^2.24.0",
+        "@nestjs/common": "^8.0.0",
+        "@nestjs/core": "^8.0.0",
+        "@recursyve/nestjs-common": "^8.0.0",
+        "moment": "^2.29.0",
         "sequelize": "^6.6.0",
         "sequelize-typescript": "^2.1.0"
     },
     "devDependencies": {
-        "@nestjs/common": "^7.6.15",
-        "@nestjs/core": "^7.6.15",
-        "@nestjs/testing": "^7.6.15",
-        "@recursyve/nestjs-common": "^7.0.3",
-        "@types/bluebird": "^3.5.33",
-        "@types/express": "^4.17.11",
-        "@types/jest": "^26.0.23",
-        "@types/node": "^12.20.7",
-        "class-transformer": "^0.2.3",
-        "class-validator": "^0.11.1",
+        "@nestjs/common": "^8.0.7",
+        "@nestjs/core": "^8.0.7",
+        "@nestjs/testing": "^8.0.7",
+        "@recursyve/nestjs-common": "^8.0.0",
+        "@types/express": "^4.17.13",
+        "@types/jest": "^27.0.2",
+        "@types/node": "^14.17.19",
+        "class-transformer": "^0.4.0",
+        "class-validator": "^0.13.1",
         "express": "^4.17.1",
         "gulp": "^4.0.2",
         "gulp-copy": "^4.0.1",
         "gulp-sourcemaps": "^3.0.0",
-        "gulp-typescript": "^5.0.1",
-        "jest": "^26.6.3",
+        "gulp-typescript": "^6.0.0-alpha.1",
+        "jest": "^27.2.2",
         "reflect-metadata": "^0.1.13",
-        "rxjs": "^6.6.7",
-        "sequelize": "^6.6.0",
+        "rxjs": "^7.3.0",
+        "sequelize": "6.6.2",
         "sequelize-typescript": "^2.1.0",
         "sqlite3": "^5.0.2",
-        "ts-jest": "^26.5.5",
-        "ts-node": "^9.1.1",
-        "typescript": "^4.2.3"
+        "ts-jest": "^27.0.5",
+        "ts-node": "^10.2.1",
+        "typescript": "^4.4.3"
     },
     "jest": {
         "moduleFileExtensions": [
@@ -68,6 +67,6 @@
     },
     "dependencies": {
         "csv-stringify": "^5.6.2",
-        "xlsx": "^0.15.6"
+        "xlsx": "^0.17.2"
     }
 }