@wix/filter-builder 1.0.39 → 1.0.41

package/dist/esm/filter-validator.js

@@ -1,97 +1,61 @@
 import { typeForDisplay, isDate, isString, isNumber } from './type-utils';
 import clone from './clone';
-var FilterValidator = (function () {
-    function FilterValidator(operatorName, previousInvalidArguments, ctor) {
+export class FilterValidator {
+    constructor(operatorName, previousInvalidArguments, ctor) {
         this._validations = [];
         this.operatorName = operatorName;
         this.ctor = ctor;
         this._invalidArguments = clone(previousInvalidArguments);
     }
-    FilterValidator.prototype.typeIsString = function (value) {
-        var _this = this;
-        return this.addValidation(function () { return isString(value); }, function () {
-            return "Invalid ".concat(_this.operatorName, " parameter value [").concat(typeForDisplay(value), "]. ").concat(_this.operatorName, " parameter must be a String.");
-        });
-    };
-    FilterValidator.prototype.typeIsStringNumberOrDate = function (value) {
-        var _this = this;
-        return this.addValidation(function () { return isDateStringOrNumber(value); }, function () {
-            return "Invalid ".concat(_this.operatorName, " parameter value [").concat(typeForDisplay(value), "]. Valid ").concat(_this.operatorName, " parameter types are String, Number or Date.");
-        });
-    };
-    FilterValidator.prototype.sameType = function (first, second) {
-        var _this = this;
-        return this.addValidation(function () { return typeForDisplay(first) === typeForDisplay(second); }, function () {
-            return "Invalid ".concat(_this.operatorName, " parameter values [").concat(typeForDisplay(first), "] and [").concat(typeForDisplay(second), "]. Both parameters must be of the same type.");
-        });
-    };
-    FilterValidator.prototype.typeIsStringNumberOrDateForAll = function (values) {
-        var _this = this;
-        return this.addValidation(function () { return values.every(isDateStringOrNumber); }, function () {
-            return "Invalid ".concat(_this.operatorName, " usage. ").concat(_this.operatorName, " supports only Number, String or Date items.");
-        });
-    };
-    FilterValidator.prototype.validFieldName = function (field) {
-        var _this = this;
-        return this.addValidation(function () { return isString(field); }, function () {
-            return "Invalid ".concat(_this.operatorName, " field value [").concat(typeForDisplay(field), "]. ").concat(_this.operatorName, " field must be a String.");
-        });
-    };
-    FilterValidator.prototype.isInstanceOfSameClass = function (obj) {
-        var _this = this;
-        return this.addValidation(function () { return obj instanceof _this.ctor; }, function () {
-            return "Invalid ".concat(_this.operatorName, " parameter [").concat(typeForDisplay(obj), "]. ").concat(_this.operatorName, " expects FilterBuilder only.");
-        });
-    };
-    FilterValidator.prototype.arityIsOne = function (args) {
-        var _this = this;
-        return this.addValidation(function () { return args.length === 1; }, function () {
-            return "Invalid ".concat(_this.operatorName, " usage. ").concat(_this.operatorName, " requires one parameter.");
-        });
-    };
-    FilterValidator.prototype.arityIsTwo = function (args) {
-        var _this = this;
-        return this.addValidation(function () { return args.length === 2; }, function () {
-            return "Invalid ".concat(_this.operatorName, " usage. ").concat(_this.operatorName, " requires two parameters.");
-        });
-    };
-    FilterValidator.prototype.arityIsThree = function (args) {
-        var _this = this;
-        return this.addValidation(function () { return args.length === 3; }, function () {
-            return "Invalid ".concat(_this.operatorName, " usage. ").concat(_this.operatorName, " requires three parameters.");
-        });
-    };
-    FilterValidator.prototype.arityIsAtLeastTwo = function (args) {
-        var _this = this;
-        return this.addValidation(function () { return args.length >= 2; }, function () {
-            return "Invalid ".concat(_this.operatorName, " usage. ").concat(_this.operatorName, " requires at least two parameters.");
-        });
-    };
-    FilterValidator.prototype.addValidation = function (predicateFn, messageFn) {
+    typeIsString(value) {
+        return this.addValidation(() => isString(value), () => `Invalid ${this.operatorName} parameter value [${typeForDisplay(value)}]. ${this.operatorName} parameter must be a String.`);
+    }
+    typeIsStringNumberOrDate(value) {
+        return this.addValidation(() => isDateStringOrNumber(value), () => `Invalid ${this.operatorName} parameter value [${typeForDisplay(value)}]. Valid ${this.operatorName} parameter types are String, Number or Date.`);
+    }
+    sameType(first, second) {
+        return this.addValidation(() => typeForDisplay(first) === typeForDisplay(second), () => `Invalid ${this.operatorName} parameter values [${typeForDisplay(first)}] and [${typeForDisplay(second)}]. Both parameters must be of the same type.`);
+    }
+    typeIsStringNumberOrDateForAll(values) {
+        return this.addValidation(() => values.every(isDateStringOrNumber), () => `Invalid ${this.operatorName} usage. ${this.operatorName} supports only Number, String or Date items.`);
+    }
+    validFieldName(field) {
+        return this.addValidation(() => isString(field), () => `Invalid ${this.operatorName} field value [${typeForDisplay(field)}]. ${this.operatorName} field must be a String.`);
+    }
+    isInstanceOfSameClass(obj) {
+        return this.addValidation(() => obj instanceof this.ctor, () => `Invalid ${this.operatorName} parameter [${typeForDisplay(obj)}]. ${this.operatorName} expects FilterBuilder only.`);
+    }
+    arityIsOne(args) {
+        return this.addValidation(() => args.length === 1, () => `Invalid ${this.operatorName} usage. ${this.operatorName} requires one parameter.`);
+    }
+    arityIsTwo(args) {
+        return this.addValidation(() => args.length === 2, () => `Invalid ${this.operatorName} usage. ${this.operatorName} requires two parameters.`);
+    }
+    arityIsThree(args) {
+        return this.addValidation(() => args.length === 3, () => `Invalid ${this.operatorName} usage. ${this.operatorName} requires three parameters.`);
+    }
+    arityIsAtLeastTwo(args) {
+        return this.addValidation(() => args.length >= 2, () => `Invalid ${this.operatorName} usage. ${this.operatorName} requires at least two parameters.`);
+    }
+    addValidation(predicateFn, messageFn) {
         this._validations.push({
-            predicateFn: predicateFn,
-            messageFn: messageFn,
+            predicateFn,
+            messageFn,
         });
         return this;
-    };
-    FilterValidator.prototype.validateAndAggregate = function () {
-        var _this = this;
-        var valid = this._validations.every(function (_a) {
-            var predicateFn = _a.predicateFn, messageFn = _a.messageFn;
-            return _this._appendIfInvalid(predicateFn(), messageFn());
-        });
+    }
+    validateAndAggregate() {
+        const valid = this._validations.every(({ predicateFn, messageFn }) => this._appendIfInvalid(predicateFn(), messageFn()));
         return [this._invalidArguments, valid];
-    };
-    FilterValidator.prototype._appendIfInvalid = function (valid, message) {
+    }
+    _appendIfInvalid(valid, message) {
         if (!valid) {
             this._invalidArguments.push(message);
             return false;
         }
         return true;
-    };
-    return FilterValidator;
-}());
-export { FilterValidator };
+    }
+}
 function isDateStringOrNumber(value) {
     return isString(value) || isNumber(value) || isDate(value);
 }

package/dist/esm/filter-validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter-validator.js","sourceRoot":"","sources":["../../src/filter-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACzE,OAAO,KAAK,MAAM,SAAS,CAAA;AAG3B;IAME,yBAAY,YAAY,EAAE,wBAAwB,EAAE,IAAI;QACtD,IAAI,CAAC,YAAY,GAAG,EAAE,CAAA;QACtB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,wBAAwB,CAAC,CAAA;IAC1D,CAAC;IAED,sCAAY,GAAZ,UAAa,KAAK;QAAlB,iBAQC;QAPC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,QAAQ,CAAC,KAAK,CAAC,EAAf,CAAe,EACrB;YACE,OAAA,kBAAW,KAAI,CAAC,YAAY,+BAAqB,cAAc,CAC7D,KAAK,CACN,gBAAM,KAAI,CAAC,YAAY,iCAA8B;QAFtD,CAEsD,CACzD,CAAA;IACH,CAAC;IAED,kDAAwB,GAAxB,UAAyB,KAAK;QAA9B,iBAUC;QATC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,oBAAoB,CAAC,KAAK,CAAC,EAA3B,CAA2B,EACjC;YACE,OAAA,kBAAW,KAAI,CAAC,YAAY,+BAAqB,cAAc,CAC7D,KAAK,CACN,sBACC,KAAI,CAAC,YAAY,iDAC2B;QAJ9C,CAI8C,CACjD,CAAA;IACH,CAAC;IAED,kCAAQ,GAAR,UAAS,KAAK,EAAE,MAAM;QAAtB,iBAUC;QATC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,cAAc,CAAC,KAAK,CAAC,KAAK,cAAc,CAAC,MAAM,CAAC,EAAhD,CAAgD,EACtD;YACE,OAAA,kBAAW,KAAI,CAAC,YAAY,gCAAsB,cAAc,CAC9D,KAAK,CACN,oBAAU,cAAc,CACvB,MAAM,CACP,iDAA8C;QAJ/C,CAI+C,CAClD,CAAA;IACH,CAAC;IAED,wDAA8B,GAA9B,UAA+B,MAAM;QAArC,iBAMC;QALC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAlC,CAAkC,EACxC;YACE,OAAA,kBAAW,KAAI,CAAC,YAAY,qBAAW,KAAI,CAAC,YAAY,iDAA8C;QAAtG,CAAsG,CACzG,CAAA;IACH,CAAC;IAED,wCAAc,GAAd,UAAe,KAAK;QAApB,iBAQC;QAPC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,QAAQ,CAAC,KAAK,CAAC,EAAf,CAAe,EACrB;YACE,OAAA,kBAAW,KAAI,CAAC,YAAY,2BAAiB,cAAc,CAAC,KAAK,CAAC,gBAChE,KAAI,CAAC,YAAY,6BACO;QAF1B,CAE0B,CAC7B,CAAA;IACH,CAAC;IAED,+CAAqB,GAArB,UAAsB,GAAG;QAAzB,iBAQC;QAPC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,GAAG,YAAY,KAAI,CAAC,IAAI,EAAxB,CAAwB,EAC9B;YACE,OAAA,kBAAW,KAAI,CAAC,YAAY,yBAAe,cAAc,CAAC,GAAG,CAAC,gBAC5D,KAAI,CAAC,YAAY,iCACW;QAF9B,CAE8B,CACjC,CAAA;IACH,CAAC;IAED,oCAAU,GAAV,UAAW,IAAI;QAAf,iBAMC;QALC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,IAAI,CAAC,MAAM,KAAK,CAAC,EAAjB,CAAiB,EACvB;YACE,OAAA,kBAAW,KAAI,CAAC,YAAY,qBAAW,KAAI,CAAC,YAAY,6BAA0B;QAAlF,CAAkF,CACrF,CAAA;IACH,CAAC;IAED,oCAAU,GAAV,UAAW,IAAI;QAAf,iBAMC;QALC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,IAAI,CAAC,MAAM,KAAK,CAAC,EAAjB,CAAiB,EACvB;YACE,OAAA,kBAAW,KAAI,CAAC,YAAY,qBAAW,KAAI,CAAC,YAAY,8BAA2B;QAAnF,CAAmF,CACtF,CAAA;IACH,CAAC;IAED,sCAAY,GAAZ,UAAa,IAAI;QAAjB,iBAMC;QALC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,IAAI,CAAC,MAAM,KAAK,CAAC,EAAjB,CAAiB,EACvB;YACE,OAAA,kBAAW,KAAI,CAAC,YAAY,qBAAW,KAAI,CAAC,YAAY,gCAA6B;QAArF,CAAqF,CACxF,CAAA;IACH,CAAC;IAED,2CAAiB,GAAjB,UAAkB,IAAI;QAAtB,iBAMC;QALC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,IAAI,CAAC,MAAM,IAAI,CAAC,EAAhB,CAAgB,EACtB;YACE,OAAA,kBAAW,KAAI,CAAC,YAAY,qBAAW,KAAI,CAAC,YAAY,uCAAoC;QAA5F,CAA4F,CAC/F,CAAA;IACH,CAAC;IAED,uCAAa,GAAb,UAAc,WAAW,EAAE,SAAS;QAClC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;YACrB,WAAW,aAAA;YACX,SAAS,WAAA;SACV,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED,8CAAoB,GAApB;QAAA,iBAKC;QAJC,IAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,UAAC,EAA0B;gBAAxB,WAAW,iBAAA,EAAE,SAAS,eAAA;YAC7D,OAAA,KAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,CAAC;QAAjD,CAAiD,CAClD,CAAA;QACD,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAA;IACxC,CAAC;IAED,0CAAgB,GAAhB,UAAiB,KAAK,EAAE,OAAO;QAC7B,IAAI,CAAC,KAAK,EAAE;YACV,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACpC,OAAO,KAAK,CAAA;SACb;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IACH,sBAAC;AAAD,CAAC,AAjID,IAiIC;;AAED,SAAS,oBAAoB,CAAC,KAAK;IACjC,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAA;AAC5D,CAAC"}
+{"version":3,"file":"filter-validator.js","sourceRoot":"","sources":["../../src/filter-validator.ts"],"names":[],"mappings":"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"}

package/dist/esm/query-optimiser.js

@@ -1,5 +1,4 @@
-import { __assign, __spreadArray } from "tslib";
-var optimisations = [
+const optimisations = [
     optimisedUnaryAnd,
     optimisedEmptyAnd,
     optimisedAndsAsObjects,
@@ -7,7 +6,7 @@ var optimisations = [
     optimisedNestedOrs,
 ];
 export function optimisedQuery(query) {
-    var newQuery = fullyOptimised(query)[0];
+    const [newQuery] = fullyOptimised(query);
     return newQuery;
 }
 function fullyOptimised(query) {
@@ -22,146 +21,131 @@ function fullyOptimised(query) {
     return [query, false];
 }
 function fullyOptimisedArray(query) {
-    var optimisedElements = query.map(fullyOptimised);
-    var somethingChanged = 0 < optimisedElements.filter(function (_a) {
-        var elementChanged = _a[1];
-        return elementChanged;
-    }).length;
-    var newElements = optimisedElements.map(function (_a) {
-        var element = _a[0];
-        return element;
-    });
+    const optimisedElements = query.map(fullyOptimised);
+    const somethingChanged = 0 < optimisedElements.filter(([, elementChanged]) => elementChanged).length;
+    const newElements = optimisedElements.map(([element]) => element);
     return [newElements, somethingChanged];
 }
 function fullyOptimisedObject(query) {
-    var _a = fullEntriesOptimisation(query), queryAfterOptimisingEntries = _a[0], changedStage1 = _a[1];
-    var _b = fullObjectOptimisation(queryAfterOptimisingEntries), queryAfterFullOptimisation = _b[0], changedStage2 = _b[1];
-    var changed = changedStage1 || changedStage2;
+    const [queryAfterOptimisingEntries, changedStage1] = fullEntriesOptimisation(query);
+    const [queryAfterFullOptimisation, changedStage2] = fullObjectOptimisation(queryAfterOptimisingEntries);
+    const changed = changedStage1 || changedStage2;
     return [queryAfterFullOptimisation, changed];
     function fullObjectOptimisation(query) {
-        var updatedQuery = applyFirstOptimisation(query);
+        const updatedQuery = applyFirstOptimisation(query);
         if (!updatedQuery) {
             return [query, false];
         }
-        var finalQuery = fullyOptimised(updatedQuery)[0];
+        const [finalQuery] = fullyOptimised(updatedQuery);
         return [finalQuery, true];
     }
     function fullEntriesOptimisation(query) {
-        var changedEntries = Object.entries(query)
+        const changedEntries = Object.entries(query)
             .map(entryOptimisation)
-            .filter(function (_a) {
-            var changed = _a[2];
-            return changed;
-        });
-        var newQuery = __assign(__assign({}, query), entriesAsObject(changedEntries));
-        var changed = !!changedEntries.length;
+            .filter(([, , changed]) => changed);
+        const newQuery = { ...query, ...entriesAsObject(changedEntries) };
+        const changed = !!changedEntries.length;
         return [newQuery, changed];
     }
-    function entryOptimisation(_a) {
-        var key = _a[0], value = _a[1];
-        var _b = fullyOptimised(value), newValue = _b[0], changed = _b[1];
+    function entryOptimisation([key, value]) {
+        const [newValue, changed] = fullyOptimised(value);
         return [key, newValue, changed];
     }
     function entriesAsObject(entries) {
-        return entries.reduce(function (acc, _a) {
-            var _b;
-            var key = _a[0], value = _a[1];
-            return (__assign(__assign({}, acc), (_b = {}, _b[key] = value, _b)));
-        }, {});
+        return entries.reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
     }
 }
 function applyFirstOptimisation(node) {
-    for (var _i = 0, optimisations_1 = optimisations; _i < optimisations_1.length; _i++) {
-        var optimisation = optimisations_1[_i];
-        var newNode = optimisation(node);
+    for (const optimisation of optimisations) {
+        const newNode = optimisation(node);
         if (newNode) {
             return newNode;
         }
     }
 }
 function optimisedUnaryAnd(node) {
-    var args = node.$and;
+    const args = node.$and;
     if (Array.isArray(args) && args.length === 1) {
         return args[0];
     }
 }
 function optimisedEmptyAnd(node) {
-    var args = node.$and;
+    const args = node.$and;
     if (Array.isArray(args) && args.length === 0) {
         return {};
     }
     return null;
 }
 function optimisedAndsAsObjects(node) {
-    var args = node.$and;
+    const args = node.$and;
     if (!args) {
         return;
     }
-    var basicObjects = [];
-    var operatorObjects = [];
-    args.forEach(function (arg) {
+    let basicObjects = [];
+    let operatorObjects = [];
+    args.forEach((arg) => {
         if (isOperator(arg)) {
-            operatorObjects = __spreadArray(__spreadArray([], operatorObjects, true), [arg], false);
+            operatorObjects = [...operatorObjects, arg];
         }
         else {
-            basicObjects = __spreadArray(__spreadArray([], basicObjects, true), [arg], false);
+            basicObjects = [...basicObjects, arg];
         }
     });
     if (basicObjects.length <= 1 || haveOverlappingFields(basicObjects)) {
         return;
     }
-    var combinedBasicObjects = Object.assign.apply(Object, __spreadArray([{}], basicObjects, false));
-    return { $and: __spreadArray([combinedBasicObjects], operatorObjects, true) };
+    const combinedBasicObjects = Object.assign({}, ...basicObjects);
+    return { $and: [combinedBasicObjects, ...operatorObjects] };
     function isOperator(node) {
-        var keys = Object.keys(node);
-        return keys.every(function (name) { return name.startsWith('$'); }) && keys.length > 0;
+        const keys = Object.keys(node);
+        return keys.every((name) => name.startsWith('$')) && keys.length > 0;
     }
     function haveOverlappingFields(objects) {
-        var nonUniqueKeys = objects
-            .map(function (it) { return Object.keys(it); })
-            .reduce(function (a, b) { return __spreadArray(__spreadArray([], a, true), b, true); }, []);
-        var uniqueKeys = unique(nonUniqueKeys);
+        const nonUniqueKeys = objects
+            .map((it) => Object.keys(it))
+            .reduce((a, b) => [...a, ...b], []);
+        const uniqueKeys = unique(nonUniqueKeys);
         return uniqueKeys.length !== nonUniqueKeys.length;
     }
     function unique(values) {
-        var dict = {};
-        values.forEach(function (v) { return (dict[v] = true); });
+        const dict = {};
+        values.forEach((v) => (dict[v] = true));
         return Object.keys(dict);
     }
 }
 function optimisedNestedAnds(node) {
-    var args = node.$and;
+    const args = node.$and;
     if (!args) {
         return;
     }
-    var hasNestedAnds = !!args.find(function (it) { return it.$and; });
+    const hasNestedAnds = !!args.find((it) => it.$and);
     if (!hasNestedAnds) {
         return;
     }
-    var newArgs = args.reduce(function (result, current) {
-        var and = current.$and;
+    const newArgs = args.reduce((result, current) => {
+        const and = current.$and;
         if (!and) {
-            return __spreadArray(__spreadArray([], result, true), [current], false);
+            return [...result, current];
         }
-        return __spreadArray(__spreadArray([], result, true), and, true);
+        return [...result, ...and];
     }, []);
     return { $and: newArgs };
 }
 function optimisedNestedOrs(node) {
-    var args = node.$or;
+    const args = node.$or;
     if (!args) {
         return;
     }
-    var hasNestedOrs = !!args.find(function (it) { return it.$or; });
+    const hasNestedOrs = !!args.find((it) => it.$or);
     if (!hasNestedOrs) {
         return;
     }
-    var newArgs = args.reduce(function (result, current) {
-        var or = current.$or;
+    const newArgs = args.reduce((result, current) => {
+        const or = current.$or;
         if (!or) {
-            return __spreadArray(__spreadArray([], result, true), [current], false);
+            return [...result, current];
         }
-        return __spreadArray(__spreadArray([], result, true), or, true);
+        return [...result, ...or];
     }, []);
     return { $or: newArgs };
 }

package/dist/esm/query-optimiser.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-optimiser.js","sourceRoot":"","sources":["../../src/query-optimiser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query-optimiser.js","sourceRoot":"","sources":["../../src/query-optimiser.ts"],"names":[],"mappings":"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"}

package/dist/esm/type-utils.js

@@ -33,8 +33,8 @@ function upperCaseFirst(str) {
     if (!isString(str)) {
         return str;
     }
-    var first = str.slice(0, 1).toUpperCase();
-    var rest = str.slice(1, str.length);
+    const first = str.slice(0, 1).toUpperCase();
+    const rest = str.slice(1, str.length);
     return first + rest;
 }
 //# sourceMappingURL=type-utils.js.map

package/dist/esm/type-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-utils.js","sourceRoot":"","sources":["../../src/type-utils.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAE7B,MAAM,UAAU,QAAQ,CAAC,GAAG;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,GAAG;IACzB,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAA;AACjC,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,GAAG;IACxB,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,MAAM,CAAA;AAChC,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,GAAG;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAG;IAC3B,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,GAAG;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAG;IAC5B,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,UAAU,CAAA;AACpC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAG;IAChC,OAAO,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;AACrC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAG;IAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,WAAW,CAAA;AACrC,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,GAAG;IACxB,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,MAAM,CAAA;AAChC,CAAC;AAED,SAAS,cAAc,CAAC,GAAG;IACzB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAClB,OAAO,GAAG,CAAA;KACX;IACD,IAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;IAC3C,IAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACrC,OAAO,KAAK,GAAG,IAAI,CAAA;AACrB,CAAC"}
+{"version":3,"file":"type-utils.js","sourceRoot":"","sources":["../../src/type-utils.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAE7B,MAAM,UAAU,QAAQ,CAAC,GAAG;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,GAAG;IACzB,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAA;AACjC,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,GAAG;IACxB,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,MAAM,CAAA;AAChC,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,GAAG;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAG;IAC3B,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,GAAG;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAG;IAC5B,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,UAAU,CAAA;AACpC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAG;IAChC,OAAO,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;AACrC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAG;IAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,WAAW,CAAA;AACrC,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,GAAG;IACxB,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,MAAM,CAAA;AAChC,CAAC;AAED,SAAS,cAAc,CAAC,GAAG;IACzB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAClB,OAAO,GAAG,CAAA;KACX;IACD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;IAC3C,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACrC,OAAO,KAAK,GAAG,IAAI,CAAA;AACrB,CAAC"}