@wix/filter-builder 1.0.1

package/dist/esm/filter-builder.js

@@ -0,0 +1,25 @@
+import { __extends } from "tslib";
+import filterMixin from './filter-mixin';
+var FilterBuilder = (function (_super) {
+    __extends(FilterBuilder, _super);
+    function FilterBuilder() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Object.defineProperty(FilterBuilder.prototype, "constructorName", {
+        get: function () {
+            return 'FilterBuilder';
+        },
+        enumerable: false,
+        configurable: true
+    });
+    FilterBuilder.prototype._build = function () {
+        return this.getFilterModel();
+    };
+    return FilterBuilder;
+}(filterMixin()));
+export { FilterBuilder };
+export function filterBuilder() {
+    return new FilterBuilder({});
+}
+export default filterBuilder;
+//# sourceMappingURL=filter-builder.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"filter-builder.js","sourceRoot":"","sources":["../../src/filter-builder.ts"],"names":[],"mappings":";AAAA,OAAO,WAAW,MAAM,gBAAgB,CAAA;AAExC;IAAmC,iCAAa;IAAhD;;IAQA,CAAC;IAPC,sBAAI,0CAAe;aAAnB;YACE,OAAO,eAAe,CAAA;QACxB,CAAC;;;OAAA;IAED,8BAAM,GAAN;QACE,OAAO,IAAI,CAAC,cAAc,EAAE,CAAA;IAC9B,CAAC;IACH,oBAAC;AAAD,CAAC,AARD,CAAmC,WAAW,EAAE,GAQ/C;;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO,IAAI,aAAa,CAAC,EAAE,CAAC,CAAA;AAC9B,CAAC;AAED,eAAe,aAAa,CAAA"}

package/dist/esm/filter-mixin.js

@@ -0,0 +1,298 @@
+import { __assign, __extends, __spreadArray } from "tslib";
+import { isArray } from './type-utils';
+import clone from './clone';
+import { FilterValidator } from './filter-validator';
+import { optimisedQuery } from './query-optimiser';
+var filterMixin = function (Base) {
+    if (Base === void 0) { Base = (function () {
+        function class_1() {
+        }
+        return class_1;
+    }()); }
+    return (function (_super) {
+        __extends(class_2, _super);
+        function class_2(obj) {
+            if (obj === void 0) { obj = {}; }
+            var _this = _super.call(this, obj) || this;
+            _this.filterTree = obj.filterTree || { $and: [] };
+            _this.invalidArguments = obj.invalidArguments || [];
+            return _this;
+        }
+        class_2.prototype.eq = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return this._binaryAnd('$eq', '.eq', args);
+        };
+        class_2.prototype.ne = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return this._binaryAnd('$ne', '.ne', args);
+        };
+        class_2.prototype.ge = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return this._AndLogicalEquivalence('$gte', '.ge', args);
+        };
+        class_2.prototype.gt = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return this._AndLogicalEquivalence('$gt', '.gt', args);
+        };
+        class_2.prototype.le = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return this._AndLogicalEquivalence('$lte', '.le', args);
+        };
+        class_2.prototype.lt = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return this._AndLogicalEquivalence('$lt', '.lt', args);
+        };
+        class_2.prototype.isNotEmpty = function (field) {
+            var _a = this._filterValidator('.isNotEmpty')
+                .arityIsOne(arguments)
+                .validFieldName(field)
+                .validateAndAggregate(), newInvalidArguments = _a[0], valid = _a[1];
+            if (valid) {
+                return this.ne(field, null);
+            }
+            return this._copy(this.filterTree, newInvalidArguments);
+        };
+        class_2.prototype.isEmpty = function (field) {
+            var _a = this._filterValidator('.isEmpty')
+                .arityIsOne(arguments)
+                .validFieldName(field)
+                .validateAndAggregate(), newInvalidArguments = _a[0], valid = _a[1];
+            if (valid) {
+                return this.eq(field, null);
+            }
+            return this._copy(this.filterTree, newInvalidArguments);
+        };
+        class_2.prototype.startsWith = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return this._AndStringOperand('$startsWith', '.startsWith', args);
+        };
+        class_2.prototype.endsWith = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return this._AndStringOperand('$endsWith', '.endsWith', args);
+        };
+        class_2.prototype.contains = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return this._AndStringOperand('$contains', '.contains', args);
+        };
+        class_2.prototype.hasSome = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return this._AndSetOperand('$hasSome', '.hasSome', args);
+        };
+        class_2.prototype.hasAll = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return this._AndSetOperand('$hasAll', '.hasAll', args);
+        };
+        class_2.prototype.or = function (orQuery) {
+            var _a = this._filterValidator('.or')
+                .arityIsOne(arguments)
+                .isInstanceOfSameClass(orQuery)
+                .validateAndAggregate(), newInvalidArguments = _a[0], valid = _a[1];
+            if (valid) {
+                var prefix = isEmptyAnd(this.filterTree) ? [] : [this.filterTree];
+                return this._copy(inAnd({ $or: __spreadArray(__spreadArray([], prefix, true), [orQuery.filterTree], false) }), newInvalidArguments.concat(orQuery.invalidArguments));
+            }
+            else {
+                return this._copy(this.filterTree, newInvalidArguments);
+            }
+        };
+        class_2.prototype.and = function (andQuery) {
+            var _a = this._filterValidator('.and')
+                .arityIsOne(arguments)
+                .isInstanceOfSameClass(andQuery)
+                .validateAndAggregate(), newInvalidArguments = _a[0], valid = _a[1];
+            if (valid) {
+                var prefix = isEmptyAnd(this.filterTree) ? [] : [this.filterTree];
+                return this._copy(inAnd.apply(void 0, __spreadArray(__spreadArray([], prefix, false), [andQuery.filterTree], false)), newInvalidArguments.concat(andQuery.invalidArguments));
+            }
+            else {
+                return this._copy(this.filterTree, newInvalidArguments);
+            }
+        };
+        class_2.prototype.not = function (notQuery) {
+            var _a = this._filterValidator('.not')
+                .arityIsOne(arguments)
+                .isInstanceOfSameClass(notQuery)
+                .validateAndAggregate(), newInvalidArguments = _a[0], valid = _a[1];
+            if (valid) {
+                var newFilterTree = clone(this.filterTree);
+                var notClause = { $not: [notQuery.filterTree] };
+                var resultingFilter = inAndOptimized(newFilterTree, notClause);
+                return this._copy(resultingFilter, newInvalidArguments.concat(notQuery.invalidArguments));
+            }
+            else {
+                return this._copy(this.filterTree, newInvalidArguments);
+            }
+        };
+        class_2.prototype.between = function (field, rangeStart, rangeEnd) {
+            var _a = this._filterValidator('.between')
+                .arityIsThree(arguments)
+                .sameType(rangeStart, rangeEnd)
+                .typeIsStringNumberOrDate(rangeStart)
+                .typeIsStringNumberOrDate(rangeEnd)
+                .validateAndAggregate(), newInvalidArguments = _a[0], valid = _a[1];
+            if (valid) {
+                return this.ge(field, rangeStart).lt(field, rangeEnd);
+            }
+            return this._copy(this.filterTree, newInvalidArguments);
+        };
+        class_2.prototype.getFilterModel = function () {
+            if (this.invalidArguments.length > 0) {
+                throw new Error(this.invalidArguments.join(' '));
+            }
+            return optimisedQuery(this.filterTree);
+        };
+        class_2.prototype.setFilterModel = function (filterModel) {
+            return this._copy(filterModel, []);
+        };
+        class_2.prototype._binaryAnd = function (filterOperatorSymbol, operatorName, args) {
+            var _a = Array.prototype.slice.call(args), field = _a[0], operand = _a[1];
+            var newInvalidArguments = this._filterValidator(operatorName)
+                .arityIsTwo(args)
+                .validFieldName(field)
+                .validateAndAggregate()[0];
+            var newFilterTree = this._makeNewFilter(field, filterOperatorSymbol, operand);
+            return this._copy(newFilterTree, newInvalidArguments);
+        };
+        class_2.prototype._AndLogicalEquivalence = function (filterOperatorSymbol, operatorName, args) {
+            var _a = Array.prototype.slice.call(args), field = _a[0], operand = _a[1];
+            var newInvalidArguments = this._filterValidator(operatorName)
+                .arityIsTwo(args)
+                .validFieldName(field)
+                .typeIsStringNumberOrDate(operand)
+                .validateAndAggregate()[0];
+            var newFilterTree = this._makeNewFilter(field, filterOperatorSymbol, operand);
+            return this._copy(newFilterTree, newInvalidArguments);
+        };
+        class_2.prototype._AndStringOperand = function (filterOperatorName, operatorName, args) {
+            var _a = Array.prototype.slice.call(args), field = _a[0], operand = _a[1];
+            var newInvalidArguments = this._filterValidator(operatorName)
+                .arityIsTwo(args)
+                .validFieldName(field)
+                .typeIsString(operand)
+                .validateAndAggregate()[0];
+            var newFilterTree = this._makeNewFilter(field, filterOperatorName, operand);
+            return this._copy(newFilterTree, newInvalidArguments);
+        };
+        class_2.prototype._AndSetOperand = function (filterOperatorName, operatorName, args) {
+            var _a = Array.prototype.slice.call(args), field = _a[0], rawOperands = _a.slice(1);
+            var operands = isArray(rawOperands[0]) ? rawOperands[0] : rawOperands;
+            var newInvalidArguments = this._filterValidator(operatorName)
+                .arityIsAtLeastTwo(args)
+                .validFieldName(field)
+                .typeIsStringNumberOrDateForAll(operands)
+                .validateAndAggregate()[0];
+            var newFilterTree = this._makeNewFilter(field, filterOperatorName, operands);
+            return this._copy(newFilterTree, newInvalidArguments);
+        };
+        class_2.prototype._makeNewFilter = function (field, filterOperatorName, operand) {
+            var newFilterTree = clone(this.filterTree);
+            var serializableOperand = operand === undefined ? null : operand;
+            var newFilter = this._buildFilter(field, filterOperatorName, serializableOperand);
+            if (isArray(newFilterTree.$and)) {
+                newFilterTree.$and.push(newFilter);
+                return newFilterTree;
+            }
+            else {
+                var result = isEmptyObject(newFilterTree)
+                    ? inAnd(newFilter)
+                    : inAnd(newFilterTree, newFilter);
+                return result;
+            }
+        };
+        class_2.prototype._buildFilter = function (field, filterOperatorName, operand) {
+            if (filterOperatorName !== '$eq') {
+                var newFilter = {};
+                newFilter[field] = {};
+                newFilter[field][filterOperatorName] = this._replaceRefs(operand);
+                return newFilter;
+            }
+            else {
+                var newFilter = {};
+                newFilter[field] = this._replaceRefs(operand);
+                return newFilter;
+            }
+        };
+        class_2.prototype._replaceRefs = function (operand) {
+            var _this = this;
+            if (isArray(operand)) {
+                return operand.map(function (op) { return _this._replaceRefs(op); });
+            }
+            else {
+                return operand;
+            }
+        };
+        class_2.prototype._copy = function (filterTree, invalidArguments) {
+            return new this.constructor(__assign(__assign({}, this), { filterTree: filterTree, invalidArguments: invalidArguments }));
+        };
+        class_2.prototype._filterValidator = function (filterOperatorName) {
+            return new FilterValidator(filterOperatorName, this.invalidArguments, this.constructor);
+        };
+        return class_2;
+    }(Base));
+};
+function isConjunctiveFormFilter(filterTree) {
+    return isArray(filterTree.$and);
+}
+function isEmptyObject(obj) {
+    return Object.keys(obj).length === 0;
+}
+function inAnd() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    return {
+        $and: args,
+    };
+}
+function inAndOptimized() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    return {
+        $and: args.reduce(function (aggr, val) {
+            return isConjunctiveFormFilter(val)
+                ? aggr.concat(val.$and)
+                : aggr.concat([val]);
+        }, []),
+    };
+}
+function isEmptyAnd(node) {
+    return node && node.$and && node.$and.length === 0;
+}
+export default filterMixin;
+//# sourceMappingURL=filter-mixin.js.map

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

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

package/dist/esm/filter-validator.js

@@ -0,0 +1,78 @@
+import { typeForDisplay, isDate, isString, isNumber } from './type-utils';
+import clone from './clone';
+var FilterValidator = (function () {
+    function FilterValidator(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) {
+        this._validations.push({
+            predicateFn: predicateFn,
+            messageFn: 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());
+        });
+        return [this._invalidArguments, valid];
+    };
+    FilterValidator.prototype._appendIfInvalid = function (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);
+}
+//# sourceMappingURL=filter-validator.js.map

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

@@ -0,0 +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,iBAKC;QAJC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,QAAQ,CAAC,KAAK,CAAC,EAAf,CAAe,EACrB,cAAM,OAAA,kBAAW,KAAI,CAAC,YAAY,+BAAqB,cAAc,CAAC,KAAK,CAAC,gBAAM,KAAI,CAAC,YAAY,iCAA8B,EAA3H,CAA2H,CAClI,CAAA;IACH,CAAC;IAED,kDAAwB,GAAxB,UAAyB,KAAK;QAA9B,iBAKC;QAJC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,oBAAoB,CAAC,KAAK,CAAC,EAA3B,CAA2B,EACjC,cAAM,OAAA,kBAAW,KAAI,CAAC,YAAY,+BAAqB,cAAc,CAAC,KAAK,CAAC,sBAAY,KAAI,CAAC,YAAY,iDAA8C,EAAjJ,CAAiJ,CACxJ,CAAA;IACH,CAAC;IAED,kCAAQ,GAAR,UAAS,KAAK,EAAE,MAAM;QAAtB,iBAKC;QAJC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,cAAc,CAAC,KAAK,CAAC,KAAK,cAAc,CAAC,MAAM,CAAC,EAAhD,CAAgD,EACtD,cAAM,OAAA,kBAAW,KAAI,CAAC,YAAY,gCAAsB,cAAc,CAAC,KAAK,CAAC,oBAAU,cAAc,CAAC,MAAM,CAAC,iDAA8C,EAArJ,CAAqJ,CAC5J,CAAA;IACH,CAAC;IAED,wDAA8B,GAA9B,UAA+B,MAAM;QAArC,iBAKC;QAJC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAlC,CAAkC,EACxC,cAAM,OAAA,kBAAW,KAAI,CAAC,YAAY,qBAAW,KAAI,CAAC,YAAY,iDAA8C,EAAtG,CAAsG,CAC7G,CAAA;IACH,CAAC;IAED,wCAAc,GAAd,UAAe,KAAK;QAApB,iBAKC;QAJC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,QAAQ,CAAC,KAAK,CAAC,EAAf,CAAe,EACrB,cAAM,OAAA,kBAAW,KAAI,CAAC,YAAY,2BAAiB,cAAc,CAAC,KAAK,CAAC,gBAAM,KAAI,CAAC,YAAY,6BAA0B,EAAnH,CAAmH,CAC1H,CAAA;IACH,CAAC;IAED,+CAAqB,GAArB,UAAsB,GAAG;QAAzB,iBAKC;QAJC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,GAAG,YAAY,KAAI,CAAC,IAAI,EAAxB,CAAwB,EAC9B,cAAM,OAAA,kBAAW,KAAI,CAAC,YAAY,yBAAe,cAAc,CAAC,GAAG,CAAC,gBAAM,KAAI,CAAC,YAAY,iCAA8B,EAAnH,CAAmH,CAC1H,CAAA;IACH,CAAC;IAED,oCAAU,GAAV,UAAW,IAAI;QAAf,iBAKC;QAJC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,IAAI,CAAC,MAAM,KAAK,CAAC,EAAjB,CAAiB,EACvB,cAAM,OAAA,kBAAW,KAAI,CAAC,YAAY,qBAAW,KAAI,CAAC,YAAY,6BAA0B,EAAlF,CAAkF,CACzF,CAAA;IACH,CAAC;IAED,oCAAU,GAAV,UAAW,IAAI;QAAf,iBAKC;QAJC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,IAAI,CAAC,MAAM,KAAK,CAAC,EAAjB,CAAiB,EACvB,cAAM,OAAA,kBAAW,KAAI,CAAC,YAAY,qBAAW,KAAI,CAAC,YAAY,8BAA2B,EAAnF,CAAmF,CAC1F,CAAA;IACH,CAAC;IAED,sCAAY,GAAZ,UAAa,IAAI;QAAjB,iBAKC;QAJC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,IAAI,CAAC,MAAM,KAAK,CAAC,EAAjB,CAAiB,EACvB,cAAM,OAAA,kBAAW,KAAI,CAAC,YAAY,qBAAW,KAAI,CAAC,YAAY,gCAA6B,EAArF,CAAqF,CAC5F,CAAA;IACH,CAAC;IAED,2CAAiB,GAAjB,UAAkB,IAAI;QAAtB,iBAKC;QAJC,OAAO,IAAI,CAAC,aAAa,CACvB,cAAM,OAAA,IAAI,CAAC,MAAM,IAAI,CAAC,EAAhB,CAAgB,EACtB,cAAM,OAAA,kBAAW,KAAI,CAAC,YAAY,qBAAW,KAAI,CAAC,YAAY,uCAAoC,EAA5F,CAA4F,CACnG,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,AAzGD,IAyGC;;AAED,SAAS,oBAAoB,CAAC,KAAK;IACjC,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAA;AAC5D,CAAC"}

package/dist/esm/index.js

@@ -0,0 +1,6 @@
+import { filterBuilder } from './filter-builder';
+import filterMixin from './filter-mixin';
+import { optimisedQuery as optimiseQuery } from './query-optimiser';
+export { filterMixin, filterBuilder, optimiseQuery };
+export default filterBuilder;
+//# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,WAAW,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,cAAc,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAGnE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAa,CAAA;AAE/D,eAAe,aAAa,CAAA"}

package/dist/esm/query-optimiser.js

@@ -0,0 +1,171 @@
+import { __assign, __spreadArray } from "tslib";
+var optimisations = [
+    optimisedUnaryAnd,
+    optimisedEmptyAnd,
+    optimisedAndsAsObjects,
+    optimisedNestedAnds,
+    optimisedNestedOrs,
+];
+export function optimisedQuery(query) {
+    var newQuery = fullyOptimised(query)[0];
+    return newQuery;
+}
+function fullyOptimised(query) {
+    if (Array.isArray(query)) {
+        return fullyOptimisedArray(query);
+    }
+    if (typeof query === 'object' &&
+        query !== null &&
+        !instanceOfIgnoredType(query)) {
+        return fullyOptimisedObject(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;
+    });
+    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;
+    return [queryAfterFullOptimisation, changed];
+    function fullObjectOptimisation(query) {
+        var updatedQuery = applyFirstOptimisation(query);
+        if (!updatedQuery) {
+            return [query, false];
+        }
+        var finalQuery = fullyOptimised(updatedQuery)[0];
+        return [finalQuery, true];
+    }
+    function fullEntriesOptimisation(query) {
+        var 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;
+        return [newQuery, changed];
+    }
+    function entryOptimisation(_a) {
+        var key = _a[0], value = _a[1];
+        var _b = fullyOptimised(value), newValue = _b[0], changed = _b[1];
+        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)));
+        }, {});
+    }
+}
+function applyFirstOptimisation(node) {
+    for (var _i = 0, optimisations_1 = optimisations; _i < optimisations_1.length; _i++) {
+        var optimisation = optimisations_1[_i];
+        var newNode = optimisation(node);
+        if (newNode) {
+            return newNode;
+        }
+    }
+}
+function optimisedUnaryAnd(node) {
+    var args = node.$and;
+    if (Array.isArray(args) && args.length === 1) {
+        return args[0];
+    }
+}
+function optimisedEmptyAnd(node) {
+    var args = node.$and;
+    if (Array.isArray(args) && args.length === 0) {
+        return {};
+    }
+    return null;
+}
+function optimisedAndsAsObjects(node) {
+    var args = node.$and;
+    if (!args) {
+        return;
+    }
+    var basicObjects = [];
+    var operatorObjects = [];
+    args.forEach(function (arg) {
+        if (isOperator(arg)) {
+            operatorObjects = __spreadArray(__spreadArray([], operatorObjects, true), [arg], false);
+        }
+        else {
+            basicObjects = __spreadArray(__spreadArray([], basicObjects, true), [arg], false);
+        }
+    });
+    if (basicObjects.length <= 1 || haveOverlappingFields(basicObjects)) {
+        return;
+    }
+    var combinedBasicObjects = Object.assign.apply(Object, __spreadArray([{}], basicObjects, false));
+    return { $and: __spreadArray([combinedBasicObjects], operatorObjects, true) };
+    function isOperator(node) {
+        var keys = Object.keys(node);
+        return keys.every(function (name) { return 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);
+        return uniqueKeys.length !== nonUniqueKeys.length;
+    }
+    function unique(values) {
+        var dict = {};
+        values.forEach(function (v) { return (dict[v] = true); });
+        return Object.keys(dict);
+    }
+}
+function optimisedNestedAnds(node) {
+    var args = node.$and;
+    if (!args) {
+        return;
+    }
+    var hasNestedAnds = !!args.find(function (it) { return it.$and; });
+    if (!hasNestedAnds) {
+        return;
+    }
+    var newArgs = args.reduce(function (result, current) {
+        var and = current.$and;
+        if (!and) {
+            return __spreadArray(__spreadArray([], result, true), [current], false);
+        }
+        return __spreadArray(__spreadArray([], result, true), and, true);
+    }, []);
+    return { $and: newArgs };
+}
+function optimisedNestedOrs(node) {
+    var args = node.$or;
+    if (!args) {
+        return;
+    }
+    var hasNestedOrs = !!args.find(function (it) { return it.$or; });
+    if (!hasNestedOrs) {
+        return;
+    }
+    var newArgs = args.reduce(function (result, current) {
+        var or = current.$or;
+        if (!or) {
+            return __spreadArray(__spreadArray([], result, true), [current], false);
+        }
+        return __spreadArray(__spreadArray([], result, true), or, true);
+    }, []);
+    return { $or: newArgs };
+}
+function instanceOfIgnoredType(obj) {
+    return obj instanceof Date;
+}
+//# sourceMappingURL=query-optimiser.js.map

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

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