@recursyve/nestjs-data-filter 8.1.0 → 8.1.3

package/lib/filter/filters/filter.d.ts

@@ -4,13 +4,14 @@ import { TranslateAdapter } from "../../adapters/translate.adapter";
 import { IncludeWhereModel } from "../../models/include.model";
 import { FilterBaseConfigurationModel } from "../models/filter-configuration.model";
 import { QueryModel, QueryRuleModel } from "../models/query.model";
-import { RuleModel } from "../models/rule.model";
 import { CustomOperator, FilterOperators } from "../operators";
 import { FilterType } from "../type";
 export declare type Condition = "and" | "or";
-export interface FilterConditionRule extends RuleModel {
+export interface FilterConditionRule {
     key: string;
     path?: string;
+    operation: FilterOperators;
+    value: (unknown | unknown[]) | ((value: unknown | unknown[]) => unknown | unknown[]);
 }
 export interface FilterCondition {
     condition: Condition;
@@ -70,8 +71,8 @@ export declare abstract class Filter implements FilterDefinition {
     getWhereOptions(rule: QueryRuleModel, name?: string): Promise<WhereOptions>;
     getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions>;
     usePathCondition(query: QueryModel): boolean;
-    protected getConditionWhereOptions(where: WhereOptions): WhereOptions;
-    protected generateRuleWhereOptions(filter: FilterCondition, options: WhereOptions[]): void;
+    protected getConditionWhereOptions(where: WhereOptions, rule: QueryRuleModel): WhereOptions;
+    protected generateRuleWhereOptions(filter: FilterCondition, options: WhereOptions[], parentRule: QueryRuleModel): void;
     protected getOperatorHavingOptions(operator: FilterOperators, where: WhereOptions): WhereOptions;
     protected getOperatorWhereOptions(operator: FilterOperators, where: WhereOptions, value: any): WhereOptions;
     private getRuleFromKeys;

package/lib/filter/filters/filter.js

@@ -72,8 +72,8 @@ class Filter {
             rule.operation = op.operator;
         }
         const where = ((rule === null || rule === void 0 ? void 0 : rule.value) === undefined || this.having) ?
-            this.getConditionWhereOptions(null) :
-            this.getConditionWhereOptions(this.transformCondition(rule, name));
+            this.getConditionWhereOptions(null, rule) :
+            this.getConditionWhereOptions(this.transformCondition(rule, name), rule);
         return this.getOperatorWhereOptions(rule.operation, where, rule.value);
     }
     async getHavingOptions(rule) {
@@ -103,28 +103,34 @@ class Filter {
         }
         return rules.every(x => this.pathCondition[x.id] === x.value);
     }
-    getConditionWhereOptions(where) {
+    getConditionWhereOptions(where, rule) {
         if (!this.condition) {
             return where;
         }
         const conditions = where ? [where] : [];
         const option = this.condition.condition === "and" ? { [sequelize_1.Op.and]: conditions } : { [sequelize_1.Op.or]: conditions };
-        this.generateRuleWhereOptions(this.condition, conditions);
+        this.generateRuleWhereOptions(this.condition, conditions, rule);
         return option;
     }
-    generateRuleWhereOptions(filter, options) {
+    generateRuleWhereOptions(filter, options, parentRule) {
         for (const rule of filter.rules) {
             const c = rule;
             if (c.condition) {
                 const conditions = [];
                 options.push(c.condition === "and" ? { [sequelize_1.Op.and]: conditions } : { [sequelize_1.Op.or]: [] });
-                this.generateRuleWhereOptions(c, conditions);
+                this.generateRuleWhereOptions(c, conditions, parentRule);
                 continue;
             }
-            const r = rule;
+            let r = rule;
             const name = r.path ? sequelize_utils_1.SequelizeUtils.getAttributeFullName(r.key, r.path) : r.key;
+            if (typeof r.value === "function") {
+                r = {
+                    ...r,
+                    value: r.value(parentRule.value)
+                };
+            }
             options.push({
-                [name]: sequelize_utils_1.SequelizeUtils.generateWhereValue(rule)
+                [name]: sequelize_utils_1.SequelizeUtils.generateWhereValue(r)
             });
         }
     }
@@ -219,4 +225,4 @@ class Filter {
 }
 exports.Filter = Filter;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/filter/filters/filter.ts"],"names":[],"mappings":"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","file":"lib/filter/filters/filter.js","sourcesContent":["import { fn, LogicType, Op, Sequelize, where, WhereOperators, WhereOptions } from \"sequelize\";\nimport { DataFilterUserModel, FilterOperatorTypes } from \"../..\";\nimport { TranslateAdapter } from \"../../adapters/translate.adapter\";\nimport { IncludeWhereModel } from \"../../models/include.model\";\nimport { SequelizeUtils } from \"../../sequelize.utils\";\nimport { FilterUtils } from \"../filter.utils\";\nimport { FilterBaseConfigurationModel } from \"../models/filter-configuration.model\";\nimport { QueryModel, QueryRuleModel } from \"../models/query.model\";\nimport { RuleModel } from \"../models/rule.model\";\nimport { CustomOperator, FilterOperators } from \"../operators\";\nimport { FilterType } from \"../type\";\n\nexport type Condition = \"and\" | \"or\";\n\nexport interface FilterConditionRule extends RuleModel {\n    key: string;\n    path?: string;\n}\n\nexport interface FilterCondition {\n    condition: Condition;\n    rules: (FilterConditionRule | FilterCondition)[];\n}\n\nexport interface JsonConfig {\n    type: \"array\" | \"object\";\n    path?: string;\n}\n\nexport type PathCondition = boolean | {\n    [filter: string]: any;\n}\n\nexport interface BaseFilterDefinition {\n    attribute: string;\n    path?: string;\n    having?: any;\n    paranoid?: boolean;\n    condition?: FilterCondition;\n    group?: string;\n    where?: IncludeWhereModel;\n    pathCondition?: PathCondition;\n    json?: JsonConfig;\n\n    /**\n     * Private means that the config will not be returned.\n     */\n    private?: boolean;\n}\n\nexport interface FilterDefinition extends BaseFilterDefinition {\n    type: FilterType;\n    operators: (FilterOperatorTypes | CustomOperator)[];\n\n    getConfig(key: string, user?: DataFilterUserModel): Promise<FilterBaseConfigurationModel>;\n    getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions>;\n    getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions>;\n    usePathCondition(query: QueryModel): boolean;\n}\n\nexport abstract class Filter implements FilterDefinition {\n    private _type = \"filter\";\n\n    protected _translateService: TranslateAdapter;\n\n    public set translateService(translateService: TranslateAdapter) {\n        this._translateService = translateService;\n    }\n\n    public type: FilterType;\n    public operators: (FilterOperatorTypes | CustomOperator)[];\n    public group: string;\n    public attribute: string;\n    public having?: any;\n    public path?: string;\n    public condition?: FilterCondition;\n    public pathCondition?: PathCondition;\n    public json?: JsonConfig;\n    public private?: boolean;\n    public paranoid = true;\n\n    public static validate(definition: FilterDefinition) {\n        return definition[\"_type\"] === \"filter\";\n    }\n\n    protected constructor(definition?: BaseFilterDefinition) {\n        if (definition) {\n            Object.assign(this, definition);\n        }\n    }\n\n    public addOperators(...operator: (FilterOperatorTypes | CustomOperator)[]): Filter {\n        this.operators.push(...operator);\n        return this;\n    }\n\n    public removeOperators(...operator: (FilterOperatorTypes | CustomOperator)[]): Filter {\n        this.operators = this.operators.filter(x => !operator.some(op => op === x));\n        return this;\n    }\n\n    public setOperators(...operator: (FilterOperatorTypes | CustomOperator)[]): Filter {\n        this.operators = [...operator];\n        return this;\n    }\n\n    public async getConfig(key: string, user?: DataFilterUserModel): Promise<FilterBaseConfigurationModel> {\n        if (this.private) {\n            return;\n        }\n\n        const config = {\n            type: this.type,\n            operators: await Promise.all(this.operators.map(async x => {\n                if (typeof x === \"string\") {\n                    return {\n                        id: x,\n                        name: await this._translateService.getTranslation(\n                            user?.language,\n                            FilterUtils.getOperatorTranslationKey(x)\n                        )\n                    };\n                }\n\n                return {\n                    id: x.name,\n                    name: await this._translateService.getTranslation(\n                        user?.language,\n                        FilterUtils.getCustomOperatorTranslationKey(key, x.name)\n                    )\n                };\n            }))\n        } as FilterBaseConfigurationModel;\n\n        if (this.group) {\n            config.group = {\n                key: this.group,\n                name: await this._translateService.getTranslation(user?.language, FilterUtils.getGroupTranslationKey(this.group))\n            }\n        }\n        return config;\n    }\n\n    public async getWhereOptions(rule: QueryRuleModel, name?: string): Promise<WhereOptions> {\n        if (!name) {\n            name = this.path ? SequelizeUtils.getAttributeFullName(this.attribute, this.path) : this.attribute;\n        }\n\n        const op = this.operators.find(x => {\n            if (typeof x === \"string\") {\n                return false;\n            }\n\n            return x.name === rule.operation;\n        }) as CustomOperator;\n        if (op?.operator) {\n            rule.operation = op.operator;\n        }\n\n        const where = (rule?.value === undefined || this.having) ?\n            this.getConditionWhereOptions(null) :\n            this.getConditionWhereOptions(this.transformCondition(rule, name));\n\n        return this.getOperatorWhereOptions(rule.operation, where, rule.value);\n    }\n\n    public async getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions> {\n        if (!this.having) {\n            return this.getOperatorHavingOptions(rule.operation, null);\n        }\n\n        let options: WhereOptions;\n        if (this.having.attribute) {\n            options = this.having;\n        } else {\n            const value = SequelizeUtils.generateWhereValue(rule) as WhereOperators;\n            if (value !== null || typeof value !== \"undefined\") {\n                options = where(this.having, value);\n            }\n        }\n\n        return this.getOperatorHavingOptions(rule.operation, options);\n    }\n\n    public usePathCondition(query: QueryModel): boolean {\n        if (!this.pathCondition || typeof this.pathCondition === \"boolean\") {\n            return false;\n        }\n\n        const keys = Object.keys(this.pathCondition);\n        const rules = this.getRuleFromKeys(query, keys);\n        if (keys.length !== rules.length) {\n            return false;\n        }\n\n        return rules.every(x => this.pathCondition[x.id] === x.value);\n    }\n\n    protected getConditionWhereOptions(where: WhereOptions): WhereOptions {\n        if (!this.condition) {\n            return where;\n        }\n\n        const conditions = where ? [where] : [];\n        const option = this.condition.condition === \"and\" ? { [Op.and]: conditions } : { [Op.or]: conditions };\n        this.generateRuleWhereOptions(this.condition, conditions);\n        return option;\n    }\n\n    protected generateRuleWhereOptions(filter: FilterCondition, options: WhereOptions[]) {\n        for (const rule of filter.rules) {\n            const c = rule as FilterCondition;\n            if (c.condition) {\n                const conditions = [];\n                options.push(c.condition === \"and\" ? { [Op.and]: conditions } : { [Op.or]: [] });\n                this.generateRuleWhereOptions(c, conditions);\n                continue;\n            }\n\n            const r = rule as FilterConditionRule;\n            const name = r.path ? SequelizeUtils.getAttributeFullName(r.key, r.path) : r.key;\n            options.push({\n                [name]: SequelizeUtils.generateWhereValue(rule as RuleModel)\n            });\n        }\n    }\n\n    protected getOperatorHavingOptions(operator: FilterOperators, where: WhereOptions): WhereOptions {\n        const op = this.operators.find(x => {\n            if (typeof x === \"string\") {\n                return false;\n            }\n\n            return x.name === operator;\n        }) as CustomOperator;\n        if (!op) {\n            return where;\n        }\n\n        if (!op.having) {\n            return where;\n        }\n\n        return where\n            ? {\n                  [Op.and]: [where, op.having]\n              }\n            : op.having;\n    }\n\n    protected getOperatorWhereOptions(operator: FilterOperators, where: WhereOptions, value: any): WhereOptions {\n        const op = this.operators.find(x => {\n            if (typeof x === \"string\") {\n                return false;\n            }\n\n            return x.name === operator;\n        }) as CustomOperator;\n        if (!op) {\n            return where;\n        }\n\n        if (!op.where) {\n            return where;\n        }\n\n        const opWhere = typeof op.where === \"function\" ? op.where(value) : op.where;\n        return where\n            ? {\n                  [Op.and]: [where, opWhere]\n              }\n            : opWhere;\n    }\n\n    private getRuleFromKeys(query: QueryModel, keys: string[]): QueryRuleModel[] {\n        const rules: QueryRuleModel[] = [];\n        for (const rule of query.rules) {\n            if ((rule as QueryModel).condition) {\n                rules.push(...this.getRuleFromKeys(rule as QueryModel, keys));\n            } else if (keys.some(x => (rule as QueryRuleModel).id === x)) {\n                rules.push(rule as QueryRuleModel);\n            }\n        }\n\n        return rules;\n    }\n\n    private transformCondition(rule: QueryRuleModel, name: string): WhereOptions {\n        if (!this.json) {\n            return {\n                [name]: SequelizeUtils.generateWhereValue(rule)\n            };\n        }\n\n        if (this.json.type === \"array\") {\n            return this.transformForJsonArray(rule, name);\n        }\n\n        return this.transformForJsonObject(rule, name);\n    }\n\n    private transformForJsonArray(rule: QueryRuleModel, name: string): WhereOptions {\n        const colName = this.path ? Sequelize.col(name) : Sequelize.literal(name);\n        if (rule.operation === FilterOperatorTypes.Contains || rule.operation === FilterOperatorTypes.NotContains) {\n            /**\n             * We override the rule to use an equal or not equal with a JSON_CONTAINS function\n             */\n            const newRule = {\n                operation: rule.operation === FilterOperatorTypes.Contains ? FilterOperatorTypes.Equal : FilterOperatorTypes.NotEqual,\n                value: true\n            }\n\n            const value = typeof rule.value === \"string\" ? `\"${rule.value}\"` : rule.value;\n            if (this.json.path) {\n                return where(fn(\"JSON_CONTAINS\", colName, value, this.json.path), SequelizeUtils.generateWhereValue(newRule as RuleModel) as LogicType)\n            }\n            return where(fn(\"JSON_CONTAINS\", colName, value), SequelizeUtils.generateWhereValue(newRule as RuleModel) as LogicType)\n        }\n\n        return null;\n    }\n\n    private transformForJsonObject(rule: QueryRuleModel, name: string): WhereOptions {\n        const colName = this.path ? Sequelize.col(name) : Sequelize.literal(name);\n        const value = SequelizeUtils.generateWhereValue(rule);\n        if (this.json.path) {\n            return Sequelize.where(Sequelize.fn(\"JSON_EXTRACT\", colName, this.json.path), value as LogicType);\n        }\n\n        return Sequelize.where(Sequelize.fn(\"JSON_EXTRACT\", colName), value as LogicType);\n    }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/filter/filters/filter.ts"],"names":[],"mappings":"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","file":"lib/filter/filters/filter.js","sourcesContent":["import { fn, LogicType, Op, Sequelize, where, WhereOperators, WhereOptions } from \"sequelize\";\nimport { DataFilterUserModel, FilterOperatorTypes } from \"../..\";\nimport { TranslateAdapter } from \"../../adapters/translate.adapter\";\nimport { IncludeWhereModel } from \"../../models/include.model\";\nimport { SequelizeUtils } from \"../../sequelize.utils\";\nimport { FilterUtils } from \"../filter.utils\";\nimport { FilterBaseConfigurationModel } from \"../models/filter-configuration.model\";\nimport { QueryModel, QueryRuleModel } from \"../models/query.model\";\nimport { RuleModel } from \"../models/rule.model\";\nimport { CustomOperator, FilterOperators } from \"../operators\";\nimport { FilterType } from \"../type\";\n\nexport type Condition = \"and\" | \"or\";\n\n// TODO: Deprecate key to use attribute instead to be consistant with the BaseFilterDefinition\nexport interface FilterConditionRule {\n    key: string;\n    path?: string;\n    operation: FilterOperators;\n    value: (unknown | unknown[]) | ((value: unknown | unknown[]) => unknown | unknown[])\n}\n\nexport interface FilterCondition {\n    condition: Condition;\n    rules: (FilterConditionRule | FilterCondition)[];\n}\n\nexport interface JsonConfig {\n    type: \"array\" | \"object\";\n    path?: string;\n}\n\nexport type PathCondition = boolean | {\n    [filter: string]: any;\n}\n\nexport interface BaseFilterDefinition {\n    attribute: string;\n    path?: string;\n    having?: any;\n    paranoid?: boolean;\n    condition?: FilterCondition;\n    group?: string;\n    where?: IncludeWhereModel;\n    pathCondition?: PathCondition;\n    json?: JsonConfig;\n\n    /**\n     * Private means that the config will not be returned.\n     */\n    private?: boolean;\n}\n\nexport interface FilterDefinition extends BaseFilterDefinition {\n    type: FilterType;\n    operators: (FilterOperatorTypes | CustomOperator)[];\n\n    getConfig(key: string, user?: DataFilterUserModel): Promise<FilterBaseConfigurationModel>;\n    getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions>;\n    getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions>;\n    usePathCondition(query: QueryModel): boolean;\n}\n\nexport abstract class Filter implements FilterDefinition {\n    private _type = \"filter\";\n\n    protected _translateService: TranslateAdapter;\n\n    public set translateService(translateService: TranslateAdapter) {\n        this._translateService = translateService;\n    }\n\n    public type: FilterType;\n    public operators: (FilterOperatorTypes | CustomOperator)[];\n    public group: string;\n    public attribute: string;\n    public having?: any;\n    public path?: string;\n    public condition?: FilterCondition;\n    public pathCondition?: PathCondition;\n    public json?: JsonConfig;\n    public private?: boolean;\n    public paranoid = true;\n\n    public static validate(definition: FilterDefinition) {\n        return definition[\"_type\"] === \"filter\";\n    }\n\n    protected constructor(definition?: BaseFilterDefinition) {\n        if (definition) {\n            Object.assign(this, definition);\n        }\n    }\n\n    public addOperators(...operator: (FilterOperatorTypes | CustomOperator)[]): Filter {\n        this.operators.push(...operator);\n        return this;\n    }\n\n    public removeOperators(...operator: (FilterOperatorTypes | CustomOperator)[]): Filter {\n        this.operators = this.operators.filter(x => !operator.some(op => op === x));\n        return this;\n    }\n\n    public setOperators(...operator: (FilterOperatorTypes | CustomOperator)[]): Filter {\n        this.operators = [...operator];\n        return this;\n    }\n\n    public async getConfig(key: string, user?: DataFilterUserModel): Promise<FilterBaseConfigurationModel> {\n        if (this.private) {\n            return;\n        }\n\n        const config = {\n            type: this.type,\n            operators: await Promise.all(this.operators.map(async x => {\n                if (typeof x === \"string\") {\n                    return {\n                        id: x,\n                        name: await this._translateService.getTranslation(\n                            user?.language,\n                            FilterUtils.getOperatorTranslationKey(x)\n                        )\n                    };\n                }\n\n                return {\n                    id: x.name,\n                    name: await this._translateService.getTranslation(\n                        user?.language,\n                        FilterUtils.getCustomOperatorTranslationKey(key, x.name)\n                    )\n                };\n            }))\n        } as FilterBaseConfigurationModel;\n\n        if (this.group) {\n            config.group = {\n                key: this.group,\n                name: await this._translateService.getTranslation(user?.language, FilterUtils.getGroupTranslationKey(this.group))\n            }\n        }\n        return config;\n    }\n\n    public async getWhereOptions(rule: QueryRuleModel, name?: string): Promise<WhereOptions> {\n        if (!name) {\n            name = this.path ? SequelizeUtils.getAttributeFullName(this.attribute, this.path) : this.attribute;\n        }\n\n        const op = this.operators.find(x => {\n            if (typeof x === \"string\") {\n                return false;\n            }\n\n            return x.name === rule.operation;\n        }) as CustomOperator;\n        if (op?.operator) {\n            rule.operation = op.operator;\n        }\n\n        const where = (rule?.value === undefined || this.having) ?\n            this.getConditionWhereOptions(null, rule) :\n            this.getConditionWhereOptions(this.transformCondition(rule, name), rule);\n\n        return this.getOperatorWhereOptions(rule.operation, where, rule.value);\n    }\n\n    public async getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions> {\n        if (!this.having) {\n            return this.getOperatorHavingOptions(rule.operation, null);\n        }\n\n        let options: WhereOptions;\n        if (this.having.attribute) {\n            options = this.having;\n        } else {\n            const value = SequelizeUtils.generateWhereValue(rule) as WhereOperators;\n            if (value !== null || typeof value !== \"undefined\") {\n                options = where(this.having, value);\n            }\n        }\n\n        return this.getOperatorHavingOptions(rule.operation, options);\n    }\n\n    public usePathCondition(query: QueryModel): boolean {\n        if (!this.pathCondition || typeof this.pathCondition === \"boolean\") {\n            return false;\n        }\n\n        const keys = Object.keys(this.pathCondition);\n        const rules = this.getRuleFromKeys(query, keys);\n        if (keys.length !== rules.length) {\n            return false;\n        }\n\n        return rules.every(x => this.pathCondition[x.id] === x.value);\n    }\n\n    protected getConditionWhereOptions(where: WhereOptions, rule: QueryRuleModel): WhereOptions {\n        if (!this.condition) {\n            return where;\n        }\n\n        const conditions = where ? [where] : [];\n        const option = this.condition.condition === \"and\" ? { [Op.and]: conditions } : { [Op.or]: conditions };\n        this.generateRuleWhereOptions(this.condition, conditions, rule);\n        return option;\n    }\n\n    protected generateRuleWhereOptions(filter: FilterCondition, options: WhereOptions[], parentRule: QueryRuleModel) {\n        for (const rule of filter.rules) {\n            const c = rule as FilterCondition;\n            if (c.condition) {\n                const conditions = [];\n                options.push(c.condition === \"and\" ? { [Op.and]: conditions } : { [Op.or]: [] });\n                this.generateRuleWhereOptions(c, conditions, parentRule);\n                continue;\n            }\n\n            let r = rule as FilterConditionRule;\n            const name = r.path ? SequelizeUtils.getAttributeFullName(r.key, r.path) : r.key;\n            if (typeof r.value === \"function\") {\n                r = {\n                    ...r,\n                    value: r.value(parentRule.value)\n                }\n            }\n            options.push({\n                [name]: SequelizeUtils.generateWhereValue(r as RuleModel)\n            });\n        }\n    }\n\n    protected getOperatorHavingOptions(operator: FilterOperators, where: WhereOptions): WhereOptions {\n        const op = this.operators.find(x => {\n            if (typeof x === \"string\") {\n                return false;\n            }\n\n            return x.name === operator;\n        }) as CustomOperator;\n        if (!op) {\n            return where;\n        }\n\n        if (!op.having) {\n            return where;\n        }\n\n        return where\n            ? {\n                  [Op.and]: [where, op.having]\n              }\n            : op.having;\n    }\n\n    protected getOperatorWhereOptions(operator: FilterOperators, where: WhereOptions, value: any): WhereOptions {\n        const op = this.operators.find(x => {\n            if (typeof x === \"string\") {\n                return false;\n            }\n\n            return x.name === operator;\n        }) as CustomOperator;\n        if (!op) {\n            return where;\n        }\n\n        if (!op.where) {\n            return where;\n        }\n\n        const opWhere = typeof op.where === \"function\" ? op.where(value) : op.where;\n        return where\n            ? {\n                  [Op.and]: [where, opWhere]\n              }\n            : opWhere;\n    }\n\n    private getRuleFromKeys(query: QueryModel, keys: string[]): QueryRuleModel[] {\n        const rules: QueryRuleModel[] = [];\n        for (const rule of query.rules) {\n            if ((rule as QueryModel).condition) {\n                rules.push(...this.getRuleFromKeys(rule as QueryModel, keys));\n            } else if (keys.some(x => (rule as QueryRuleModel).id === x)) {\n                rules.push(rule as QueryRuleModel);\n            }\n        }\n\n        return rules;\n    }\n\n    private transformCondition(rule: QueryRuleModel, name: string): WhereOptions {\n        if (!this.json) {\n            return {\n                [name]: SequelizeUtils.generateWhereValue(rule)\n            };\n        }\n\n        if (this.json.type === \"array\") {\n            return this.transformForJsonArray(rule, name);\n        }\n\n        return this.transformForJsonObject(rule, name);\n    }\n\n    private transformForJsonArray(rule: QueryRuleModel, name: string): WhereOptions {\n        const colName = this.path ? Sequelize.col(name) : Sequelize.literal(name);\n        if (rule.operation === FilterOperatorTypes.Contains || rule.operation === FilterOperatorTypes.NotContains) {\n            /**\n             * We override the rule to use an equal or not equal with a JSON_CONTAINS function\n             */\n            const newRule = {\n                operation: rule.operation === FilterOperatorTypes.Contains ? FilterOperatorTypes.Equal : FilterOperatorTypes.NotEqual,\n                value: true\n            }\n\n            const value = typeof rule.value === \"string\" ? `\"${rule.value}\"` : rule.value;\n            if (this.json.path) {\n                return where(fn(\"JSON_CONTAINS\", colName, value, this.json.path), SequelizeUtils.generateWhereValue(newRule as RuleModel) as LogicType)\n            }\n            return where(fn(\"JSON_CONTAINS\", colName, value), SequelizeUtils.generateWhereValue(newRule as RuleModel) as LogicType)\n        }\n\n        return null;\n    }\n\n    private transformForJsonObject(rule: QueryRuleModel, name: string): WhereOptions {\n        const colName = this.path ? Sequelize.col(name) : Sequelize.literal(name);\n        const value = SequelizeUtils.generateWhereValue(rule);\n        if (this.json.path) {\n            return Sequelize.where(Sequelize.fn(\"JSON_EXTRACT\", colName, this.json.path), value as LogicType);\n        }\n\n        return Sequelize.where(Sequelize.fn(\"JSON_EXTRACT\", colName), value as LogicType);\n    }\n}\n"]}

package/lib/filter/filters/radio.filter.js

@@ -38,7 +38,7 @@ class RadioFilter extends filter_1.Filter {
         }
         const conditions = [];
         const where = option.condition.condition === "and" ? { [sequelize_1.Op.and]: conditions } : { [sequelize_1.Op.or]: conditions };
-        this.generateRuleWhereOptions(option.condition, conditions);
+        this.generateRuleWhereOptions(option.condition, conditions, rule);
         conditions.push(super.getWhereOptions({
             ...rule,
             value: option.value,
@@ -61,4 +61,4 @@ class RadioFilter extends filter_1.Filter {
 }
 exports.RadioFilter = RadioFilter;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy9yYWRpby5maWx0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEseUNBQTZDO0FBRTdDLGtEQUE4QztBQUc5Qyw0Q0FBbUQ7QUFDbkQsa0NBQXFDO0FBQ3JDLHFDQUF3RDtBQXNCeEQsTUFBYSxXQUFZLFNBQVEsZUFBTTtJQUtuQyxZQUFZLFVBQXdEO1FBQ2hFLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUxmLFNBQUksR0FBRyxpQkFBVSxDQUFDLEtBQUssQ0FBQztRQUN4QixjQUFTLEdBQUcsQ0FBQywrQkFBbUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUsvQyxDQUFDO0lBRU0sS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUFXLEVBQUUsSUFBMEI7UUFDMUQsSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ2QsT0FBTztTQUNWO1FBRUQsT0FBTztZQUNILEdBQUcsQ0FBQyxNQUFNLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQ3JDLE9BQU8sRUFBRSxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFDLENBQUMsRUFBQyxFQUFFLENBQUMsQ0FBQztnQkFDcEQsR0FBRyxFQUFFLENBQUMsQ0FBQyxHQUFHO2dCQUNWLElBQUksRUFBRSxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxjQUFjLENBQzdDLElBQUksYUFBSixJQUFJLHVCQUFKLElBQUksQ0FBRSxRQUFRLEVBQ2QsMEJBQVcsQ0FBQyw0QkFBNEIsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUN2RDthQUNKLENBQUMsQ0FBQyxDQUFDO1NBQ1AsQ0FBQztJQUNOLENBQUM7SUFFTSxLQUFLLENBQUMsZUFBZSxDQUFDLElBQW9CO1FBQzdDLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsS0FBSyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDNUQsSUFBSSxDQUFDLE1BQU0sRUFBRTtZQUNULE9BQU8sS0FBSyxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUN0QztRQUVELElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFO1lBQ25CLE9BQU8sS0FBSyxDQUFDLGVBQWUsQ0FBQztnQkFDekIsR0FBRyxJQUFJO2dCQUNQLEtBQUssRUFBRSxNQUFNLENBQUMsS0FBSztnQkFDbkIsU0FBUyxFQUFFLE1BQU0sQ0FBQyxRQUFRLElBQUksSUFBSSxDQUFDLFNBQVM7YUFDL0MsQ0FBQyxDQUFDO1NBQ047UUFFRCxNQUFNLFVBQVUsR0FBRyxFQUFFLENBQUM7UUFDdEIsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQyxTQUFTLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsY0FBRSxDQUFDLEdBQUcsQ0FBQyxFQUFFLFVBQVUsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsY0FBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLFVBQVUsRUFBRSxDQUFDO1FBQ3hHLElBQUksQ0FBQyx3QkFBd0IsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBQzVELFVBQVUsQ0FBQyxJQUFJLENBQ1gsS0FBSyxDQUFDLGVBQWUsQ0FBQztZQUNsQixHQUFHLElBQUk7WUFDUCxLQUFLLEVBQUUsTUFBTSxDQUFDLEtBQUs7WUFDbkIsU0FBUyxFQUFFLE1BQU0sQ0FBQyxRQUFRLElBQUksSUFBSSxDQUFDLFNBQVM7U0FDL0MsQ0FBQyxDQUNMLENBQUM7UUFDRixPQUFPLEtBQUssQ0FBQztJQUNqQixDQUFDO0lBRU0sS0FBSyxDQUFDLGdCQUFnQixDQUFDLElBQW9COztRQUM5QyxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLEtBQUssSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzVELElBQUksQ0FBQyxNQUFNLEVBQUU7WUFDVCxPQUFPLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUN2QztRQUVELE9BQU8sS0FBSyxDQUFDLGdCQUFnQixDQUFDO1lBQzFCLEdBQUcsSUFBSTtZQUNQLEtBQUssRUFBRSxNQUFNLENBQUMsS0FBSztZQUNuQixTQUFTLEVBQUUsTUFBQSxNQUFNLENBQUMsUUFBUSxtQ0FBSSxJQUFJLENBQUMsU0FBUztTQUMvQyxDQUFDLENBQUM7SUFDUCxDQUFDO0NBQ0o7QUFqRUQsa0NBaUVDIiwiZmlsZSI6ImxpYi9maWx0ZXIvZmlsdGVycy9yYWRpby5maWx0ZXIuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBPcCwgV2hlcmVPcHRpb25zIH0gZnJvbSBcInNlcXVlbGl6ZVwiO1xuaW1wb3J0IHsgRGF0YUZpbHRlclVzZXJNb2RlbCwgRmlsdGVyQ29uZGl0aW9uIH0gZnJvbSBcIi4uLy4uXCI7XG5pbXBvcnQgeyBGaWx0ZXJVdGlscyB9IGZyb20gXCIuLi9maWx0ZXIudXRpbHNcIjtcbmltcG9ydCB7IFF1ZXJ5UnVsZU1vZGVsIH0gZnJvbSBcIi4uL21vZGVsc1wiO1xuaW1wb3J0IHsgRmlsdGVyQmFzZUNvbmZpZ3VyYXRpb25Nb2RlbCB9IGZyb20gXCIuLi9tb2RlbHMvZmlsdGVyLWNvbmZpZ3VyYXRpb24ubW9kZWxcIjtcbmltcG9ydCB7IEZpbHRlck9wZXJhdG9yVHlwZXMgfSBmcm9tIFwiLi4vb3BlcmF0b3JzXCI7XG5pbXBvcnQgeyBGaWx0ZXJUeXBlIH0gZnJvbSBcIi4uL3R5cGVcIjtcbmltcG9ydCB7IEJhc2VGaWx0ZXJEZWZpbml0aW9uLCBGaWx0ZXIgfSBmcm9tIFwiLi9maWx0ZXJcIjtcblxuZXhwb3J0IGludGVyZmFjZSBSYWRpb0ZpbHRlck9wdGlvbiB7XG4gICAga2V5OiBzdHJpbmc7XG4gICAgdmFsdWU6IHVua25vd247XG4gICAgb3BlcmF0b3I/OiBGaWx0ZXJPcGVyYXRvclR5cGVzO1xuICAgIGNvbmRpdGlvbj86IEZpbHRlckNvbmRpdGlvbjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBSYWRpb0ZpbHRlckRlZmluaXRpb24ge1xuICAgIG9wdGlvbnM6IFJhZGlvRmlsdGVyT3B0aW9uW107XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUmFkaW9GaWx0ZXJPcHRpb25Db25maWd1cmF0aW9uIHtcbiAgICBrZXk6IHN0cmluZztcbiAgICBuYW1lPzogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFJhZGlvRmlsdGVyQ29uZmlndXJhdGlvbk1vZGVsIGV4dGVuZHMgRmlsdGVyQmFzZUNvbmZpZ3VyYXRpb25Nb2RlbCB7XG4gICAgb3B0aW9uczogUmFkaW9GaWx0ZXJPcHRpb25Db25maWd1cmF0aW9uW107XG59XG5cbmV4cG9ydCBjbGFzcyBSYWRpb0ZpbHRlciBleHRlbmRzIEZpbHRlciBpbXBsZW1lbnRzIFJhZGlvRmlsdGVyRGVmaW5pdGlvbiB7XG4gICAgcHVibGljIHR5cGUgPSBGaWx0ZXJUeXBlLlJhZGlvO1xuICAgIHB1YmxpYyBvcGVyYXRvcnMgPSBbRmlsdGVyT3BlcmF0b3JUeXBlcy5FcXVhbF07XG4gICAgcHVibGljIG9wdGlvbnM6IFJhZGlvRmlsdGVyT3B0aW9uW107XG5cbiAgICBjb25zdHJ1Y3RvcihkZWZpbml0aW9uOiBCYXNlRmlsdGVyRGVmaW5pdGlvbiAmIFJhZGlvRmlsdGVyRGVmaW5pdGlvbikge1xuICAgICAgICBzdXBlcihkZWZpbml0aW9uKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgZ2V0Q29uZmlnKGtleTogc3RyaW5nLCB1c2VyPzogRGF0YUZpbHRlclVzZXJNb2RlbCk6IFByb21pc2U8UmFkaW9GaWx0ZXJDb25maWd1cmF0aW9uTW9kZWw+IHtcbiAgICAgICAgaWYgKHRoaXMucHJpdmF0ZSkge1xuICAgICAgICAgICAgcmV0dXJuO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgIC4uLihhd2FpdCBzdXBlci5nZXRDb25maWcoa2V5LCB1c2VyKSksXG4gICAgICAgICAgICBvcHRpb25zOiBhd2FpdCBQcm9taXNlLmFsbCh0aGlzLm9wdGlvbnMubWFwKGFzeW5jIHggPT4gKHtcbiAgICAgICAgICAgICAgICBrZXk6IHgua2V5LFxuICAgICAgICAgICAgICAgIG5hbWU6IGF3YWl0IHRoaXMuX3RyYW5zbGF0ZVNlcnZpY2UuZ2V0VHJhbnNsYXRpb24oXG4gICAgICAgICAgICAgICAgICAgIHVzZXI/Lmxhbmd1YWdlLFxuICAgICAgICAgICAgICAgICAgICBGaWx0ZXJVdGlscy5nZXRSYWRpb09wdGlvblRyYW5zbGF0aW9uS2V5KGtleSwgeC5rZXkpXG4gICAgICAgICAgICAgICAgKVxuICAgICAgICAgICAgfSkpKVxuICAgICAgICB9O1xuICAgIH1cblxuICAgIHB1YmxpYyBhc3luYyBnZXRXaGVyZU9wdGlvbnMocnVsZTogUXVlcnlSdWxlTW9kZWwpOiBQcm9taXNlPFdoZXJlT3B0aW9ucz4ge1xuICAgICAgICBjb25zdCBvcHRpb24gPSB0aGlzLm9wdGlvbnMuZmluZCh4ID0+IHgua2V5ID09PSBydWxlLnZhbHVlKTtcbiAgICAgICAgaWYgKCFvcHRpb24pIHtcbiAgICAgICAgICAgIHJldHVybiBzdXBlci5nZXRXaGVyZU9wdGlvbnMocnVsZSk7XG4gICAgICAgIH1cblxuICAgICAgICBpZiAoIW9wdGlvbi5jb25kaXRpb24pIHtcbiAgICAgICAgICAgIHJldHVybiBzdXBlci5nZXRXaGVyZU9wdGlvbnMoe1xuICAgICAgICAgICAgICAgIC4uLnJ1bGUsXG4gICAgICAgICAgICAgICAgdmFsdWU6IG9wdGlvbi52YWx1ZSxcbiAgICAgICAgICAgICAgICBvcGVyYXRpb246IG9wdGlvbi5vcGVyYXRvciB8fCBydWxlLm9wZXJhdGlvblxuICAgICAgICAgICAgfSk7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBjb25kaXRpb25zID0gW107XG4gICAgICAgIGNvbnN0IHdoZXJlID0gb3B0aW9uLmNvbmRpdGlvbi5jb25kaXRpb24gPT09IFwiYW5kXCIgPyB7IFtPcC5hbmRdOiBjb25kaXRpb25zIH0gOiB7IFtPcC5vcl06IGNvbmRpdGlvbnMgfTtcbiAgICAgICAgdGhpcy5nZW5lcmF0ZVJ1bGVXaGVyZU9wdGlvbnMob3B0aW9uLmNvbmRpdGlvbiwgY29uZGl0aW9ucyk7XG4gICAgICAgIGNvbmRpdGlvbnMucHVzaChcbiAgICAgICAgICAgIHN1cGVyLmdldFdoZXJlT3B0aW9ucyh7XG4gICAgICAgICAgICAgICAgLi4ucnVsZSxcbiAgICAgICAgICAgICAgICB2YWx1ZTogb3B0aW9uLnZhbHVlLFxuICAgICAgICAgICAgICAgIG9wZXJhdGlvbjogb3B0aW9uLm9wZXJhdG9yIHx8IHJ1bGUub3BlcmF0aW9uXG4gICAgICAgICAgICB9KVxuICAgICAgICApO1xuICAgICAgICByZXR1cm4gd2hlcmU7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIGdldEhhdmluZ09wdGlvbnMocnVsZTogUXVlcnlSdWxlTW9kZWwpOiBQcm9taXNlPFdoZXJlT3B0aW9ucz4ge1xuICAgICAgICBjb25zdCBvcHRpb24gPSB0aGlzLm9wdGlvbnMuZmluZCh4ID0+IHgua2V5ID09PSBydWxlLnZhbHVlKTtcbiAgICAgICAgaWYgKCFvcHRpb24pIHtcbiAgICAgICAgICAgIHJldHVybiBzdXBlci5nZXRIYXZpbmdPcHRpb25zKHJ1bGUpO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIHN1cGVyLmdldEhhdmluZ09wdGlvbnMoe1xuICAgICAgICAgICAgLi4ucnVsZSxcbiAgICAgICAgICAgIHZhbHVlOiBvcHRpb24udmFsdWUsXG4gICAgICAgICAgICBvcGVyYXRpb246IG9wdGlvbi5vcGVyYXRvciA/PyBydWxlLm9wZXJhdGlvblxuICAgICAgICB9KTtcbiAgICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy9yYWRpby5maWx0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEseUNBQTZDO0FBRTdDLGtEQUE4QztBQUc5Qyw0Q0FBbUQ7QUFDbkQsa0NBQXFDO0FBQ3JDLHFDQUF3RDtBQXNCeEQsTUFBYSxXQUFZLFNBQVEsZUFBTTtJQUtuQyxZQUFZLFVBQXdEO1FBQ2hFLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUxmLFNBQUksR0FBRyxpQkFBVSxDQUFDLEtBQUssQ0FBQztRQUN4QixjQUFTLEdBQUcsQ0FBQywrQkFBbUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUsvQyxDQUFDO0lBRU0sS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUFXLEVBQUUsSUFBMEI7UUFDMUQsSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ2QsT0FBTztTQUNWO1FBRUQsT0FBTztZQUNILEdBQUcsQ0FBQyxNQUFNLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQ3JDLE9BQU8sRUFBRSxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFDLENBQUMsRUFBQyxFQUFFLENBQUMsQ0FBQztnQkFDcEQsR0FBRyxFQUFFLENBQUMsQ0FBQyxHQUFHO2dCQUNWLElBQUksRUFBRSxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxjQUFjLENBQzdDLElBQUksYUFBSixJQUFJLHVCQUFKLElBQUksQ0FBRSxRQUFRLEVBQ2QsMEJBQVcsQ0FBQyw0QkFBNEIsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUN2RDthQUNKLENBQUMsQ0FBQyxDQUFDO1NBQ1AsQ0FBQztJQUNOLENBQUM7SUFFTSxLQUFLLENBQUMsZUFBZSxDQUFDLElBQW9CO1FBQzdDLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsS0FBSyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDNUQsSUFBSSxDQUFDLE1BQU0sRUFBRTtZQUNULE9BQU8sS0FBSyxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUN0QztRQUVELElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFO1lBQ25CLE9BQU8sS0FBSyxDQUFDLGVBQWUsQ0FBQztnQkFDekIsR0FBRyxJQUFJO2dCQUNQLEtBQUssRUFBRSxNQUFNLENBQUMsS0FBSztnQkFDbkIsU0FBUyxFQUFFLE1BQU0sQ0FBQyxRQUFRLElBQUksSUFBSSxDQUFDLFNBQVM7YUFDL0MsQ0FBQyxDQUFDO1NBQ047UUFFRCxNQUFNLFVBQVUsR0FBRyxFQUFFLENBQUM7UUFDdEIsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQyxTQUFTLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsY0FBRSxDQUFDLEdBQUcsQ0FBQyxFQUFFLFVBQVUsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsY0FBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLFVBQVUsRUFBRSxDQUFDO1FBQ3hHLElBQUksQ0FBQyx3QkFBd0IsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLFVBQVUsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUNsRSxVQUFVLENBQUMsSUFBSSxDQUNYLEtBQUssQ0FBQyxlQUFlLENBQUM7WUFDbEIsR0FBRyxJQUFJO1lBQ1AsS0FBSyxFQUFFLE1BQU0sQ0FBQyxLQUFLO1lBQ25CLFNBQVMsRUFBRSxNQUFNLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxTQUFTO1NBQy9DLENBQUMsQ0FDTCxDQUFDO1FBQ0YsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUVNLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFvQjs7UUFDOUMsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxLQUFLLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM1RCxJQUFJLENBQUMsTUFBTSxFQUFFO1lBQ1QsT0FBTyxLQUFLLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDdkM7UUFFRCxPQUFPLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQztZQUMxQixHQUFHLElBQUk7WUFDUCxLQUFLLEVBQUUsTUFBTSxDQUFDLEtBQUs7WUFDbkIsU0FBUyxFQUFFLE1BQUEsTUFBTSxDQUFDLFFBQVEsbUNBQUksSUFBSSxDQUFDLFNBQVM7U0FDL0MsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztDQUNKO0FBakVELGtDQWlFQyIsImZpbGUiOiJsaWIvZmlsdGVyL2ZpbHRlcnMvcmFkaW8uZmlsdGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgT3AsIFdoZXJlT3B0aW9ucyB9IGZyb20gXCJzZXF1ZWxpemVcIjtcbmltcG9ydCB7IERhdGFGaWx0ZXJVc2VyTW9kZWwsIEZpbHRlckNvbmRpdGlvbiB9IGZyb20gXCIuLi8uLlwiO1xuaW1wb3J0IHsgRmlsdGVyVXRpbHMgfSBmcm9tIFwiLi4vZmlsdGVyLnV0aWxzXCI7XG5pbXBvcnQgeyBRdWVyeVJ1bGVNb2RlbCB9IGZyb20gXCIuLi9tb2RlbHNcIjtcbmltcG9ydCB7IEZpbHRlckJhc2VDb25maWd1cmF0aW9uTW9kZWwgfSBmcm9tIFwiLi4vbW9kZWxzL2ZpbHRlci1jb25maWd1cmF0aW9uLm1vZGVsXCI7XG5pbXBvcnQgeyBGaWx0ZXJPcGVyYXRvclR5cGVzIH0gZnJvbSBcIi4uL29wZXJhdG9yc1wiO1xuaW1wb3J0IHsgRmlsdGVyVHlwZSB9IGZyb20gXCIuLi90eXBlXCI7XG5pbXBvcnQgeyBCYXNlRmlsdGVyRGVmaW5pdGlvbiwgRmlsdGVyIH0gZnJvbSBcIi4vZmlsdGVyXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgUmFkaW9GaWx0ZXJPcHRpb24ge1xuICAgIGtleTogc3RyaW5nO1xuICAgIHZhbHVlOiB1bmtub3duO1xuICAgIG9wZXJhdG9yPzogRmlsdGVyT3BlcmF0b3JUeXBlcztcbiAgICBjb25kaXRpb24/OiBGaWx0ZXJDb25kaXRpb247XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUmFkaW9GaWx0ZXJEZWZpbml0aW9uIHtcbiAgICBvcHRpb25zOiBSYWRpb0ZpbHRlck9wdGlvbltdO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFJhZGlvRmlsdGVyT3B0aW9uQ29uZmlndXJhdGlvbiB7XG4gICAga2V5OiBzdHJpbmc7XG4gICAgbmFtZT86IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBSYWRpb0ZpbHRlckNvbmZpZ3VyYXRpb25Nb2RlbCBleHRlbmRzIEZpbHRlckJhc2VDb25maWd1cmF0aW9uTW9kZWwge1xuICAgIG9wdGlvbnM6IFJhZGlvRmlsdGVyT3B0aW9uQ29uZmlndXJhdGlvbltdO1xufVxuXG5leHBvcnQgY2xhc3MgUmFkaW9GaWx0ZXIgZXh0ZW5kcyBGaWx0ZXIgaW1wbGVtZW50cyBSYWRpb0ZpbHRlckRlZmluaXRpb24ge1xuICAgIHB1YmxpYyB0eXBlID0gRmlsdGVyVHlwZS5SYWRpbztcbiAgICBwdWJsaWMgb3BlcmF0b3JzID0gW0ZpbHRlck9wZXJhdG9yVHlwZXMuRXF1YWxdO1xuICAgIHB1YmxpYyBvcHRpb25zOiBSYWRpb0ZpbHRlck9wdGlvbltdO1xuXG4gICAgY29uc3RydWN0b3IoZGVmaW5pdGlvbjogQmFzZUZpbHRlckRlZmluaXRpb24gJiBSYWRpb0ZpbHRlckRlZmluaXRpb24pIHtcbiAgICAgICAgc3VwZXIoZGVmaW5pdGlvbik7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIGdldENvbmZpZyhrZXk6IHN0cmluZywgdXNlcj86IERhdGFGaWx0ZXJVc2VyTW9kZWwpOiBQcm9taXNlPFJhZGlvRmlsdGVyQ29uZmlndXJhdGlvbk1vZGVsPiB7XG4gICAgICAgIGlmICh0aGlzLnByaXZhdGUpIHtcbiAgICAgICAgICAgIHJldHVybjtcbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiB7XG4gICAgICAgICAgICAuLi4oYXdhaXQgc3VwZXIuZ2V0Q29uZmlnKGtleSwgdXNlcikpLFxuICAgICAgICAgICAgb3B0aW9uczogYXdhaXQgUHJvbWlzZS5hbGwodGhpcy5vcHRpb25zLm1hcChhc3luYyB4ID0+ICh7XG4gICAgICAgICAgICAgICAga2V5OiB4LmtleSxcbiAgICAgICAgICAgICAgICBuYW1lOiBhd2FpdCB0aGlzLl90cmFuc2xhdGVTZXJ2aWNlLmdldFRyYW5zbGF0aW9uKFxuICAgICAgICAgICAgICAgICAgICB1c2VyPy5sYW5ndWFnZSxcbiAgICAgICAgICAgICAgICAgICAgRmlsdGVyVXRpbHMuZ2V0UmFkaW9PcHRpb25UcmFuc2xhdGlvbktleShrZXksIHgua2V5KVxuICAgICAgICAgICAgICAgIClcbiAgICAgICAgICAgIH0pKSlcbiAgICAgICAgfTtcbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgZ2V0V2hlcmVPcHRpb25zKHJ1bGU6IFF1ZXJ5UnVsZU1vZGVsKTogUHJvbWlzZTxXaGVyZU9wdGlvbnM+IHtcbiAgICAgICAgY29uc3Qgb3B0aW9uID0gdGhpcy5vcHRpb25zLmZpbmQoeCA9PiB4LmtleSA9PT0gcnVsZS52YWx1ZSk7XG4gICAgICAgIGlmICghb3B0aW9uKSB7XG4gICAgICAgICAgICByZXR1cm4gc3VwZXIuZ2V0V2hlcmVPcHRpb25zKHJ1bGUpO1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKCFvcHRpb24uY29uZGl0aW9uKSB7XG4gICAgICAgICAgICByZXR1cm4gc3VwZXIuZ2V0V2hlcmVPcHRpb25zKHtcbiAgICAgICAgICAgICAgICAuLi5ydWxlLFxuICAgICAgICAgICAgICAgIHZhbHVlOiBvcHRpb24udmFsdWUsXG4gICAgICAgICAgICAgICAgb3BlcmF0aW9uOiBvcHRpb24ub3BlcmF0b3IgfHwgcnVsZS5vcGVyYXRpb25cbiAgICAgICAgICAgIH0pO1xuICAgICAgICB9XG5cbiAgICAgICAgY29uc3QgY29uZGl0aW9ucyA9IFtdO1xuICAgICAgICBjb25zdCB3aGVyZSA9IG9wdGlvbi5jb25kaXRpb24uY29uZGl0aW9uID09PSBcImFuZFwiID8geyBbT3AuYW5kXTogY29uZGl0aW9ucyB9IDogeyBbT3Aub3JdOiBjb25kaXRpb25zIH07XG4gICAgICAgIHRoaXMuZ2VuZXJhdGVSdWxlV2hlcmVPcHRpb25zKG9wdGlvbi5jb25kaXRpb24sIGNvbmRpdGlvbnMsIHJ1bGUpO1xuICAgICAgICBjb25kaXRpb25zLnB1c2goXG4gICAgICAgICAgICBzdXBlci5nZXRXaGVyZU9wdGlvbnMoe1xuICAgICAgICAgICAgICAgIC4uLnJ1bGUsXG4gICAgICAgICAgICAgICAgdmFsdWU6IG9wdGlvbi52YWx1ZSxcbiAgICAgICAgICAgICAgICBvcGVyYXRpb246IG9wdGlvbi5vcGVyYXRvciB8fCBydWxlLm9wZXJhdGlvblxuICAgICAgICAgICAgfSlcbiAgICAgICAgKTtcbiAgICAgICAgcmV0dXJuIHdoZXJlO1xuICAgIH1cblxuICAgIHB1YmxpYyBhc3luYyBnZXRIYXZpbmdPcHRpb25zKHJ1bGU6IFF1ZXJ5UnVsZU1vZGVsKTogUHJvbWlzZTxXaGVyZU9wdGlvbnM+IHtcbiAgICAgICAgY29uc3Qgb3B0aW9uID0gdGhpcy5vcHRpb25zLmZpbmQoeCA9PiB4LmtleSA9PT0gcnVsZS52YWx1ZSk7XG4gICAgICAgIGlmICghb3B0aW9uKSB7XG4gICAgICAgICAgICByZXR1cm4gc3VwZXIuZ2V0SGF2aW5nT3B0aW9ucyhydWxlKTtcbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiBzdXBlci5nZXRIYXZpbmdPcHRpb25zKHtcbiAgICAgICAgICAgIC4uLnJ1bGUsXG4gICAgICAgICAgICB2YWx1ZTogb3B0aW9uLnZhbHVlLFxuICAgICAgICAgICAgb3BlcmF0aW9uOiBvcHRpb24ub3BlcmF0b3IgPz8gcnVsZS5vcGVyYXRpb25cbiAgICAgICAgfSk7XG4gICAgfVxufVxuIl19

package/lib/filter/filters/select.filter.d.ts

@@ -9,13 +9,13 @@ export interface SelectFilterValue {
 export interface SelectFilterDefinition<T> {
     values: (value: unknown, user?: any) => Promise<SelectFilterValue[]>;
     lazyLoading?: boolean;
-    getResourceById?: (id: number, user?: any) => Promise<SelectFilterValue>;
+    getResourceById?: (id: number | string, user?: any) => Promise<SelectFilterValue>;
 }
 export declare class SelectFilter<T> extends Filter implements SelectFilterDefinition<T> {
     type: FilterType;
     operators: import("../operators").FilterOperatorTypes[];
     values: (value: unknown, user?: any) => Promise<SelectFilterValue[]>;
-    getResourceById: (id: number, user?: any) => Promise<SelectFilterValue>;
+    getResourceById: (id: number | string, user?: any) => Promise<SelectFilterValue>;
     lazyLoading: any;
     constructor(definition: BaseFilterDefinition & SelectFilterDefinition<T>);
     getConfig(key: string, user?: DataFilterUserModel): Promise<FilterBaseConfigurationModel>;

package/lib/filter/filters/select.filter.js

@@ -27,4 +27,4 @@ class SelectFilter extends filter_1.Filter {
 }
 exports.SelectFilter = SelectFilter;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy9zZWxlY3QuZmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLGtDQUFxQztBQUNyQyw0Q0FBK0M7QUFDL0MscUNBQXdEO0FBY3hELE1BQWEsWUFBZ0IsU0FBUSxlQUFNO0lBT3ZDLFlBQVksVUFBNEQ7UUFDcEUsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBUGYsU0FBSSxHQUFHLGlCQUFVLENBQUMsTUFBTSxDQUFDO1FBQ3pCLGNBQVMsR0FBRyxDQUFDLEdBQUcsMkJBQWUsQ0FBQyxDQUFDO1FBUXBDLElBQUksSUFBSSxDQUFDLFdBQVcsS0FBSyxTQUFTLEVBQUU7WUFDaEMsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUM7U0FDM0I7SUFDTCxDQUFDO0lBRU0sS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUFXLEVBQUUsSUFBMEI7UUFDMUQsSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ2QsT0FBTztTQUNWO1FBRUQsTUFBTSxNQUFNLEdBQUcsTUFBTSxLQUFLLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUNoRCxPQUFPO1lBQ0gsR0FBRyxNQUFNO1lBQ1QsTUFBTSxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUM7WUFDN0QsV0FBVyxFQUFFLElBQUksQ0FBQyxXQUFXO1NBQ2hDLENBQUM7SUFDTixDQUFDO0NBQ0o7QUEzQkQsb0NBMkJDIiwiZmlsZSI6ImxpYi9maWx0ZXIvZmlsdGVycy9zZWxlY3QuZmlsdGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRGF0YUZpbHRlclVzZXJNb2RlbCB9IGZyb20gXCIuLi8uLlwiO1xuaW1wb3J0IHsgRmlsdGVyVHlwZSB9IGZyb20gXCIuLi90eXBlXCI7XG5pbXBvcnQgeyBTZWxlY3RPcGVyYXRvcnMgfSBmcm9tIFwiLi4vb3BlcmF0b3JzXCI7XG5pbXBvcnQgeyBCYXNlRmlsdGVyRGVmaW5pdGlvbiwgRmlsdGVyIH0gZnJvbSBcIi4vZmlsdGVyXCI7XG5pbXBvcnQgeyBGaWx0ZXJCYXNlQ29uZmlndXJhdGlvbk1vZGVsIH0gZnJvbSBcIi4uL21vZGVscy9maWx0ZXItY29uZmlndXJhdGlvbi5tb2RlbFwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIFNlbGVjdEZpbHRlclZhbHVlIHtcbiAgICBpZDogbnVtYmVyIHwgc3RyaW5nO1xuICAgIG5hbWU6IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBTZWxlY3RGaWx0ZXJEZWZpbml0aW9uPFQ+IHtcbiAgICB2YWx1ZXM6ICh2YWx1ZTogdW5rbm93biwgdXNlcj86IGFueSkgPT4gUHJvbWlzZTxTZWxlY3RGaWx0ZXJWYWx1ZVtdPjtcbiAgICBsYXp5TG9hZGluZz86IGJvb2xlYW47XG4gICAgZ2V0UmVzb3VyY2VCeUlkPzogKGlkOiBudW1iZXIsIHVzZXI/OiBhbnkpID0+IFByb21pc2U8U2VsZWN0RmlsdGVyVmFsdWU+O1xufVxuXG5leHBvcnQgY2xhc3MgU2VsZWN0RmlsdGVyPFQ+IGV4dGVuZHMgRmlsdGVyIGltcGxlbWVudHMgU2VsZWN0RmlsdGVyRGVmaW5pdGlvbjxUPiB7XG4gICAgcHVibGljIHR5cGUgPSBGaWx0ZXJUeXBlLlNlbGVjdDtcbiAgICBwdWJsaWMgb3BlcmF0b3JzID0gWy4uLlNlbGVjdE9wZXJhdG9yc107XG4gICAgcHVibGljIHZhbHVlczogKHZhbHVlOiB1bmtub3duLCB1c2VyPzogYW55KSA9PiBQcm9taXNlPFNlbGVjdEZpbHRlclZhbHVlW10+O1xuICAgIHB1YmxpYyBnZXRSZXNvdXJjZUJ5SWQ6IChpZDogbnVtYmVyLCB1c2VyPzogYW55KSA9PiBQcm9taXNlPFNlbGVjdEZpbHRlclZhbHVlPjtcbiAgICBwdWJsaWMgbGF6eUxvYWRpbmc7XG5cbiAgICBjb25zdHJ1Y3RvcihkZWZpbml0aW9uOiBCYXNlRmlsdGVyRGVmaW5pdGlvbiAmIFNlbGVjdEZpbHRlckRlZmluaXRpb248VD4pIHtcbiAgICAgICAgc3VwZXIoZGVmaW5pdGlvbik7XG5cbiAgICAgICAgaWYgKHRoaXMubGF6eUxvYWRpbmcgPT09IHVuZGVmaW5lZCkge1xuICAgICAgICAgICAgdGhpcy5sYXp5TG9hZGluZyA9IHRydWU7XG4gICAgICAgIH1cbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgZ2V0Q29uZmlnKGtleTogc3RyaW5nLCB1c2VyPzogRGF0YUZpbHRlclVzZXJNb2RlbCk6IFByb21pc2U8RmlsdGVyQmFzZUNvbmZpZ3VyYXRpb25Nb2RlbD4ge1xuICAgICAgICBpZiAodGhpcy5wcml2YXRlKSB7XG4gICAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBjb25maWcgPSBhd2FpdCBzdXBlci5nZXRDb25maWcoa2V5LCB1c2VyKTtcbiAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgIC4uLmNvbmZpZyxcbiAgICAgICAgICAgIHZhbHVlczogdGhpcy5sYXp5TG9hZGluZyA/IFtdIDogYXdhaXQgdGhpcy52YWx1ZXMobnVsbCwgdXNlciksXG4gICAgICAgICAgICBsYXp5TG9hZGluZzogdGhpcy5sYXp5TG9hZGluZ1xuICAgICAgICB9O1xuICAgIH1cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy9zZWxlY3QuZmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLGtDQUFxQztBQUNyQyw0Q0FBK0M7QUFDL0MscUNBQXdEO0FBY3hELE1BQWEsWUFBZ0IsU0FBUSxlQUFNO0lBT3ZDLFlBQVksVUFBNEQ7UUFDcEUsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBUGYsU0FBSSxHQUFHLGlCQUFVLENBQUMsTUFBTSxDQUFDO1FBQ3pCLGNBQVMsR0FBRyxDQUFDLEdBQUcsMkJBQWUsQ0FBQyxDQUFDO1FBUXBDLElBQUksSUFBSSxDQUFDLFdBQVcsS0FBSyxTQUFTLEVBQUU7WUFDaEMsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUM7U0FDM0I7SUFDTCxDQUFDO0lBRU0sS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUFXLEVBQUUsSUFBMEI7UUFDMUQsSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ2QsT0FBTztTQUNWO1FBRUQsTUFBTSxNQUFNLEdBQUcsTUFBTSxLQUFLLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUNoRCxPQUFPO1lBQ0gsR0FBRyxNQUFNO1lBQ1QsTUFBTSxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUM7WUFDN0QsV0FBVyxFQUFFLElBQUksQ0FBQyxXQUFXO1NBQ2hDLENBQUM7SUFDTixDQUFDO0NBQ0o7QUEzQkQsb0NBMkJDIiwiZmlsZSI6ImxpYi9maWx0ZXIvZmlsdGVycy9zZWxlY3QuZmlsdGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRGF0YUZpbHRlclVzZXJNb2RlbCB9IGZyb20gXCIuLi8uLlwiO1xuaW1wb3J0IHsgRmlsdGVyVHlwZSB9IGZyb20gXCIuLi90eXBlXCI7XG5pbXBvcnQgeyBTZWxlY3RPcGVyYXRvcnMgfSBmcm9tIFwiLi4vb3BlcmF0b3JzXCI7XG5pbXBvcnQgeyBCYXNlRmlsdGVyRGVmaW5pdGlvbiwgRmlsdGVyIH0gZnJvbSBcIi4vZmlsdGVyXCI7XG5pbXBvcnQgeyBGaWx0ZXJCYXNlQ29uZmlndXJhdGlvbk1vZGVsIH0gZnJvbSBcIi4uL21vZGVscy9maWx0ZXItY29uZmlndXJhdGlvbi5tb2RlbFwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIFNlbGVjdEZpbHRlclZhbHVlIHtcbiAgICBpZDogbnVtYmVyIHwgc3RyaW5nO1xuICAgIG5hbWU6IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBTZWxlY3RGaWx0ZXJEZWZpbml0aW9uPFQ+IHtcbiAgICB2YWx1ZXM6ICh2YWx1ZTogdW5rbm93biwgdXNlcj86IGFueSkgPT4gUHJvbWlzZTxTZWxlY3RGaWx0ZXJWYWx1ZVtdPjtcbiAgICBsYXp5TG9hZGluZz86IGJvb2xlYW47XG4gICAgZ2V0UmVzb3VyY2VCeUlkPzogKGlkOiBudW1iZXIgfCBzdHJpbmcsIHVzZXI/OiBhbnkpID0+IFByb21pc2U8U2VsZWN0RmlsdGVyVmFsdWU+O1xufVxuXG5leHBvcnQgY2xhc3MgU2VsZWN0RmlsdGVyPFQ+IGV4dGVuZHMgRmlsdGVyIGltcGxlbWVudHMgU2VsZWN0RmlsdGVyRGVmaW5pdGlvbjxUPiB7XG4gICAgcHVibGljIHR5cGUgPSBGaWx0ZXJUeXBlLlNlbGVjdDtcbiAgICBwdWJsaWMgb3BlcmF0b3JzID0gWy4uLlNlbGVjdE9wZXJhdG9yc107XG4gICAgcHVibGljIHZhbHVlczogKHZhbHVlOiB1bmtub3duLCB1c2VyPzogYW55KSA9PiBQcm9taXNlPFNlbGVjdEZpbHRlclZhbHVlW10+O1xuICAgIHB1YmxpYyBnZXRSZXNvdXJjZUJ5SWQ6IChpZDogbnVtYmVyIHwgc3RyaW5nLCB1c2VyPzogYW55KSA9PiBQcm9taXNlPFNlbGVjdEZpbHRlclZhbHVlPjtcbiAgICBwdWJsaWMgbGF6eUxvYWRpbmc7XG5cbiAgICBjb25zdHJ1Y3RvcihkZWZpbml0aW9uOiBCYXNlRmlsdGVyRGVmaW5pdGlvbiAmIFNlbGVjdEZpbHRlckRlZmluaXRpb248VD4pIHtcbiAgICAgICAgc3VwZXIoZGVmaW5pdGlvbik7XG5cbiAgICAgICAgaWYgKHRoaXMubGF6eUxvYWRpbmcgPT09IHVuZGVmaW5lZCkge1xuICAgICAgICAgICAgdGhpcy5sYXp5TG9hZGluZyA9IHRydWU7XG4gICAgICAgIH1cbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgZ2V0Q29uZmlnKGtleTogc3RyaW5nLCB1c2VyPzogRGF0YUZpbHRlclVzZXJNb2RlbCk6IFByb21pc2U8RmlsdGVyQmFzZUNvbmZpZ3VyYXRpb25Nb2RlbD4ge1xuICAgICAgICBpZiAodGhpcy5wcml2YXRlKSB7XG4gICAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBjb25maWcgPSBhd2FpdCBzdXBlci5nZXRDb25maWcoa2V5LCB1c2VyKTtcbiAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgIC4uLmNvbmZpZyxcbiAgICAgICAgICAgIHZhbHVlczogdGhpcy5sYXp5TG9hZGluZyA/IFtdIDogYXdhaXQgdGhpcy52YWx1ZXMobnVsbCwgdXNlciksXG4gICAgICAgICAgICBsYXp5TG9hZGluZzogdGhpcy5sYXp5TG9hZGluZ1xuICAgICAgICB9O1xuICAgIH1cbn1cbiJdfQ==

package/lib/filter/models/filter-resource-value.model.d.ts

@@ -1,4 +1,4 @@
 export interface FilterResourceValueModel {
     id: string;
-    resourceId: number;
+    resourceId: number | string;
 }

package/lib/filter/models/filter-resource-value.model.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvbW9kZWxzL2ZpbHRlci1yZXNvdXJjZS12YWx1ZS5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwiZmlsZSI6ImxpYi9maWx0ZXIvbW9kZWxzL2ZpbHRlci1yZXNvdXJjZS12YWx1ZS5tb2RlbC5qcyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBpbnRlcmZhY2UgRmlsdGVyUmVzb3VyY2VWYWx1ZU1vZGVsIHtcbiAgICBpZDogc3RyaW5nO1xuICAgIHJlc291cmNlSWQ6IG51bWJlcjtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvbW9kZWxzL2ZpbHRlci1yZXNvdXJjZS12YWx1ZS5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwiZmlsZSI6ImxpYi9maWx0ZXIvbW9kZWxzL2ZpbHRlci1yZXNvdXJjZS12YWx1ZS5tb2RlbC5qcyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBpbnRlcmZhY2UgRmlsdGVyUmVzb3VyY2VWYWx1ZU1vZGVsIHtcbiAgICBpZDogc3RyaW5nO1xuICAgIHJlc291cmNlSWQ6IG51bWJlciB8IHN0cmluZztcbn1cbiJdfQ==

package/lib/utils/xlsx.utils.js

@@ -13,7 +13,7 @@ class XlsxUtils {
         const aoa = rows.map((row) => {
             // Replace undefined values.
             nestjs_common_1.ObjectUtils.forEachProperty(row, (value) => {
-                return value ? value : "N/A";
+                return value !== null && value !== undefined ? value : "N/A";
             });
             return nestjs_common_1.ObjectUtils.objectToArrayOfProperties(row);
         });
@@ -33,4 +33,4 @@ class XlsxUtils {
 }
 exports.XlsxUtils = XlsxUtils;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi91dGlscy94bHN4LnV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDREQUF1RDtBQUN2RCw2QkFBNkI7QUFFN0IsTUFBYSxTQUFTO0lBQ1gsTUFBTSxDQUFDLGlCQUFpQixDQUFDLElBQWMsRUFBRSxJQUFZLEVBQUUsTUFBaUI7UUFDM0UsNkNBQTZDO1FBQzdDLElBQUksQ0FBQSxJQUFJLGFBQUosSUFBSSx1QkFBSixJQUFJLENBQUUsTUFBTSxJQUFHLEVBQUUsRUFBRTtZQUNuQixJQUFJLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7U0FDN0I7UUFFRCw2QkFBNkI7UUFDN0IsTUFBTSxHQUFHLEdBQVksSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQVcsRUFBRSxFQUFFO1lBQzFDLDRCQUE0QjtZQUM1QiwyQkFBVyxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxLQUFVLEVBQUUsRUFBRTtnQkFDNUMsT0FBTyxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO1lBQ2pDLENBQUMsQ0FBQyxDQUFDO1lBRUgsT0FBTywyQkFBVyxDQUFDLHlCQUF5QixDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3RELENBQUMsQ0FBQyxDQUFDO1FBRUgsSUFBSSxNQUFNLEVBQUU7WUFDUixHQUFHLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1NBQ3ZCO1FBRUQsSUFBSSxLQUFLLEdBQUcsRUFBRSxDQUFDO1FBQ2YsS0FBSyxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBRTNDLElBQUksV0FBVyxHQUFXLElBQUksQ0FBQyxLQUFLLENBQ2hDO1lBQ0ksTUFBTSxFQUFFLEtBQUs7WUFDYixVQUFVLEVBQUUsQ0FBQyxJQUFJLENBQUM7U0FDckIsRUFDRDtZQUNJLElBQUksRUFBRSxRQUFRO1NBQ2pCLENBQ0osQ0FBQztRQUVGLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDOUMsQ0FBQztDQUNKO0FBcENELDhCQW9DQyIsImZpbGUiOiJsaWIvdXRpbHMveGxzeC51dGlscy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE9iamVjdFV0aWxzIH0gZnJvbSBcIkByZWN1cnN5dmUvbmVzdGpzLWNvbW1vblwiO1xuaW1wb3J0ICogYXMgeGxzeCBmcm9tIFwieGxzeFwiO1xuXG5leHBvcnQgY2xhc3MgWGxzeFV0aWxzIHtcbiAgICBwdWJsaWMgc3RhdGljIGFycmF5VG9YbHN4QnVmZmVyKHJvd3M6IE9iamVjdFtdLCBuYW1lOiBzdHJpbmcsIGhlYWRlcj86IHN0cmluZ1tdKTogQnVmZmVyIHtcbiAgICAgICAgLy8gU2hlZXQgbmFtZSBjYW5ub3QgYmUgbG9uZ2VyIHRoYW4gMzEgY2hhcnMuXG4gICAgICAgIGlmIChuYW1lPy5sZW5ndGggPiAzMSkge1xuICAgICAgICAgICAgbmFtZSA9IG5hbWUuc3Vic3RyKDAsIDMxKTtcbiAgICAgICAgfVxuXG4gICAgICAgIC8vIENvbnZlcnQgdG8gYXJyYXkgb2YgYXJyYXkuXG4gICAgICAgIGNvbnN0IGFvYTogYW55W11bXSA9IHJvd3MubWFwKChyb3c6IE9iamVjdCkgPT4ge1xuICAgICAgICAgICAgLy8gUmVwbGFjZSB1bmRlZmluZWQgdmFsdWVzLlxuICAgICAgICAgICAgT2JqZWN0VXRpbHMuZm9yRWFjaFByb3BlcnR5KHJvdywgKHZhbHVlOiBhbnkpID0+IHtcbiAgICAgICAgICAgICAgICByZXR1cm4gdmFsdWUgPyB2YWx1ZSA6IFwiTi9BXCI7XG4gICAgICAgICAgICB9KTtcblxuICAgICAgICAgICAgcmV0dXJuIE9iamVjdFV0aWxzLm9iamVjdFRvQXJyYXlPZlByb3BlcnRpZXMocm93KTtcbiAgICAgICAgfSk7XG5cbiAgICAgICAgaWYgKGhlYWRlcikge1xuICAgICAgICAgICAgYW9hLnVuc2hpZnQoaGVhZGVyKTtcbiAgICAgICAgfVxuXG4gICAgICAgIGxldCBzaGVldCA9IHt9O1xuICAgICAgICBzaGVldFtuYW1lXSA9IHhsc3gudXRpbHMuYW9hX3RvX3NoZWV0KGFvYSk7XG5cbiAgICAgICAgbGV0IHhsc3hDb250ZW50OiBzdHJpbmcgPSB4bHN4LndyaXRlKFxuICAgICAgICAgICAge1xuICAgICAgICAgICAgICAgIFNoZWV0czogc2hlZXQsXG4gICAgICAgICAgICAgICAgU2hlZXROYW1lczogW25hbWVdXG4gICAgICAgICAgICB9LFxuICAgICAgICAgICAge1xuICAgICAgICAgICAgICAgIHR5cGU6IFwiYmluYXJ5XCJcbiAgICAgICAgICAgIH1cbiAgICAgICAgKTtcblxuICAgICAgICByZXR1cm4gQnVmZmVyLmZyb20oeGxzeENvbnRlbnQsIFwiYmluYXJ5XCIpO1xuICAgIH1cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi91dGlscy94bHN4LnV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDREQUF1RDtBQUN2RCw2QkFBNkI7QUFFN0IsTUFBYSxTQUFTO0lBQ1gsTUFBTSxDQUFDLGlCQUFpQixDQUFDLElBQWMsRUFBRSxJQUFZLEVBQUUsTUFBaUI7UUFDM0UsNkNBQTZDO1FBQzdDLElBQUksQ0FBQSxJQUFJLGFBQUosSUFBSSx1QkFBSixJQUFJLENBQUUsTUFBTSxJQUFHLEVBQUUsRUFBRTtZQUNuQixJQUFJLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7U0FDN0I7UUFFRCw2QkFBNkI7UUFDN0IsTUFBTSxHQUFHLEdBQVksSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQVcsRUFBRSxFQUFFO1lBQzFDLDRCQUE0QjtZQUM1QiwyQkFBVyxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxLQUFVLEVBQUUsRUFBRTtnQkFDNUMsT0FBTyxLQUFLLEtBQUssSUFBSSxJQUFJLEtBQUssS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO1lBQ2pFLENBQUMsQ0FBQyxDQUFDO1lBRUgsT0FBTywyQkFBVyxDQUFDLHlCQUF5QixDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3RELENBQUMsQ0FBQyxDQUFDO1FBRUgsSUFBSSxNQUFNLEVBQUU7WUFDUixHQUFHLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1NBQ3ZCO1FBRUQsSUFBSSxLQUFLLEdBQUcsRUFBRSxDQUFDO1FBQ2YsS0FBSyxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBRTNDLElBQUksV0FBVyxHQUFXLElBQUksQ0FBQyxLQUFLLENBQ2hDO1lBQ0ksTUFBTSxFQUFFLEtBQUs7WUFDYixVQUFVLEVBQUUsQ0FBQyxJQUFJLENBQUM7U0FDckIsRUFDRDtZQUNJLElBQUksRUFBRSxRQUFRO1NBQ2pCLENBQ0osQ0FBQztRQUVGLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDOUMsQ0FBQztDQUNKO0FBcENELDhCQW9DQyIsImZpbGUiOiJsaWIvdXRpbHMveGxzeC51dGlscy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE9iamVjdFV0aWxzIH0gZnJvbSBcIkByZWN1cnN5dmUvbmVzdGpzLWNvbW1vblwiO1xuaW1wb3J0ICogYXMgeGxzeCBmcm9tIFwieGxzeFwiO1xuXG5leHBvcnQgY2xhc3MgWGxzeFV0aWxzIHtcbiAgICBwdWJsaWMgc3RhdGljIGFycmF5VG9YbHN4QnVmZmVyKHJvd3M6IE9iamVjdFtdLCBuYW1lOiBzdHJpbmcsIGhlYWRlcj86IHN0cmluZ1tdKTogQnVmZmVyIHtcbiAgICAgICAgLy8gU2hlZXQgbmFtZSBjYW5ub3QgYmUgbG9uZ2VyIHRoYW4gMzEgY2hhcnMuXG4gICAgICAgIGlmIChuYW1lPy5sZW5ndGggPiAzMSkge1xuICAgICAgICAgICAgbmFtZSA9IG5hbWUuc3Vic3RyKDAsIDMxKTtcbiAgICAgICAgfVxuXG4gICAgICAgIC8vIENvbnZlcnQgdG8gYXJyYXkgb2YgYXJyYXkuXG4gICAgICAgIGNvbnN0IGFvYTogYW55W11bXSA9IHJvd3MubWFwKChyb3c6IE9iamVjdCkgPT4ge1xuICAgICAgICAgICAgLy8gUmVwbGFjZSB1bmRlZmluZWQgdmFsdWVzLlxuICAgICAgICAgICAgT2JqZWN0VXRpbHMuZm9yRWFjaFByb3BlcnR5KHJvdywgKHZhbHVlOiBhbnkpID0+IHtcbiAgICAgICAgICAgICAgICByZXR1cm4gdmFsdWUgIT09IG51bGwgJiYgdmFsdWUgIT09IHVuZGVmaW5lZCA/IHZhbHVlIDogXCJOL0FcIjtcbiAgICAgICAgICAgIH0pO1xuXG4gICAgICAgICAgICByZXR1cm4gT2JqZWN0VXRpbHMub2JqZWN0VG9BcnJheU9mUHJvcGVydGllcyhyb3cpO1xuICAgICAgICB9KTtcblxuICAgICAgICBpZiAoaGVhZGVyKSB7XG4gICAgICAgICAgICBhb2EudW5zaGlmdChoZWFkZXIpO1xuICAgICAgICB9XG5cbiAgICAgICAgbGV0IHNoZWV0ID0ge307XG4gICAgICAgIHNoZWV0W25hbWVdID0geGxzeC51dGlscy5hb2FfdG9fc2hlZXQoYW9hKTtcblxuICAgICAgICBsZXQgeGxzeENvbnRlbnQ6IHN0cmluZyA9IHhsc3gud3JpdGUoXG4gICAgICAgICAgICB7XG4gICAgICAgICAgICAgICAgU2hlZXRzOiBzaGVldCxcbiAgICAgICAgICAgICAgICBTaGVldE5hbWVzOiBbbmFtZV1cbiAgICAgICAgICAgIH0sXG4gICAgICAgICAgICB7XG4gICAgICAgICAgICAgICAgdHlwZTogXCJiaW5hcnlcIlxuICAgICAgICAgICAgfVxuICAgICAgICApO1xuXG4gICAgICAgIHJldHVybiBCdWZmZXIuZnJvbSh4bHN4Q29udGVudCwgXCJiaW5hcnlcIik7XG4gICAgfVxufVxuIl19

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@recursyve/nestjs-data-filter",
-    "version": "8.1.0",
+    "version": "8.1.3",
     "description": "NestJs DataFilter library",
     "main": "index.js",
     "scripts": {