@recursyve/nestjs-data-filter 8.5.4 → 8.5.5

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

@@ -1,12 +1,11 @@
 import { WhereOptions } from "sequelize";
-import { DataFilterUserModel, FilterOperatorTypes } from "../..";
+import { DataFilterUserModel } from "../../models/user.model";
 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 { CustomOperator, FilterOperators } from "../operators";
+import { QueryModel, QueryRuleModel, Condition } from "../models/query.model";
+import { CustomOperator, FilterOperators, FilterOperatorTypes } from "../operators";
 import { FilterType } from "../type";
-export declare type Condition = "and" | "or";
 export interface FilterConditionRule {
     key: string;
     path?: string;

package/lib/filter/filters/filter.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Filter = void 0;
 const sequelize_1 = require("sequelize");
-const __1 = require("../..");
 const sequelize_utils_1 = require("../../sequelize.utils");
 const filter_utils_1 = require("../filter.utils");
+const operators_1 = require("../operators");
 class Filter {
     constructor(definition) {
         this._type = "filter";
@@ -120,7 +120,7 @@ class Filter {
             const c = rule;
             if (c.condition) {
                 const conditions = [];
-                options.push(c.condition === "and" ? { [sequelize_1.Op.and]: conditions } : { [sequelize_1.Op.or]: [] });
+                options.push(c.condition === "and" ? { [sequelize_1.Op.and]: conditions } : { [sequelize_1.Op.or]: conditions });
                 this.generateRuleWhereOptions(c, conditions, parentRule);
                 continue;
             }
@@ -201,12 +201,12 @@ class Filter {
     }
     transformForJsonArray(rule, name) {
         const colName = this.path ? sequelize_1.Sequelize.col(name) : sequelize_1.Sequelize.literal(name);
-        if (rule.operation === __1.FilterOperatorTypes.Contains || rule.operation === __1.FilterOperatorTypes.NotContains) {
+        if (rule.operation === operators_1.FilterOperatorTypes.Contains || rule.operation === operators_1.FilterOperatorTypes.NotContains) {
             /**
              * We override the rule to use an equal or not equal with a JSON_CONTAINS function
              */
             const newRule = {
-                operation: rule.operation === __1.FilterOperatorTypes.Contains ? __1.FilterOperatorTypes.Equal : __1.FilterOperatorTypes.NotEqual,
+                operation: rule.operation === operators_1.FilterOperatorTypes.Contains ? operators_1.FilterOperatorTypes.Equal : operators_1.FilterOperatorTypes.NotEqual,
                 value: true
             };
             const value = typeof rule.value === "string" ? `"${rule.value}"` : rule.value;
@@ -228,4 +228,4 @@ class Filter {
 }
 exports.Filter = Filter;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/filter/filters/filter.ts"],"names":[],"mappings":";;;AAAA,yCAA8F;AAC9F,6BAAkH;AAGlH,2DAAuD;AACvD,kDAA8C;AAgE9C,MAAsB,MAAM;IA0BxB,YAAsB,UAAiC;QAzB/C,UAAK,GAAG,QAAQ,CAAC;QAmBlB,aAAQ,GAAG,IAAI,CAAC;QAOnB,IAAI,UAAU,EAAE;YACZ,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;SACnC;IACL,CAAC;IAzBD,IAAW,gBAAgB,CAAC,gBAAkC;QAC1D,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;IAC9C,CAAC;IAeM,MAAM,CAAC,QAAQ,CAAC,UAA4B;QAC/C,OAAO,UAAU,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;IAC5C,CAAC;IAQM,YAAY,CAAC,GAAG,QAAkD;QACrE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,eAAe,CAAC,GAAG,QAAkD;QACxE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QAC5E,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,YAAY,CAAC,GAAG,QAAkD;QACrE,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,SAAS,CAAgB,GAAW,EAAE,OAAgB,EAAE,IAA0B;QAC3F,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAO,IAAI,CAAC;SACf;QAED,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE;YAC1D,OAAO,IAAI,CAAC;SACf;QAED,MAAM,MAAM,GAAG;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,SAAS,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;gBACtD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;oBACvB,OAAO;wBACH,EAAE,EAAE,CAAC;wBACL,IAAI,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAC7C,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,EACd,0BAAW,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAC3C;qBACJ,CAAC;iBACL;gBAED,OAAO;oBACH,EAAE,EAAE,CAAC,CAAC,IAAI;oBACV,IAAI,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAC7C,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,EACd,0BAAW,CAAC,+BAA+B,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,CAC3D;iBACJ,CAAC;YACN,CAAC,CAAC,CAAC;SAC0B,CAAC;QAElC,IAAI,IAAI,CAAC,KAAK,EAAE;YACZ,MAAM,CAAC,KAAK,GAAG;gBACX,GAAG,EAAE,IAAI,CAAC,KAAK;gBACf,IAAI,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,EAAE,0BAAW,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACpH,CAAA;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,IAAoB,EAAE,IAAa;QAC5D,IAAI,CAAC,IAAI,EAAE;YACP,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;SACtG;QAED,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAC/B,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;gBACvB,OAAO,KAAK,CAAC;aAChB;YAED,OAAO,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,SAAS,CAAC;QACrC,CAAC,CAAmB,CAAC;QACrB,IAAI,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,QAAQ,EAAE;YACd,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC,QAAQ,CAAC;SAChC;QAED,MAAM,KAAK,GAAG,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,MAAK,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YACtD,IAAI,CAAC,wBAAwB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;YAC3C,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;QAE7E,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3E,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,IAAoB;QAC9C,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACd,OAAO,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;SAC9D;QAED,IAAI,OAAqB,CAAC;QAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YACvB,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;SACzB;aAAM;YACH,MAAM,KAAK,GAAG,gCAAc,CAAC,kBAAkB,CAAC,IAAI,CAAmB,CAAC;YACxE,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;gBAChD,OAAO,GAAG,IAAA,iBAAK,EAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;aACvC;SACJ;QAED,OAAO,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IAEM,gBAAgB,CAAC,KAAiB;QACrC,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,OAAO,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;YAChE,OAAO,KAAK,CAAC;SAChB;QAED,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAChD,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;YAC9B,OAAO,KAAK,CAAC;SAChB;QAED,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;IAClE,CAAC;IAES,wBAAwB,CAAC,KAAmB,EAAE,IAAoB;QACxE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACjB,OAAO,KAAK,CAAC;SAChB;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC;QACvG,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAChE,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,wBAAwB,CAAC,MAAuB,EAAE,OAAuB,EAAE,UAA0B;QAC3G,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE;YAC7B,MAAM,CAAC,GAAG,IAAuB,CAAC;YAClC,IAAI,CAAC,CAAC,SAAS,EAAE;gBACb,MAAM,UAAU,GAAG,EAAE,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACjF,IAAI,CAAC,wBAAwB,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;gBACzD,SAAS;aACZ;YAED,IAAI,CAAC,GAAG,IAA2B,CAAC;YACpC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YACjF,IAAI,OAAO,CAAC,CAAC,KAAK,KAAK,UAAU,EAAE;gBAC/B,CAAC,GAAG;oBACA,GAAG,CAAC;oBACJ,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC;iBACnC,CAAA;aACJ;YACD,OAAO,CAAC,IAAI,CAAC;gBACT,CAAC,IAAI,CAAC,EAAE,gCAAc,CAAC,kBAAkB,CAAC,CAAc,CAAC;aAC5D,CAAC,CAAC;SACN;IACL,CAAC;IAES,wBAAwB,CAAC,QAAyB,EAAE,KAAmB;QAC7E,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAC/B,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;gBACvB,OAAO,KAAK,CAAC;aAChB;YAED,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;QAC/B,CAAC,CAAmB,CAAC;QACrB,IAAI,CAAC,EAAE,EAAE;YACL,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE;YACZ,OAAO,KAAK,CAAC;SAChB;QAED,OAAO,KAAK;YACR,CAAC,CAAC;gBACI,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC;aAC/B;YACH,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC;IACpB,CAAC;IAES,uBAAuB,CAAC,QAAyB,EAAE,KAAmB,EAAE,KAAU;QACxF,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAC/B,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;gBACvB,OAAO,KAAK,CAAC;aAChB;YAED,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;QAC/B,CAAC,CAAmB,CAAC;QACrB,IAAI,CAAC,EAAE,EAAE;YACL,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE;YACX,OAAO,KAAK,CAAC;SAChB;QAED,MAAM,OAAO,GAAG,OAAO,EAAE,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;QAC5E,OAAO,KAAK;YACR,CAAC,CAAC;gBACI,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC;aAC7B;YACH,CAAC,CAAC,OAAO,CAAC;IAClB,CAAC;IAEO,eAAe,CAAC,KAAiB,EAAE,IAAc;QACrD,MAAM,KAAK,GAAqB,EAAE,CAAC;QACnC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE;YAC5B,IAAK,IAAmB,CAAC,SAAS,EAAE;gBAChC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,IAAkB,EAAE,IAAI,CAAC,CAAC,CAAC;aACjE;iBAAM,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAE,IAAuB,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE;gBAC1D,KAAK,CAAC,IAAI,CAAC,IAAsB,CAAC,CAAC;aACtC;SACJ;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,kBAAkB,CAAC,IAAoB,EAAE,IAAY;QACzD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACZ,OAAO;gBACH,CAAC,IAAI,CAAC,EAAE,gCAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC;aAClD,CAAC;SACL;QAED,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;YAC5B,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACjD;QAED,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAEO,qBAAqB,CAAC,IAAoB,EAAE,IAAY;QAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,qBAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1E,IAAI,IAAI,CAAC,SAAS,KAAK,uBAAmB,CAAC,QAAQ,IAAI,IAAI,CAAC,SAAS,KAAK,uBAAmB,CAAC,WAAW,EAAE;YACvG;;eAEG;YACH,MAAM,OAAO,GAAG;gBACZ,SAAS,EAAE,IAAI,CAAC,SAAS,KAAK,uBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,uBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,uBAAmB,CAAC,QAAQ;gBACrH,KAAK,EAAE,IAAI;aACd,CAAA;YAED,MAAM,KAAK,GAAG,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;YAC9E,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;gBAChB,OAAO,IAAA,iBAAK,EAAC,IAAA,cAAE,EAAC,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,gCAAc,CAAC,kBAAkB,CAAC,OAAoB,CAAc,CAAC,CAAA;aAC1I;YACD,OAAO,IAAA,iBAAK,EAAC,IAAA,cAAE,EAAC,eAAe,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,gCAAc,CAAC,kBAAkB,CAAC,OAAoB,CAAc,CAAC,CAAA;SAC1H;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,sBAAsB,CAAC,IAAoB,EAAE,IAAY;QAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,qBAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1E,MAAM,KAAK,GAAG,gCAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAChB,OAAO,qBAAS,CAAC,KAAK,CAAC,qBAAS,CAAC,EAAE,CAAC,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAkB,CAAC,CAAC;SACrG;QAED,OAAO,qBAAS,CAAC,KAAK,CAAC,qBAAS,CAAC,EAAE,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,KAAkB,CAAC,CAAC;IACtF,CAAC;CACJ;AA1RD,wBA0RC","file":"lib/filter/filters/filter.js","sourcesContent":["import { fn, LogicType, Op, Sequelize, where, WhereOperators, WhereOptions } from \"sequelize\";\nimport { DataFilterUserModel, FilterOperatorTypes, SelectFilterGetValuesOptions, SelectFilterValue } 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 EnabledConfig<User = any, Request = any> {\n    user?: User;\n    request?: Request\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    enabled?: ({ user, request }: EnabledConfig) => Promise<boolean>;\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<Request>(key: string, req: Request, 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 enabled?: ({ user, request }: EnabledConfig) => Promise<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<Request = any>(key: string, request: Request, user?: DataFilterUserModel): Promise<FilterBaseConfigurationModel> {\n        if (this.private) {\n            return null;\n        }\n\n        if (this.enabled && !(await this.enabled({ user, request }))) {\n            return null;\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"]}
+//# 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 } from \"../../models/user.model\";\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, Condition } from \"../models/query.model\";\nimport { RuleModel } from \"../models/rule.model\";\nimport { CustomOperator, FilterOperators, FilterOperatorTypes } from \"../operators\";\nimport { FilterType } from \"../type\";\n\n// TODO: Deprecate key to use attribute instead to be consistent 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 EnabledConfig<User = any, Request = any> {\n    user?: User;\n    request?: Request\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    enabled?: ({ user, request }: EnabledConfig) => Promise<boolean>;\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<Request>(key: string, req: Request, 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 enabled?: ({ user, request }: EnabledConfig) => Promise<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<Request = any>(key: string, request: Request, user?: DataFilterUserModel): Promise<FilterBaseConfigurationModel> {\n        if (this.private) {\n            return null;\n        }\n\n        if (this.enabled && !(await this.enabled({ user, request }))) {\n            return null;\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]: conditions });\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.d.ts

@@ -1,10 +1,10 @@
 import { WhereOptions } from "sequelize";
-import { DataFilterUserModel, FilterCondition } from "../..";
+import { DataFilterUserModel } from "../../models/user.model";
 import { QueryRuleModel } from "../models";
 import { FilterBaseConfigurationModel } from "../models/filter-configuration.model";
 import { FilterOperatorTypes } from "../operators";
 import { FilterType } from "../type";
-import { BaseFilterDefinition, Filter } from "./filter";
+import { BaseFilterDefinition, Filter, FilterCondition } from "./filter";
 export interface RadioFilterOption {
     key: string;
     value: unknown;

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

@@ -40,7 +40,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, rule);
-        conditions.push(super.getWhereOptions({
+        conditions.push(await super.getWhereOptions({
             ...rule,
             value: option.value,
             operation: option.operator || rule.operation
@@ -62,4 +62,4 @@ class RadioFilter extends filter_1.Filter {
 }
 exports.RadioFilter = RadioFilter;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy9yYWRpby5maWx0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEseUNBQTZDO0FBRTdDLGtEQUE4QztBQUc5Qyw0Q0FBbUQ7QUFDbkQsa0NBQXFDO0FBQ3JDLHFDQUF3RDtBQXNCeEQsTUFBYSxXQUFZLFNBQVEsZUFBTTtJQUtuQyxZQUFZLFVBQXdEO1FBQ2hFLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUxmLFNBQUksR0FBRyxpQkFBVSxDQUFDLEtBQUssQ0FBQztRQUN4QixjQUFTLEdBQUcsQ0FBQywrQkFBbUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUsvQyxDQUFDO0lBRU0sS0FBSyxDQUFDLFNBQVMsQ0FBVSxHQUFXLEVBQUUsT0FBZ0IsRUFBRSxJQUEwQjtRQUNyRixNQUFNLE1BQU0sR0FBRyxNQUFNLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQztRQUV6RCxJQUFJLENBQUMsTUFBTSxFQUFFO1lBQ1QsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUVELE9BQU87WUFDSCxHQUFHLE1BQU07WUFDVCxPQUFPLEVBQUUsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBQyxDQUFDLEVBQUMsRUFBRSxDQUFDLENBQUM7Z0JBQ3BELEdBQUcsRUFBRSxDQUFDLENBQUMsR0FBRztnQkFDVixJQUFJLEVBQUUsTUFBTSxJQUFJLENBQUMsaUJBQWlCLENBQUMsY0FBYyxDQUM3QyxJQUFJLGFBQUosSUFBSSx1QkFBSixJQUFJLENBQUUsUUFBUSxFQUNkLDBCQUFXLENBQUMsNEJBQTRCLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FDdkQ7YUFDSixDQUFDLENBQUMsQ0FBQztTQUNQLENBQUM7SUFDTixDQUFDO0lBRU0sS0FBSyxDQUFDLGVBQWUsQ0FBQyxJQUFvQjtRQUM3QyxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLEtBQUssSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzVELElBQUksQ0FBQyxNQUFNLEVBQUU7WUFDVCxPQUFPLEtBQUssQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDdEM7UUFFRCxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRTtZQUNuQixPQUFPLEtBQUssQ0FBQyxlQUFlLENBQUM7Z0JBQ3pCLEdBQUcsSUFBSTtnQkFDUCxLQUFLLEVBQUUsTUFBTSxDQUFDLEtBQUs7Z0JBQ25CLFNBQVMsRUFBRSxNQUFNLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxTQUFTO2FBQy9DLENBQUMsQ0FBQztTQUNOO1FBRUQsTUFBTSxVQUFVLEdBQUcsRUFBRSxDQUFDO1FBQ3RCLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsU0FBUyxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLGNBQUUsQ0FBQyxHQUFHLENBQUMsRUFBRSxVQUFVLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLGNBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxVQUFVLEVBQUUsQ0FBQztRQUN4RyxJQUFJLENBQUMsd0JBQXdCLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRSxVQUFVLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDbEUsVUFBVSxDQUFDLElBQUksQ0FDWCxLQUFLLENBQUMsZUFBZSxDQUFDO1lBQ2xCLEdBQUcsSUFBSTtZQUNQLEtBQUssRUFBRSxNQUFNLENBQUMsS0FBSztZQUNuQixTQUFTLEVBQUUsTUFBTSxDQUFDLFFBQVEsSUFBSSxJQUFJLENBQUMsU0FBUztTQUMvQyxDQUFDLENBQ0wsQ0FBQztRQUNGLE9BQU8sS0FBSyxDQUFDO0lBQ2pCLENBQUM7SUFFTSxLQUFLLENBQUMsZ0JBQWdCLENBQUMsSUFBb0I7O1FBQzlDLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsS0FBSyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDNUQsSUFBSSxDQUFDLE1BQU0sRUFBRTtZQUNULE9BQU8sS0FBSyxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxDQUFDO1NBQ3ZDO1FBRUQsT0FBTyxLQUFLLENBQUMsZ0JBQWdCLENBQUM7WUFDMUIsR0FBRyxJQUFJO1lBQ1AsS0FBSyxFQUFFLE1BQU0sQ0FBQyxLQUFLO1lBQ25CLFNBQVMsRUFBRSxNQUFBLE1BQU0sQ0FBQyxRQUFRLG1DQUFJLElBQUksQ0FBQyxTQUFTO1NBQy9DLENBQUMsQ0FBQztJQUNQLENBQUM7Q0FDSjtBQW5FRCxrQ0FtRUMiLCJmaWxlIjoibGliL2ZpbHRlci9maWx0ZXJzL3JhZGlvLmZpbHRlci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE9wLCBXaGVyZU9wdGlvbnMgfSBmcm9tIFwic2VxdWVsaXplXCI7XG5pbXBvcnQgeyBEYXRhRmlsdGVyVXNlck1vZGVsLCBGaWx0ZXJDb25kaXRpb24gfSBmcm9tIFwiLi4vLi5cIjtcbmltcG9ydCB7IEZpbHRlclV0aWxzIH0gZnJvbSBcIi4uL2ZpbHRlci51dGlsc1wiO1xuaW1wb3J0IHsgUXVlcnlSdWxlTW9kZWwgfSBmcm9tIFwiLi4vbW9kZWxzXCI7XG5pbXBvcnQgeyBGaWx0ZXJCYXNlQ29uZmlndXJhdGlvbk1vZGVsIH0gZnJvbSBcIi4uL21vZGVscy9maWx0ZXItY29uZmlndXJhdGlvbi5tb2RlbFwiO1xuaW1wb3J0IHsgRmlsdGVyT3BlcmF0b3JUeXBlcyB9IGZyb20gXCIuLi9vcGVyYXRvcnNcIjtcbmltcG9ydCB7IEZpbHRlclR5cGUgfSBmcm9tIFwiLi4vdHlwZVwiO1xuaW1wb3J0IHsgQmFzZUZpbHRlckRlZmluaXRpb24sIEZpbHRlciB9IGZyb20gXCIuL2ZpbHRlclwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIFJhZGlvRmlsdGVyT3B0aW9uIHtcbiAgICBrZXk6IHN0cmluZztcbiAgICB2YWx1ZTogdW5rbm93bjtcbiAgICBvcGVyYXRvcj86IEZpbHRlck9wZXJhdG9yVHlwZXM7XG4gICAgY29uZGl0aW9uPzogRmlsdGVyQ29uZGl0aW9uO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFJhZGlvRmlsdGVyRGVmaW5pdGlvbiB7XG4gICAgb3B0aW9uczogUmFkaW9GaWx0ZXJPcHRpb25bXTtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBSYWRpb0ZpbHRlck9wdGlvbkNvbmZpZ3VyYXRpb24ge1xuICAgIGtleTogc3RyaW5nO1xuICAgIG5hbWU/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUmFkaW9GaWx0ZXJDb25maWd1cmF0aW9uTW9kZWwgZXh0ZW5kcyBGaWx0ZXJCYXNlQ29uZmlndXJhdGlvbk1vZGVsIHtcbiAgICBvcHRpb25zOiBSYWRpb0ZpbHRlck9wdGlvbkNvbmZpZ3VyYXRpb25bXTtcbn1cblxuZXhwb3J0IGNsYXNzIFJhZGlvRmlsdGVyIGV4dGVuZHMgRmlsdGVyIGltcGxlbWVudHMgUmFkaW9GaWx0ZXJEZWZpbml0aW9uIHtcbiAgICBwdWJsaWMgdHlwZSA9IEZpbHRlclR5cGUuUmFkaW87XG4gICAgcHVibGljIG9wZXJhdG9ycyA9IFtGaWx0ZXJPcGVyYXRvclR5cGVzLkVxdWFsXTtcbiAgICBwdWJsaWMgb3B0aW9uczogUmFkaW9GaWx0ZXJPcHRpb25bXTtcblxuICAgIGNvbnN0cnVjdG9yKGRlZmluaXRpb246IEJhc2VGaWx0ZXJEZWZpbml0aW9uICYgUmFkaW9GaWx0ZXJEZWZpbml0aW9uKSB7XG4gICAgICAgIHN1cGVyKGRlZmluaXRpb24pO1xuICAgIH1cblxuICAgIHB1YmxpYyBhc3luYyBnZXRDb25maWc8UmVxdWVzdD4oa2V5OiBzdHJpbmcsIHJlcXVlc3Q6IFJlcXVlc3QsIHVzZXI/OiBEYXRhRmlsdGVyVXNlck1vZGVsKTogUHJvbWlzZTxSYWRpb0ZpbHRlckNvbmZpZ3VyYXRpb25Nb2RlbD4ge1xuICAgICAgICBjb25zdCBjb25maWcgPSBhd2FpdCBzdXBlci5nZXRDb25maWcoa2V5LCByZXF1ZXN0LCB1c2VyKTtcblxuICAgICAgICBpZiAoIWNvbmZpZykge1xuICAgICAgICAgICAgcmV0dXJuIG51bGw7XG4gICAgICAgIH1cblxuICAgICAgICByZXR1cm4ge1xuICAgICAgICAgICAgLi4uY29uZmlnLFxuICAgICAgICAgICAgb3B0aW9uczogYXdhaXQgUHJvbWlzZS5hbGwodGhpcy5vcHRpb25zLm1hcChhc3luYyB4ID0+ICh7XG4gICAgICAgICAgICAgICAga2V5OiB4LmtleSxcbiAgICAgICAgICAgICAgICBuYW1lOiBhd2FpdCB0aGlzLl90cmFuc2xhdGVTZXJ2aWNlLmdldFRyYW5zbGF0aW9uKFxuICAgICAgICAgICAgICAgICAgICB1c2VyPy5sYW5ndWFnZSxcbiAgICAgICAgICAgICAgICAgICAgRmlsdGVyVXRpbHMuZ2V0UmFkaW9PcHRpb25UcmFuc2xhdGlvbktleShrZXksIHgua2V5KVxuICAgICAgICAgICAgICAgIClcbiAgICAgICAgICAgIH0pKSlcbiAgICAgICAgfTtcbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgZ2V0V2hlcmVPcHRpb25zKHJ1bGU6IFF1ZXJ5UnVsZU1vZGVsKTogUHJvbWlzZTxXaGVyZU9wdGlvbnM+IHtcbiAgICAgICAgY29uc3Qgb3B0aW9uID0gdGhpcy5vcHRpb25zLmZpbmQoeCA9PiB4LmtleSA9PT0gcnVsZS52YWx1ZSk7XG4gICAgICAgIGlmICghb3B0aW9uKSB7XG4gICAgICAgICAgICByZXR1cm4gc3VwZXIuZ2V0V2hlcmVPcHRpb25zKHJ1bGUpO1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKCFvcHRpb24uY29uZGl0aW9uKSB7XG4gICAgICAgICAgICByZXR1cm4gc3VwZXIuZ2V0V2hlcmVPcHRpb25zKHtcbiAgICAgICAgICAgICAgICAuLi5ydWxlLFxuICAgICAgICAgICAgICAgIHZhbHVlOiBvcHRpb24udmFsdWUsXG4gICAgICAgICAgICAgICAgb3BlcmF0aW9uOiBvcHRpb24ub3BlcmF0b3IgfHwgcnVsZS5vcGVyYXRpb25cbiAgICAgICAgICAgIH0pO1xuICAgICAgICB9XG5cbiAgICAgICAgY29uc3QgY29uZGl0aW9ucyA9IFtdO1xuICAgICAgICBjb25zdCB3aGVyZSA9IG9wdGlvbi5jb25kaXRpb24uY29uZGl0aW9uID09PSBcImFuZFwiID8geyBbT3AuYW5kXTogY29uZGl0aW9ucyB9IDogeyBbT3Aub3JdOiBjb25kaXRpb25zIH07XG4gICAgICAgIHRoaXMuZ2VuZXJhdGVSdWxlV2hlcmVPcHRpb25zKG9wdGlvbi5jb25kaXRpb24sIGNvbmRpdGlvbnMsIHJ1bGUpO1xuICAgICAgICBjb25kaXRpb25zLnB1c2goXG4gICAgICAgICAgICBzdXBlci5nZXRXaGVyZU9wdGlvbnMoe1xuICAgICAgICAgICAgICAgIC4uLnJ1bGUsXG4gICAgICAgICAgICAgICAgdmFsdWU6IG9wdGlvbi52YWx1ZSxcbiAgICAgICAgICAgICAgICBvcGVyYXRpb246IG9wdGlvbi5vcGVyYXRvciB8fCBydWxlLm9wZXJhdGlvblxuICAgICAgICAgICAgfSlcbiAgICAgICAgKTtcbiAgICAgICAgcmV0dXJuIHdoZXJlO1xuICAgIH1cblxuICAgIHB1YmxpYyBhc3luYyBnZXRIYXZpbmdPcHRpb25zKHJ1bGU6IFF1ZXJ5UnVsZU1vZGVsKTogUHJvbWlzZTxXaGVyZU9wdGlvbnM+IHtcbiAgICAgICAgY29uc3Qgb3B0aW9uID0gdGhpcy5vcHRpb25zLmZpbmQoeCA9PiB4LmtleSA9PT0gcnVsZS52YWx1ZSk7XG4gICAgICAgIGlmICghb3B0aW9uKSB7XG4gICAgICAgICAgICByZXR1cm4gc3VwZXIuZ2V0SGF2aW5nT3B0aW9ucyhydWxlKTtcbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiBzdXBlci5nZXRIYXZpbmdPcHRpb25zKHtcbiAgICAgICAgICAgIC4uLnJ1bGUsXG4gICAgICAgICAgICB2YWx1ZTogb3B0aW9uLnZhbHVlLFxuICAgICAgICAgICAgb3BlcmF0aW9uOiBvcHRpb24ub3BlcmF0b3IgPz8gcnVsZS5vcGVyYXRpb25cbiAgICAgICAgfSk7XG4gICAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy9yYWRpby5maWx0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEseUNBQTZDO0FBRTdDLGtEQUE4QztBQUc5Qyw0Q0FBbUQ7QUFDbkQsa0NBQXFDO0FBQ3JDLHFDQUF5RTtBQXNCekUsTUFBYSxXQUFZLFNBQVEsZUFBTTtJQUtuQyxZQUFZLFVBQXdEO1FBQ2hFLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUxmLFNBQUksR0FBRyxpQkFBVSxDQUFDLEtBQUssQ0FBQztRQUN4QixjQUFTLEdBQUcsQ0FBQywrQkFBbUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUsvQyxDQUFDO0lBRU0sS0FBSyxDQUFDLFNBQVMsQ0FBVSxHQUFXLEVBQUUsT0FBZ0IsRUFBRSxJQUEwQjtRQUNyRixNQUFNLE1BQU0sR0FBRyxNQUFNLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQztRQUV6RCxJQUFJLENBQUMsTUFBTSxFQUFFO1lBQ1QsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUVELE9BQU87WUFDSCxHQUFHLE1BQU07WUFDVCxPQUFPLEVBQUUsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBQyxDQUFDLEVBQUMsRUFBRSxDQUFDLENBQUM7Z0JBQ3BELEdBQUcsRUFBRSxDQUFDLENBQUMsR0FBRztnQkFDVixJQUFJLEVBQUUsTUFBTSxJQUFJLENBQUMsaUJBQWlCLENBQUMsY0FBYyxDQUM3QyxJQUFJLGFBQUosSUFBSSx1QkFBSixJQUFJLENBQUUsUUFBUSxFQUNkLDBCQUFXLENBQUMsNEJBQTRCLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FDdkQ7YUFDSixDQUFDLENBQUMsQ0FBQztTQUNQLENBQUM7SUFDTixDQUFDO0lBRU0sS0FBSyxDQUFDLGVBQWUsQ0FBQyxJQUFvQjtRQUM3QyxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLEtBQUssSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzVELElBQUksQ0FBQyxNQUFNLEVBQUU7WUFDVCxPQUFPLEtBQUssQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDdEM7UUFFRCxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRTtZQUNuQixPQUFPLEtBQUssQ0FBQyxlQUFlLENBQUM7Z0JBQ3pCLEdBQUcsSUFBSTtnQkFDUCxLQUFLLEVBQUUsTUFBTSxDQUFDLEtBQUs7Z0JBQ25CLFNBQVMsRUFBRSxNQUFNLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxTQUFTO2FBQy9DLENBQUMsQ0FBQztTQUNOO1FBRUQsTUFBTSxVQUFVLEdBQUcsRUFBRSxDQUFDO1FBQ3RCLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsU0FBUyxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLGNBQUUsQ0FBQyxHQUFHLENBQUMsRUFBRSxVQUFVLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLGNBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxVQUFVLEVBQUUsQ0FBQztRQUN4RyxJQUFJLENBQUMsd0JBQXdCLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRSxVQUFVLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDbEUsVUFBVSxDQUFDLElBQUksQ0FDWCxNQUFNLEtBQUssQ0FBQyxlQUFlLENBQUM7WUFDeEIsR0FBRyxJQUFJO1lBQ1AsS0FBSyxFQUFFLE1BQU0sQ0FBQyxLQUFLO1lBQ25CLFNBQVMsRUFBRSxNQUFNLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxTQUFTO1NBQy9DLENBQUMsQ0FDTCxDQUFDO1FBQ0YsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUVNLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFvQjs7UUFDOUMsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxLQUFLLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM1RCxJQUFJLENBQUMsTUFBTSxFQUFFO1lBQ1QsT0FBTyxLQUFLLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDdkM7UUFFRCxPQUFPLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQztZQUMxQixHQUFHLElBQUk7WUFDUCxLQUFLLEVBQUUsTUFBTSxDQUFDLEtBQUs7WUFDbkIsU0FBUyxFQUFFLE1BQUEsTUFBTSxDQUFDLFFBQVEsbUNBQUksSUFBSSxDQUFDLFNBQVM7U0FDL0MsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztDQUNKO0FBbkVELGtDQW1FQyIsImZpbGUiOiJsaWIvZmlsdGVyL2ZpbHRlcnMvcmFkaW8uZmlsdGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgT3AsIFdoZXJlT3B0aW9ucyB9IGZyb20gXCJzZXF1ZWxpemVcIjtcbmltcG9ydCB7IERhdGFGaWx0ZXJVc2VyTW9kZWwgfSBmcm9tIFwiLi4vLi4vbW9kZWxzL3VzZXIubW9kZWxcIjtcbmltcG9ydCB7IEZpbHRlclV0aWxzIH0gZnJvbSBcIi4uL2ZpbHRlci51dGlsc1wiO1xuaW1wb3J0IHsgUXVlcnlSdWxlTW9kZWwgfSBmcm9tIFwiLi4vbW9kZWxzXCI7XG5pbXBvcnQgeyBGaWx0ZXJCYXNlQ29uZmlndXJhdGlvbk1vZGVsIH0gZnJvbSBcIi4uL21vZGVscy9maWx0ZXItY29uZmlndXJhdGlvbi5tb2RlbFwiO1xuaW1wb3J0IHsgRmlsdGVyT3BlcmF0b3JUeXBlcyB9IGZyb20gXCIuLi9vcGVyYXRvcnNcIjtcbmltcG9ydCB7IEZpbHRlclR5cGUgfSBmcm9tIFwiLi4vdHlwZVwiO1xuaW1wb3J0IHsgQmFzZUZpbHRlckRlZmluaXRpb24sIEZpbHRlciwgRmlsdGVyQ29uZGl0aW9uIH0gZnJvbSBcIi4vZmlsdGVyXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgUmFkaW9GaWx0ZXJPcHRpb24ge1xuICAgIGtleTogc3RyaW5nO1xuICAgIHZhbHVlOiB1bmtub3duO1xuICAgIG9wZXJhdG9yPzogRmlsdGVyT3BlcmF0b3JUeXBlcztcbiAgICBjb25kaXRpb24/OiBGaWx0ZXJDb25kaXRpb247XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUmFkaW9GaWx0ZXJEZWZpbml0aW9uIHtcbiAgICBvcHRpb25zOiBSYWRpb0ZpbHRlck9wdGlvbltdO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFJhZGlvRmlsdGVyT3B0aW9uQ29uZmlndXJhdGlvbiB7XG4gICAga2V5OiBzdHJpbmc7XG4gICAgbmFtZT86IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBSYWRpb0ZpbHRlckNvbmZpZ3VyYXRpb25Nb2RlbCBleHRlbmRzIEZpbHRlckJhc2VDb25maWd1cmF0aW9uTW9kZWwge1xuICAgIG9wdGlvbnM6IFJhZGlvRmlsdGVyT3B0aW9uQ29uZmlndXJhdGlvbltdO1xufVxuXG5leHBvcnQgY2xhc3MgUmFkaW9GaWx0ZXIgZXh0ZW5kcyBGaWx0ZXIgaW1wbGVtZW50cyBSYWRpb0ZpbHRlckRlZmluaXRpb24ge1xuICAgIHB1YmxpYyB0eXBlID0gRmlsdGVyVHlwZS5SYWRpbztcbiAgICBwdWJsaWMgb3BlcmF0b3JzID0gW0ZpbHRlck9wZXJhdG9yVHlwZXMuRXF1YWxdO1xuICAgIHB1YmxpYyBvcHRpb25zOiBSYWRpb0ZpbHRlck9wdGlvbltdO1xuXG4gICAgY29uc3RydWN0b3IoZGVmaW5pdGlvbjogQmFzZUZpbHRlckRlZmluaXRpb24gJiBSYWRpb0ZpbHRlckRlZmluaXRpb24pIHtcbiAgICAgICAgc3VwZXIoZGVmaW5pdGlvbik7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIGdldENvbmZpZzxSZXF1ZXN0PihrZXk6IHN0cmluZywgcmVxdWVzdDogUmVxdWVzdCwgdXNlcj86IERhdGFGaWx0ZXJVc2VyTW9kZWwpOiBQcm9taXNlPFJhZGlvRmlsdGVyQ29uZmlndXJhdGlvbk1vZGVsPiB7XG4gICAgICAgIGNvbnN0IGNvbmZpZyA9IGF3YWl0IHN1cGVyLmdldENvbmZpZyhrZXksIHJlcXVlc3QsIHVzZXIpO1xuXG4gICAgICAgIGlmICghY29uZmlnKSB7XG4gICAgICAgICAgICByZXR1cm4gbnVsbDtcbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiB7XG4gICAgICAgICAgICAuLi5jb25maWcsXG4gICAgICAgICAgICBvcHRpb25zOiBhd2FpdCBQcm9taXNlLmFsbCh0aGlzLm9wdGlvbnMubWFwKGFzeW5jIHggPT4gKHtcbiAgICAgICAgICAgICAgICBrZXk6IHgua2V5LFxuICAgICAgICAgICAgICAgIG5hbWU6IGF3YWl0IHRoaXMuX3RyYW5zbGF0ZVNlcnZpY2UuZ2V0VHJhbnNsYXRpb24oXG4gICAgICAgICAgICAgICAgICAgIHVzZXI/Lmxhbmd1YWdlLFxuICAgICAgICAgICAgICAgICAgICBGaWx0ZXJVdGlscy5nZXRSYWRpb09wdGlvblRyYW5zbGF0aW9uS2V5KGtleSwgeC5rZXkpXG4gICAgICAgICAgICAgICAgKVxuICAgICAgICAgICAgfSkpKVxuICAgICAgICB9O1xuICAgIH1cblxuICAgIHB1YmxpYyBhc3luYyBnZXRXaGVyZU9wdGlvbnMocnVsZTogUXVlcnlSdWxlTW9kZWwpOiBQcm9taXNlPFdoZXJlT3B0aW9ucz4ge1xuICAgICAgICBjb25zdCBvcHRpb24gPSB0aGlzLm9wdGlvbnMuZmluZCh4ID0+IHgua2V5ID09PSBydWxlLnZhbHVlKTtcbiAgICAgICAgaWYgKCFvcHRpb24pIHtcbiAgICAgICAgICAgIHJldHVybiBzdXBlci5nZXRXaGVyZU9wdGlvbnMocnVsZSk7XG4gICAgICAgIH1cblxuICAgICAgICBpZiAoIW9wdGlvbi5jb25kaXRpb24pIHtcbiAgICAgICAgICAgIHJldHVybiBzdXBlci5nZXRXaGVyZU9wdGlvbnMoe1xuICAgICAgICAgICAgICAgIC4uLnJ1bGUsXG4gICAgICAgICAgICAgICAgdmFsdWU6IG9wdGlvbi52YWx1ZSxcbiAgICAgICAgICAgICAgICBvcGVyYXRpb246IG9wdGlvbi5vcGVyYXRvciB8fCBydWxlLm9wZXJhdGlvblxuICAgICAgICAgICAgfSk7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBjb25kaXRpb25zID0gW107XG4gICAgICAgIGNvbnN0IHdoZXJlID0gb3B0aW9uLmNvbmRpdGlvbi5jb25kaXRpb24gPT09IFwiYW5kXCIgPyB7IFtPcC5hbmRdOiBjb25kaXRpb25zIH0gOiB7IFtPcC5vcl06IGNvbmRpdGlvbnMgfTtcbiAgICAgICAgdGhpcy5nZW5lcmF0ZVJ1bGVXaGVyZU9wdGlvbnMob3B0aW9uLmNvbmRpdGlvbiwgY29uZGl0aW9ucywgcnVsZSk7XG4gICAgICAgIGNvbmRpdGlvbnMucHVzaChcbiAgICAgICAgICAgIGF3YWl0IHN1cGVyLmdldFdoZXJlT3B0aW9ucyh7XG4gICAgICAgICAgICAgICAgLi4ucnVsZSxcbiAgICAgICAgICAgICAgICB2YWx1ZTogb3B0aW9uLnZhbHVlLFxuICAgICAgICAgICAgICAgIG9wZXJhdGlvbjogb3B0aW9uLm9wZXJhdG9yIHx8IHJ1bGUub3BlcmF0aW9uXG4gICAgICAgICAgICB9KVxuICAgICAgICApO1xuICAgICAgICByZXR1cm4gd2hlcmU7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIGdldEhhdmluZ09wdGlvbnMocnVsZTogUXVlcnlSdWxlTW9kZWwpOiBQcm9taXNlPFdoZXJlT3B0aW9ucz4ge1xuICAgICAgICBjb25zdCBvcHRpb24gPSB0aGlzLm9wdGlvbnMuZmluZCh4ID0+IHgua2V5ID09PSBydWxlLnZhbHVlKTtcbiAgICAgICAgaWYgKCFvcHRpb24pIHtcbiAgICAgICAgICAgIHJldHVybiBzdXBlci5nZXRIYXZpbmdPcHRpb25zKHJ1bGUpO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIHN1cGVyLmdldEhhdmluZ09wdGlvbnMoe1xuICAgICAgICAgICAgLi4ucnVsZSxcbiAgICAgICAgICAgIHZhbHVlOiBvcHRpb24udmFsdWUsXG4gICAgICAgICAgICBvcGVyYXRpb246IG9wdGlvbi5vcGVyYXRvciA/PyBydWxlLm9wZXJhdGlvblxuICAgICAgICB9KTtcbiAgICB9XG59XG4iXX0=

package/lib/filter/index.d.ts

@@ -3,7 +3,6 @@ export * from "./models";
 export * from "./order-rules";
 export * from "./filter.service";
 export * from "./base-filter";
-export * from "./filter.service";
 export * from "./controllers/dynamic-filter.controller";
 export * from "./controllers/filter.controller";
 export * from "./decorators/inject-filter.decorator";

package/lib/filter/index.js

@@ -15,7 +15,6 @@ __exportStar(require("./models"), exports);
 __exportStar(require("./order-rules"), exports);
 __exportStar(require("./filter.service"), exports);
 __exportStar(require("./base-filter"), exports);
-__exportStar(require("./filter.service"), exports);
 __exportStar(require("./controllers/dynamic-filter.controller"), exports);
 __exportStar(require("./controllers/filter.controller"), exports);
 __exportStar(require("./decorators/inject-filter.decorator"), exports);
@@ -23,4 +22,4 @@ __exportStar(require("./filter.utils"), exports);
 __exportStar(require("./operators"), exports);
 __exportStar(require("./type"), exports);
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsNENBQTBCO0FBQzFCLDJDQUF5QjtBQUN6QixnREFBNkI7QUFDN0IsbURBQWlDO0FBQ2pDLGdEQUE2QjtBQUM3QixtREFBZ0M7QUFDaEMsMEVBQXVEO0FBQ3ZELGtFQUErQztBQUMvQyx1RUFBb0Q7QUFDcEQsaURBQThCO0FBQzlCLDhDQUEyQjtBQUMzQix5Q0FBc0IiLCJmaWxlIjoibGliL2ZpbHRlci9pbmRleC5qcyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCAqIGZyb20gXCIuL2ZpbHRlcnNcIjtcbmV4cG9ydCAqIGZyb20gXCIuL21vZGVsc1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vb3JkZXItcnVsZXNcIlxuZXhwb3J0ICogZnJvbSBcIi4vZmlsdGVyLnNlcnZpY2VcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2Jhc2UtZmlsdGVyXCJcbmV4cG9ydCAqIGZyb20gXCIuL2ZpbHRlci5zZXJ2aWNlXCJcbmV4cG9ydCAqIGZyb20gXCIuL2NvbnRyb2xsZXJzL2R5bmFtaWMtZmlsdGVyLmNvbnRyb2xsZXJcIlxuZXhwb3J0ICogZnJvbSBcIi4vY29udHJvbGxlcnMvZmlsdGVyLmNvbnRyb2xsZXJcIlxuZXhwb3J0ICogZnJvbSBcIi4vZGVjb3JhdG9ycy9pbmplY3QtZmlsdGVyLmRlY29yYXRvclwiXG5leHBvcnQgKiBmcm9tIFwiLi9maWx0ZXIudXRpbHNcIlxuZXhwb3J0ICogZnJvbSBcIi4vb3BlcmF0b3JzXCJcbmV4cG9ydCAqIGZyb20gXCIuL3R5cGVcIlxuIl19
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsNENBQTBCO0FBQzFCLDJDQUF5QjtBQUN6QixnREFBNkI7QUFDN0IsbURBQWlDO0FBQ2pDLGdEQUE2QjtBQUM3QiwwRUFBdUQ7QUFDdkQsa0VBQStDO0FBQy9DLHVFQUFvRDtBQUNwRCxpREFBOEI7QUFDOUIsOENBQTJCO0FBQzNCLHlDQUFzQiIsImZpbGUiOiJsaWIvZmlsdGVyL2luZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSBcIi4vZmlsdGVyc1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vbW9kZWxzXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9vcmRlci1ydWxlc1wiXG5leHBvcnQgKiBmcm9tIFwiLi9maWx0ZXIuc2VydmljZVwiO1xuZXhwb3J0ICogZnJvbSBcIi4vYmFzZS1maWx0ZXJcIlxuZXhwb3J0ICogZnJvbSBcIi4vY29udHJvbGxlcnMvZHluYW1pYy1maWx0ZXIuY29udHJvbGxlclwiXG5leHBvcnQgKiBmcm9tIFwiLi9jb250cm9sbGVycy9maWx0ZXIuY29udHJvbGxlclwiXG5leHBvcnQgKiBmcm9tIFwiLi9kZWNvcmF0b3JzL2luamVjdC1maWx0ZXIuZGVjb3JhdG9yXCJcbmV4cG9ydCAqIGZyb20gXCIuL2ZpbHRlci51dGlsc1wiXG5leHBvcnQgKiBmcm9tIFwiLi9vcGVyYXRvcnNcIlxuZXhwb3J0ICogZnJvbSBcIi4vdHlwZVwiXG4iXX0=

package/lib/filter/models/query.model.d.ts

@@ -1,5 +1,5 @@
-import { Condition } from "../filters/filter";
 import { RuleModel } from "./rule.model";
+export declare type Condition = "and" | "or";
 export interface QueryRuleModel extends RuleModel {
     id: string;
 }

package/lib/filter/models/query.model.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@recursyve/nestjs-data-filter",
-    "version": "8.5.4",
+    "version": "8.5.5",
     "description": "NestJs DataFilter library",
     "main": "index.js",
     "scripts": {
@@ -33,7 +33,7 @@
         "@nestjs/testing": "^8.2.6",
         "@recursyve/nestjs-common": "^8.0.4",
         "@types/express": "^4.17.13",
-        "@types/jest": "^27.4.0",
+        "@types/jest": "^29.2.3",
         "@types/node": "^17.0.15",
         "class-transformer": "^0.5.1",
         "class-validator": "^0.13.2",
@@ -44,14 +44,14 @@
         "gulp-copy": "^4.0.1",
         "gulp-sourcemaps": "^3.0.0",
         "gulp-typescript": "^6.0.0-alpha.1",
-        "jest": "^27.5.0",
+        "jest": "^29.3.1",
         "reflect-metadata": "^0.1.13",
         "rxjs": "^7.5.2",
         "sequelize": "^6.19.0",
         "sequelize-typescript": "^2.1.3",
-        "sqlite3": "^5.0.2",
-        "ts-jest": "^27.1.3",
-        "ts-node": "^10.4.0",
+        "sqlite3": "^5.1.2",
+        "ts-jest": "^29.0.3",
+        "ts-node": "^10.9.1",
         "typescript": "^4.5.5"
     },
     "jest": {

package/lib/filter/filters/json-array.filter.d.ts

@@ -1,16 +0,0 @@
-import { WhereOptions } from "sequelize";
-import { FilterOperatorTypes, QueryRuleModel } from "../..";
-import { FilterType } from "../type";
-import { BaseFilterDefinition, Filter } from "./filter";
-export interface JsonArrayFilterDefinition {
-    jsonPath?: string;
-}
-export declare class JsonArrayFilter extends Filter {
-    type: FilterType;
-    operators: FilterOperatorTypes[];
-    jsonPath?: string;
-    constructor(definition: JsonArrayFilterDefinition & BaseFilterDefinition);
-    getWhereOptions(rule: QueryRuleModel, name?: string): Promise<WhereOptions>;
-    private generateEqualsLikeOptions;
-    private generateContainsLikeOptions;
-}

package/lib/filter/filters/json-array.filter.js

@@ -1,58 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonArrayFilter = void 0;
-const sequelize_1 = require("sequelize");
-const __1 = require("../..");
-const sequelize_utils_1 = require("../../sequelize.utils");
-const type_1 = require("../type");
-const filter_1 = require("./filter");
-class JsonArrayFilter extends filter_1.Filter {
-    constructor(definition) {
-        super(definition);
-        this.type = type_1.FilterType.JsonArray;
-        this.operators = [...__1.JsonArrayOperators];
-    }
-    async getWhereOptions(rule, name) {
-        if (!name) {
-            name = this.path ? sequelize_utils_1.SequelizeUtils.getAttributeFullName(this.attribute, this.path) : this.attribute;
-        }
-        if (rule.operation === __1.FilterOperatorTypes.Equal || rule.operation === __1.FilterOperatorTypes.NotEqual) {
-            return this.generateEqualsLikeOptions(rule, name);
-        }
-        return this.generateContainsLikeOptions(rule, name);
-    }
-    async generateEqualsLikeOptions(rule, name) {
-        const newRule = {
-            ...rule,
-            value: (0, sequelize_1.fn)("JSON_ARRAY", rule.value)
-        };
-        if (!this.jsonPath) {
-            return {
-                [name]: sequelize_utils_1.SequelizeUtils.generateWhereValue(newRule)
-            };
-        }
-        const colName = this.path ? (0, sequelize_1.col)(name) : (0, sequelize_1.literal)(name);
-        if (this.jsonPath) {
-            return (0, sequelize_1.where)((0, sequelize_1.fn)("JSON_EXTRACT", colName, this.jsonPath), sequelize_utils_1.SequelizeUtils.generateWhereValue(newRule));
-        }
-        return (0, sequelize_1.where)((0, sequelize_1.fn)("JSON_EXTRACT", colName), sequelize_utils_1.SequelizeUtils.generateWhereValue(newRule));
-    }
-    async generateContainsLikeOptions(rule, name) {
-        const value = typeof rule.value === "string" ? `"${rule.value}"` : rule.value;
-        /**
-         * We override the rule to use an equal or not equal with a JSON_CONTAINS function
-         */
-        const newRule = {
-            operation: rule.operation === __1.FilterOperatorTypes.Contains ? __1.FilterOperatorTypes.Equal : __1.FilterOperatorTypes.NotEqual,
-            value: true
-        };
-        const colName = this.path ? (0, sequelize_1.col)(name) : (0, sequelize_1.literal)(name);
-        if (this.jsonPath) {
-            return (0, sequelize_1.where)((0, sequelize_1.fn)("JSON_CONTAINS", colName, value, this.jsonPath), sequelize_utils_1.SequelizeUtils.generateWhereValue(newRule));
-        }
-        return (0, sequelize_1.where)((0, sequelize_1.fn)("JSON_CONTAINS", colName, value), sequelize_utils_1.SequelizeUtils.generateWhereValue(newRule));
-    }
-}
-exports.JsonArrayFilter = JsonArrayFilter;
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy9qc29uLWFycmF5LmZpbHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5Q0FBNkU7QUFDN0UsNkJBQTJGO0FBQzNGLDJEQUF1RDtBQUN2RCxrQ0FBcUM7QUFDckMscUNBQXdEO0FBTXhELE1BQWEsZUFBZ0IsU0FBUSxlQUFNO0lBS3ZDLFlBQVksVUFBNEQ7UUFDcEUsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBTGYsU0FBSSxHQUFHLGlCQUFVLENBQUMsU0FBUyxDQUFDO1FBQzVCLGNBQVMsR0FBRyxDQUFDLEdBQUcsc0JBQWtCLENBQUMsQ0FBQztJQUszQyxDQUFDO0lBRU0sS0FBSyxDQUFDLGVBQWUsQ0FBQyxJQUFvQixFQUFFLElBQWE7UUFDNUQsSUFBSSxDQUFDLElBQUksRUFBRTtZQUNQLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxnQ0FBYyxDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDO1NBQ3RHO1FBRUQsSUFBSSxJQUFJLENBQUMsU0FBUyxLQUFLLHVCQUFtQixDQUFDLEtBQUssSUFBSSxJQUFJLENBQUMsU0FBUyxLQUFLLHVCQUFtQixDQUFDLFFBQVEsRUFBRTtZQUNqRyxPQUFPLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7U0FDckQ7UUFFRCxPQUFPLElBQUksQ0FBQywyQkFBMkIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDeEQsQ0FBQztJQUVPLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxJQUFvQixFQUFFLElBQVk7UUFDdEUsTUFBTSxPQUFPLEdBQUc7WUFDWixHQUFHLElBQUk7WUFDUCxLQUFLLEVBQUUsSUFBQSxjQUFFLEVBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUM7U0FDdEMsQ0FBQztRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ2hCLE9BQU87Z0JBQ0gsQ0FBQyxJQUFJLENBQUMsRUFBRSxnQ0FBYyxDQUFDLGtCQUFrQixDQUFDLE9BQW9CLENBQUM7YUFDbEUsQ0FBQztTQUNMO1FBRUQsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxlQUFHLEVBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUEsbUJBQU8sRUFBQyxJQUFJLENBQUMsQ0FBQztRQUN0RCxJQUFJLElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDZixPQUFPLElBQUEsaUJBQUssRUFBQyxJQUFBLGNBQUUsRUFBQyxjQUFjLEVBQUUsT0FBTyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsRUFBRSxnQ0FBYyxDQUFDLGtCQUFrQixDQUFDLE9BQW9CLENBQWMsQ0FBQyxDQUFBO1NBQ2pJO1FBQ0QsT0FBTyxJQUFBLGlCQUFLLEVBQUMsSUFBQSxjQUFFLEVBQUMsY0FBYyxFQUFFLE9BQU8sQ0FBQyxFQUFFLGdDQUFjLENBQUMsa0JBQWtCLENBQUMsT0FBb0IsQ0FBYyxDQUFDLENBQUE7SUFDbkgsQ0FBQztJQUVPLEtBQUssQ0FBQywyQkFBMkIsQ0FBQyxJQUFvQixFQUFFLElBQVk7UUFDeEUsTUFBTSxLQUFLLEdBQUcsT0FBTyxJQUFJLENBQUMsS0FBSyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxJQUFJLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUM7UUFFOUU7O1dBRUc7UUFDSCxNQUFNLE9BQU8sR0FBRztZQUNaLFNBQVMsRUFBRSxJQUFJLENBQUMsU0FBUyxLQUFLLHVCQUFtQixDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsdUJBQW1CLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyx1QkFBbUIsQ0FBQyxRQUFRO1lBQ3JILEtBQUssRUFBRSxJQUFJO1NBQ2QsQ0FBQTtRQUNELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsZUFBRyxFQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFPLEVBQUMsSUFBSSxDQUFDLENBQUM7UUFDdEQsSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ2YsT0FBTyxJQUFBLGlCQUFLLEVBQUMsSUFBQSxjQUFFLEVBQUMsZUFBZSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLGdDQUFjLENBQUMsa0JBQWtCLENBQUMsT0FBb0IsQ0FBYyxDQUFDLENBQUE7U0FDekk7UUFDRCxPQUFPLElBQUEsaUJBQUssRUFBQyxJQUFBLGNBQUUsRUFBQyxlQUFlLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBQyxFQUFFLGdDQUFjLENBQUMsa0JBQWtCLENBQUMsT0FBb0IsQ0FBYyxDQUFDLENBQUE7SUFDM0gsQ0FBQztDQUNKO0FBdkRELDBDQXVEQyIsImZpbGUiOiJsaWIvZmlsdGVyL2ZpbHRlcnMvanNvbi1hcnJheS5maWx0ZXIuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBjb2wsIGZuLCBsaXRlcmFsLCBMb2dpY1R5cGUsIHdoZXJlLCBXaGVyZU9wdGlvbnMgfSBmcm9tIFwic2VxdWVsaXplXCI7XG5pbXBvcnQgeyBGaWx0ZXJPcGVyYXRvclR5cGVzLCBKc29uQXJyYXlPcGVyYXRvcnMsIFF1ZXJ5UnVsZU1vZGVsLCBSdWxlTW9kZWwgfSBmcm9tIFwiLi4vLi5cIjtcbmltcG9ydCB7IFNlcXVlbGl6ZVV0aWxzIH0gZnJvbSBcIi4uLy4uL3NlcXVlbGl6ZS51dGlsc1wiO1xuaW1wb3J0IHsgRmlsdGVyVHlwZSB9IGZyb20gXCIuLi90eXBlXCI7XG5pbXBvcnQgeyBCYXNlRmlsdGVyRGVmaW5pdGlvbiwgRmlsdGVyIH0gZnJvbSBcIi4vZmlsdGVyXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSnNvbkFycmF5RmlsdGVyRGVmaW5pdGlvbiB7XG4gICAganNvblBhdGg/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBjbGFzcyBKc29uQXJyYXlGaWx0ZXIgZXh0ZW5kcyBGaWx0ZXIge1xuICAgIHB1YmxpYyB0eXBlID0gRmlsdGVyVHlwZS5Kc29uQXJyYXk7XG4gICAgcHVibGljIG9wZXJhdG9ycyA9IFsuLi5Kc29uQXJyYXlPcGVyYXRvcnNdO1xuICAgIHB1YmxpYyBqc29uUGF0aD86IHN0cmluZztcblxuICAgIGNvbnN0cnVjdG9yKGRlZmluaXRpb246IEpzb25BcnJheUZpbHRlckRlZmluaXRpb24gJiBCYXNlRmlsdGVyRGVmaW5pdGlvbikge1xuICAgICAgICBzdXBlcihkZWZpbml0aW9uKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgZ2V0V2hlcmVPcHRpb25zKHJ1bGU6IFF1ZXJ5UnVsZU1vZGVsLCBuYW1lPzogc3RyaW5nKTogUHJvbWlzZTxXaGVyZU9wdGlvbnM+IHtcbiAgICAgICAgaWYgKCFuYW1lKSB7XG4gICAgICAgICAgICBuYW1lID0gdGhpcy5wYXRoID8gU2VxdWVsaXplVXRpbHMuZ2V0QXR0cmlidXRlRnVsbE5hbWUodGhpcy5hdHRyaWJ1dGUsIHRoaXMucGF0aCkgOiB0aGlzLmF0dHJpYnV0ZTtcbiAgICAgICAgfVxuXG4gICAgICAgIGlmIChydWxlLm9wZXJhdGlvbiA9PT0gRmlsdGVyT3BlcmF0b3JUeXBlcy5FcXVhbCB8fCBydWxlLm9wZXJhdGlvbiA9PT0gRmlsdGVyT3BlcmF0b3JUeXBlcy5Ob3RFcXVhbCkge1xuICAgICAgICAgICAgcmV0dXJuIHRoaXMuZ2VuZXJhdGVFcXVhbHNMaWtlT3B0aW9ucyhydWxlLCBuYW1lKTtcbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiB0aGlzLmdlbmVyYXRlQ29udGFpbnNMaWtlT3B0aW9ucyhydWxlLCBuYW1lKTtcbiAgICB9XG5cbiAgICBwcml2YXRlIGFzeW5jIGdlbmVyYXRlRXF1YWxzTGlrZU9wdGlvbnMocnVsZTogUXVlcnlSdWxlTW9kZWwsIG5hbWU6IHN0cmluZyk6IFByb21pc2U8V2hlcmVPcHRpb25zPiB7XG4gICAgICAgIGNvbnN0IG5ld1J1bGUgPSB7XG4gICAgICAgICAgICAuLi5ydWxlLFxuICAgICAgICAgICAgdmFsdWU6IGZuKFwiSlNPTl9BUlJBWVwiLCBydWxlLnZhbHVlKVxuICAgICAgICB9O1xuICAgICAgICBpZiAoIXRoaXMuanNvblBhdGgpIHtcbiAgICAgICAgICAgIHJldHVybiB7XG4gICAgICAgICAgICAgICAgW25hbWVdOiBTZXF1ZWxpemVVdGlscy5nZW5lcmF0ZVdoZXJlVmFsdWUobmV3UnVsZSBhcyBSdWxlTW9kZWwpXG4gICAgICAgICAgICB9O1xuICAgICAgICB9XG5cbiAgICAgICAgY29uc3QgY29sTmFtZSA9IHRoaXMucGF0aCA/IGNvbChuYW1lKSA6IGxpdGVyYWwobmFtZSk7XG4gICAgICAgIGlmICh0aGlzLmpzb25QYXRoKSB7XG4gICAgICAgICAgICByZXR1cm4gd2hlcmUoZm4oXCJKU09OX0VYVFJBQ1RcIiwgY29sTmFtZSwgdGhpcy5qc29uUGF0aCksIFNlcXVlbGl6ZVV0aWxzLmdlbmVyYXRlV2hlcmVWYWx1ZShuZXdSdWxlIGFzIFJ1bGVNb2RlbCkgYXMgTG9naWNUeXBlKVxuICAgICAgICB9XG4gICAgICAgIHJldHVybiB3aGVyZShmbihcIkpTT05fRVhUUkFDVFwiLCBjb2xOYW1lKSwgU2VxdWVsaXplVXRpbHMuZ2VuZXJhdGVXaGVyZVZhbHVlKG5ld1J1bGUgYXMgUnVsZU1vZGVsKSBhcyBMb2dpY1R5cGUpXG4gICAgfVxuXG4gICAgcHJpdmF0ZSBhc3luYyBnZW5lcmF0ZUNvbnRhaW5zTGlrZU9wdGlvbnMocnVsZTogUXVlcnlSdWxlTW9kZWwsIG5hbWU6IHN0cmluZyk6IFByb21pc2U8V2hlcmVPcHRpb25zPiB7XG4gICAgICAgIGNvbnN0IHZhbHVlID0gdHlwZW9mIHJ1bGUudmFsdWUgPT09IFwic3RyaW5nXCIgPyBgXCIke3J1bGUudmFsdWV9XCJgIDogcnVsZS52YWx1ZTtcblxuICAgICAgICAvKipcbiAgICAgICAgICogV2Ugb3ZlcnJpZGUgdGhlIHJ1bGUgdG8gdXNlIGFuIGVxdWFsIG9yIG5vdCBlcXVhbCB3aXRoIGEgSlNPTl9DT05UQUlOUyBmdW5jdGlvblxuICAgICAgICAgKi9cbiAgICAgICAgY29uc3QgbmV3UnVsZSA9IHtcbiAgICAgICAgICAgIG9wZXJhdGlvbjogcnVsZS5vcGVyYXRpb24gPT09IEZpbHRlck9wZXJhdG9yVHlwZXMuQ29udGFpbnMgPyBGaWx0ZXJPcGVyYXRvclR5cGVzLkVxdWFsIDogRmlsdGVyT3BlcmF0b3JUeXBlcy5Ob3RFcXVhbCxcbiAgICAgICAgICAgIHZhbHVlOiB0cnVlXG4gICAgICAgIH1cbiAgICAgICAgY29uc3QgY29sTmFtZSA9IHRoaXMucGF0aCA/IGNvbChuYW1lKSA6IGxpdGVyYWwobmFtZSk7XG4gICAgICAgIGlmICh0aGlzLmpzb25QYXRoKSB7XG4gICAgICAgICAgICByZXR1cm4gd2hlcmUoZm4oXCJKU09OX0NPTlRBSU5TXCIsIGNvbE5hbWUsIHZhbHVlLCB0aGlzLmpzb25QYXRoKSwgU2VxdWVsaXplVXRpbHMuZ2VuZXJhdGVXaGVyZVZhbHVlKG5ld1J1bGUgYXMgUnVsZU1vZGVsKSBhcyBMb2dpY1R5cGUpXG4gICAgICAgIH1cbiAgICAgICAgcmV0dXJuIHdoZXJlKGZuKFwiSlNPTl9DT05UQUlOU1wiLCBjb2xOYW1lLCB2YWx1ZSksIFNlcXVlbGl6ZVV0aWxzLmdlbmVyYXRlV2hlcmVWYWx1ZShuZXdSdWxlIGFzIFJ1bGVNb2RlbCkgYXMgTG9naWNUeXBlKVxuICAgIH1cbn1cbiJdfQ==