@wix/filter-builder 1.0.1

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/filter-builder.ts"],"names":["FilterBuilder","constructorName","_build","getFilterModel","filterBuilder"],"mappings":";;;;;;;;AAAA;;AAEO,MAAMA,aAAN,SAA4B,2BAA5B,CAA0C;AAC5B,MAAfC,eAAe,GAAG;AACpB,WAAO,eAAP;AACD;;AAEDC,EAAAA,MAAM,GAAG;AACP,WAAO,KAAKC,cAAL,EAAP;AACD;;AAP8C;;;;AAU1C,SAASC,aAAT,GAAyB;AAC9B,SAAO,IAAIJ,aAAJ,CAAkB,EAAlB,CAAP;AACD;;eAEcI,a","sourcesContent":["import filterMixin from './filter-mixin'\n\nexport class FilterBuilder extends filterMixin() {\n  get constructorName() {\n    return 'FilterBuilder'\n  }\n\n  _build() {\n    return this.getFilterModel()\n  }\n}\n\nexport function filterBuilder() {\n  return new FilterBuilder({})\n}\n\nexport default filterBuilder\n"]}

package/dist/cjs/filter-mixin.js

@@ -0,0 +1,299 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _typeUtils = require("./type-utils");
+
+var _clone = _interopRequireDefault(require("./clone"));
+
+var _filterValidator = require("./filter-validator");
+
+var _queryOptimiser = require("./query-optimiser");
+
+const filterMixin = (Base = class {}) => class extends Base {
+  constructor(obj = {}) {
+    super(obj);
+    (0, _defineProperty2.default)(this, "filterTree", void 0);
+    (0, _defineProperty2.default)(this, "invalidArguments", void 0);
+    this.filterTree = obj.filterTree || {
+      $and: []
+    };
+    this.invalidArguments = obj.invalidArguments || [];
+  }
+
+  eq(...args) {
+    return this._binaryAnd('$eq', '.eq', args);
+  }
+
+  ne(...args) {
+    return this._binaryAnd('$ne', '.ne', args);
+  }
+
+  ge(...args) {
+    return this._AndLogicalEquivalence('$gte', '.ge', args);
+  }
+
+  gt(...args) {
+    return this._AndLogicalEquivalence('$gt', '.gt', args);
+  }
+
+  le(...args) {
+    return this._AndLogicalEquivalence('$lte', '.le', args);
+  }
+
+  lt(...args) {
+    return this._AndLogicalEquivalence('$lt', '.lt', args);
+  }
+
+  isNotEmpty(field) {
+    const _this$_filterValidato = this._filterValidator('.isNotEmpty').arityIsOne(arguments).validFieldName(field).validateAndAggregate(),
+          newInvalidArguments = _this$_filterValidato[0],
+          valid = _this$_filterValidato[1];
+
+    if (valid) {
+      return this.ne(field, null);
+    }
+
+    return this._copy(this.filterTree, newInvalidArguments);
+  }
+
+  isEmpty(field) {
+    const _this$_filterValidato2 = this._filterValidator('.isEmpty').arityIsOne(arguments).validFieldName(field).validateAndAggregate(),
+          newInvalidArguments = _this$_filterValidato2[0],
+          valid = _this$_filterValidato2[1];
+
+    if (valid) {
+      return this.eq(field, null);
+    }
+
+    return this._copy(this.filterTree, newInvalidArguments);
+  }
+
+  startsWith(...args) {
+    return this._AndStringOperand('$startsWith', '.startsWith', args);
+  }
+
+  endsWith(...args) {
+    return this._AndStringOperand('$endsWith', '.endsWith', args);
+  }
+
+  contains(...args) {
+    return this._AndStringOperand('$contains', '.contains', args);
+  }
+
+  hasSome(...args) {
+    return this._AndSetOperand('$hasSome', '.hasSome', args);
+  }
+
+  hasAll(...args) {
+    return this._AndSetOperand('$hasAll', '.hasAll', args);
+  }
+
+  or(orQuery) {
+    const _this$_filterValidato3 = this._filterValidator('.or').arityIsOne(arguments).isInstanceOfSameClass(orQuery).validateAndAggregate(),
+          newInvalidArguments = _this$_filterValidato3[0],
+          valid = _this$_filterValidato3[1];
+
+    if (valid) {
+      const prefix = isEmptyAnd(this.filterTree) ? [] : [this.filterTree];
+      return this._copy(inAnd({
+        $or: [...prefix, orQuery.filterTree]
+      }), newInvalidArguments.concat(orQuery.invalidArguments));
+    } else {
+      return this._copy(this.filterTree, newInvalidArguments);
+    }
+  }
+
+  and(andQuery) {
+    const _this$_filterValidato4 = this._filterValidator('.and').arityIsOne(arguments).isInstanceOfSameClass(andQuery).validateAndAggregate(),
+          newInvalidArguments = _this$_filterValidato4[0],
+          valid = _this$_filterValidato4[1];
+
+    if (valid) {
+      const prefix = isEmptyAnd(this.filterTree) ? [] : [this.filterTree];
+      return this._copy(inAnd(...prefix, andQuery.filterTree), newInvalidArguments.concat(andQuery.invalidArguments));
+    } else {
+      return this._copy(this.filterTree, newInvalidArguments);
+    }
+  }
+
+  not(notQuery) {
+    const _this$_filterValidato5 = this._filterValidator('.not').arityIsOne(arguments).isInstanceOfSameClass(notQuery).validateAndAggregate(),
+          newInvalidArguments = _this$_filterValidato5[0],
+          valid = _this$_filterValidato5[1];
+
+    if (valid) {
+      const newFilterTree = (0, _clone.default)(this.filterTree);
+      const notClause = {
+        $not: [notQuery.filterTree]
+      };
+      const resultingFilter = inAndOptimized(newFilterTree, notClause);
+      return this._copy(resultingFilter, newInvalidArguments.concat(notQuery.invalidArguments));
+    } else {
+      return this._copy(this.filterTree, newInvalidArguments);
+    }
+  }
+
+  between(field, rangeStart, rangeEnd) {
+    const _this$_filterValidato6 = this._filterValidator('.between').arityIsThree(arguments).sameType(rangeStart, rangeEnd).typeIsStringNumberOrDate(rangeStart).typeIsStringNumberOrDate(rangeEnd).validateAndAggregate(),
+          newInvalidArguments = _this$_filterValidato6[0],
+          valid = _this$_filterValidato6[1];
+
+    if (valid) {
+      return this.ge(field, rangeStart).lt(field, rangeEnd);
+    }
+
+    return this._copy(this.filterTree, newInvalidArguments);
+  }
+
+  getFilterModel() {
+    if (this.invalidArguments.length > 0) {
+      throw new Error(this.invalidArguments.join(' '));
+    }
+
+    return (0, _queryOptimiser.optimisedQuery)(this.filterTree);
+  }
+
+  setFilterModel(filterModel) {
+    return this._copy(filterModel, []);
+  }
+
+  _binaryAnd(filterOperatorSymbol, operatorName, args) {
+    const _Array$prototype$slic = Array.prototype.slice.call(args),
+          field = _Array$prototype$slic[0],
+          operand = _Array$prototype$slic[1];
+
+    const _this$_filterValidato7 = this._filterValidator(operatorName).arityIsTwo(args).validFieldName(field).validateAndAggregate(),
+          newInvalidArguments = _this$_filterValidato7[0];
+
+    const newFilterTree = this._makeNewFilter(field, filterOperatorSymbol, operand);
+
+    return this._copy(newFilterTree, newInvalidArguments);
+  }
+
+  _AndLogicalEquivalence(filterOperatorSymbol, operatorName, args) {
+    const _Array$prototype$slic2 = Array.prototype.slice.call(args),
+          field = _Array$prototype$slic2[0],
+          operand = _Array$prototype$slic2[1];
+
+    const _this$_filterValidato8 = this._filterValidator(operatorName).arityIsTwo(args).validFieldName(field).typeIsStringNumberOrDate(operand).validateAndAggregate(),
+          newInvalidArguments = _this$_filterValidato8[0];
+
+    const newFilterTree = this._makeNewFilter(field, filterOperatorSymbol, operand);
+
+    return this._copy(newFilterTree, newInvalidArguments);
+  }
+
+  _AndStringOperand(filterOperatorName, operatorName, args) {
+    const _Array$prototype$slic3 = Array.prototype.slice.call(args),
+          field = _Array$prototype$slic3[0],
+          operand = _Array$prototype$slic3[1];
+
+    const _this$_filterValidato9 = this._filterValidator(operatorName).arityIsTwo(args).validFieldName(field).typeIsString(operand).validateAndAggregate(),
+          newInvalidArguments = _this$_filterValidato9[0];
+
+    const newFilterTree = this._makeNewFilter(field, filterOperatorName, operand);
+
+    return this._copy(newFilterTree, newInvalidArguments);
+  }
+
+  _AndSetOperand(filterOperatorName, operatorName, args) {
+    const _Array$prototype$slic4 = Array.prototype.slice.call(args),
+          field = _Array$prototype$slic4[0],
+          rawOperands = _Array$prototype$slic4.slice(1);
+
+    const operands = (0, _typeUtils.isArray)(rawOperands[0]) ? rawOperands[0] : rawOperands;
+
+    const _this$_filterValidato10 = this._filterValidator(operatorName).arityIsAtLeastTwo(args).validFieldName(field).typeIsStringNumberOrDateForAll(operands).validateAndAggregate(),
+          newInvalidArguments = _this$_filterValidato10[0];
+
+    const newFilterTree = this._makeNewFilter(field, filterOperatorName, operands);
+
+    return this._copy(newFilterTree, newInvalidArguments);
+  }
+
+  _makeNewFilter(field, filterOperatorName, operand) {
+    const newFilterTree = (0, _clone.default)(this.filterTree); // filters with 'undefined' value are lost during serialization,
+    // e.g. { val: { $ne: undefined } | translates to { val: {} }
+    // Replacing 'undefined' with 'null' retains the filter.
+
+    const serializableOperand = operand === undefined ? null : operand;
+
+    const newFilter = this._buildFilter(field, filterOperatorName, serializableOperand);
+
+    if ((0, _typeUtils.isArray)(newFilterTree.$and)) {
+      newFilterTree.$and.push(newFilter);
+      return newFilterTree;
+    } else {
+      const result = isEmptyObject(newFilterTree) ? inAnd(newFilter) : inAnd(newFilterTree, newFilter);
+      return result;
+    }
+  }
+
+  _buildFilter(field, filterOperatorName, operand) {
+    if (filterOperatorName !== '$eq') {
+      const newFilter = {};
+      newFilter[field] = {};
+      newFilter[field][filterOperatorName] = this._replaceRefs(operand);
+      return newFilter;
+    } else {
+      const newFilter = {};
+      newFilter[field] = this._replaceRefs(operand);
+      return newFilter;
+    }
+  }
+
+  _replaceRefs(operand) {
+    if ((0, _typeUtils.isArray)(operand)) {
+      return operand.map(op => this._replaceRefs(op));
+    } else {
+      return operand;
+    }
+  }
+
+  _copy(filterTree, invalidArguments) {
+    // @ts-ignore-next-line
+    return new this.constructor({ ...this,
+      filterTree,
+      invalidArguments
+    });
+  }
+
+  _filterValidator(filterOperatorName) {
+    return new _filterValidator.FilterValidator(filterOperatorName, this.invalidArguments, this.constructor);
+  }
+
+};
+
+function isConjunctiveFormFilter(filterTree) {
+  return (0, _typeUtils.isArray)(filterTree.$and);
+}
+
+function isEmptyObject(obj) {
+  return Object.keys(obj).length === 0;
+}
+
+function inAnd(...args) {
+  return {
+    $and: args
+  };
+}
+
+function inAndOptimized(...args) {
+  return {
+    $and: args.reduce((aggr, val) => isConjunctiveFormFilter(val) ? aggr.concat(val.$and) : aggr.concat([val]), [])
+  };
+}
+
+function isEmptyAnd(node) {
+  return node && node.$and && node.$and.length === 0;
+}
+
+var _default = filterMixin;
+exports.default = _default;
+//# sourceMappingURL=filter-mixin.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/filter-mixin.ts"],"names":["filterMixin","Base","constructor","obj","filterTree","$and","invalidArguments","eq","args","_binaryAnd","ne","ge","_AndLogicalEquivalence","gt","le","lt","isNotEmpty","field","_filterValidator","arityIsOne","arguments","validFieldName","validateAndAggregate","newInvalidArguments","valid","_copy","isEmpty","startsWith","_AndStringOperand","endsWith","contains","hasSome","_AndSetOperand","hasAll","or","orQuery","isInstanceOfSameClass","prefix","isEmptyAnd","inAnd","$or","concat","and","andQuery","not","notQuery","newFilterTree","notClause","$not","resultingFilter","inAndOptimized","between","rangeStart","rangeEnd","arityIsThree","sameType","typeIsStringNumberOrDate","getFilterModel","length","Error","join","setFilterModel","filterModel","filterOperatorSymbol","operatorName","Array","prototype","slice","call","operand","arityIsTwo","_makeNewFilter","filterOperatorName","typeIsString","rawOperands","operands","arityIsAtLeastTwo","typeIsStringNumberOrDateForAll","serializableOperand","undefined","newFilter","_buildFilter","push","result","isEmptyObject","_replaceRefs","map","op","FilterValidator","isConjunctiveFormFilter","Object","keys","reduce","aggr","val","node"],"mappings":"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","sourcesContent":["import { isArray } from './type-utils'\nimport clone from './clone'\nimport { FilterValidator } from './filter-validator'\nimport { Validator } from './validator'\nimport { optimisedQuery } from './query-optimiser'\n\nconst filterMixin = (Base: any = class {}) =>\n  class extends Base {\n    filterTree\n    invalidArguments\n\n    constructor(obj: { filterTree?; invalidArguments? } = {}) {\n      super(obj)\n      this.filterTree = obj.filterTree || { $and: [] }\n      this.invalidArguments = obj.invalidArguments || []\n    }\n\n    eq(...args) {\n      return this._binaryAnd('$eq', '.eq', args)\n    }\n\n    ne(...args) {\n      return this._binaryAnd('$ne', '.ne', args)\n    }\n\n    ge(...args) {\n      return this._AndLogicalEquivalence('$gte', '.ge', args)\n    }\n\n    gt(...args) {\n      return this._AndLogicalEquivalence('$gt', '.gt', args)\n    }\n\n    le(...args) {\n      return this._AndLogicalEquivalence('$lte', '.le', args)\n    }\n\n    lt(...args) {\n      return this._AndLogicalEquivalence('$lt', '.lt', args)\n    }\n\n    isNotEmpty(field) {\n      const [newInvalidArguments, valid] = this._filterValidator('.isNotEmpty')\n        .arityIsOne(arguments)\n        .validFieldName(field)\n        .validateAndAggregate()\n\n      if (valid) {\n        return this.ne(field, null)\n      }\n\n      return this._copy(this.filterTree, newInvalidArguments)\n    }\n\n    isEmpty(field) {\n      const [newInvalidArguments, valid] = this._filterValidator('.isEmpty')\n        .arityIsOne(arguments)\n        .validFieldName(field)\n        .validateAndAggregate()\n\n      if (valid) {\n        return this.eq(field, null)\n      }\n\n      return this._copy(this.filterTree, newInvalidArguments)\n    }\n\n    startsWith(...args) {\n      return this._AndStringOperand('$startsWith', '.startsWith', args)\n    }\n\n    endsWith(...args) {\n      return this._AndStringOperand('$endsWith', '.endsWith', args)\n    }\n\n    contains(...args) {\n      return this._AndStringOperand('$contains', '.contains', args)\n    }\n\n    hasSome(...args) {\n      return this._AndSetOperand('$hasSome', '.hasSome', args)\n    }\n\n    hasAll(...args) {\n      return this._AndSetOperand('$hasAll', '.hasAll', args)\n    }\n\n    or(orQuery) {\n      const [newInvalidArguments, valid] = this._filterValidator('.or')\n        .arityIsOne(arguments)\n        .isInstanceOfSameClass(orQuery)\n        .validateAndAggregate()\n\n      if (valid) {\n        const prefix = isEmptyAnd(this.filterTree) ? [] : [this.filterTree]\n        return this._copy(\n          inAnd({ $or: [...prefix, orQuery.filterTree] }),\n          newInvalidArguments.concat(orQuery.invalidArguments)\n        )\n      } else {\n        return this._copy(this.filterTree, newInvalidArguments)\n      }\n    }\n\n    and(andQuery) {\n      const [newInvalidArguments, valid] = this._filterValidator('.and')\n        .arityIsOne(arguments)\n        .isInstanceOfSameClass(andQuery)\n        .validateAndAggregate()\n\n      if (valid) {\n        const prefix = isEmptyAnd(this.filterTree) ? [] : [this.filterTree]\n        return this._copy(\n          inAnd(...prefix, andQuery.filterTree),\n          newInvalidArguments.concat(andQuery.invalidArguments)\n        )\n      } else {\n        return this._copy(this.filterTree, newInvalidArguments)\n      }\n    }\n\n    not(notQuery) {\n      const [newInvalidArguments, valid] = this._filterValidator('.not')\n        .arityIsOne(arguments)\n        .isInstanceOfSameClass(notQuery)\n        .validateAndAggregate()\n\n      if (valid) {\n        const newFilterTree = clone(this.filterTree)\n        const notClause = { $not: [notQuery.filterTree] }\n        const resultingFilter = inAndOptimized(newFilterTree, notClause)\n\n        return this._copy(\n          resultingFilter,\n          newInvalidArguments.concat(notQuery.invalidArguments)\n        )\n      } else {\n        return this._copy(this.filterTree, newInvalidArguments)\n      }\n    }\n\n    between(field, rangeStart, rangeEnd) {\n      const [newInvalidArguments, valid] = this._filterValidator('.between')\n        .arityIsThree(arguments)\n        .sameType(rangeStart, rangeEnd)\n        .typeIsStringNumberOrDate(rangeStart)\n        .typeIsStringNumberOrDate(rangeEnd)\n        .validateAndAggregate()\n\n      if (valid) {\n        return this.ge(field, rangeStart).lt(field, rangeEnd)\n      }\n\n      return this._copy(this.filterTree, newInvalidArguments)\n    }\n\n    getFilterModel() {\n      if (this.invalidArguments.length > 0) {\n        throw new Error(this.invalidArguments.join(' '))\n      }\n      return optimisedQuery(this.filterTree)\n    }\n\n    setFilterModel(filterModel) {\n      return this._copy(filterModel, [])\n    }\n\n    _binaryAnd(filterOperatorSymbol, operatorName, args) {\n      const [field, operand] = Array.prototype.slice.call(args)\n\n      const [newInvalidArguments] = this._filterValidator(operatorName)\n        .arityIsTwo(args)\n        .validFieldName(field)\n        .validateAndAggregate()\n\n      const newFilterTree = this._makeNewFilter(\n        field,\n        filterOperatorSymbol,\n        operand\n      )\n\n      return this._copy(newFilterTree, newInvalidArguments)\n    }\n\n    _AndLogicalEquivalence(filterOperatorSymbol, operatorName, args) {\n      const [field, operand] = Array.prototype.slice.call(args)\n\n      const [newInvalidArguments] = this._filterValidator(operatorName)\n        .arityIsTwo(args)\n        .validFieldName(field)\n        .typeIsStringNumberOrDate(operand)\n        .validateAndAggregate()\n\n      const newFilterTree = this._makeNewFilter(\n        field,\n        filterOperatorSymbol,\n        operand\n      )\n      return this._copy(newFilterTree, newInvalidArguments)\n    }\n\n    _AndStringOperand(filterOperatorName, operatorName, args) {\n      const [field, operand] = Array.prototype.slice.call(args)\n\n      const [newInvalidArguments] = this._filterValidator(operatorName)\n        .arityIsTwo(args)\n        .validFieldName(field)\n        .typeIsString(operand)\n        .validateAndAggregate()\n\n      const newFilterTree = this._makeNewFilter(\n        field,\n        filterOperatorName,\n        operand\n      )\n\n      return this._copy(newFilterTree, newInvalidArguments)\n    }\n\n    _AndSetOperand(filterOperatorName, operatorName, args) {\n      const [field, ...rawOperands] = Array.prototype.slice.call(args)\n      const operands = isArray(rawOperands[0]) ? rawOperands[0] : rawOperands\n\n      const [newInvalidArguments] = this._filterValidator(operatorName)\n        .arityIsAtLeastTwo(args)\n        .validFieldName(field)\n        .typeIsStringNumberOrDateForAll(operands)\n        .validateAndAggregate()\n\n      const newFilterTree = this._makeNewFilter(\n        field,\n        filterOperatorName,\n        operands\n      )\n      return this._copy(newFilterTree, newInvalidArguments)\n    }\n\n    _makeNewFilter(field, filterOperatorName, operand) {\n      const newFilterTree = clone(this.filterTree)\n\n      // filters with 'undefined' value are lost during serialization,\n      // e.g. { val: { $ne: undefined } | translates to { val: {} }\n      // Replacing 'undefined' with 'null' retains the filter.\n      const serializableOperand = operand === undefined ? null : operand\n      const newFilter = this._buildFilter(\n        field,\n        filterOperatorName,\n        serializableOperand\n      )\n\n      if (isArray(newFilterTree.$and)) {\n        newFilterTree.$and.push(newFilter)\n        return newFilterTree\n      } else {\n        const result = isEmptyObject(newFilterTree)\n          ? inAnd(newFilter)\n          : inAnd(newFilterTree, newFilter)\n        return result\n      }\n    }\n\n    _buildFilter(field, filterOperatorName, operand) {\n      if (filterOperatorName !== '$eq') {\n        const newFilter = {}\n        newFilter[field] = {}\n        newFilter[field][filterOperatorName] = this._replaceRefs(operand)\n        return newFilter\n      } else {\n        const newFilter = {}\n        newFilter[field] = this._replaceRefs(operand)\n        return newFilter\n      }\n    }\n\n    _replaceRefs(operand) {\n      if (isArray(operand)) {\n        return operand.map((op) => this._replaceRefs(op))\n      } else {\n        return operand\n      }\n    }\n\n    _copy(filterTree, invalidArguments) {\n      // @ts-ignore-next-line\n      return new this.constructor({ ...this, filterTree, invalidArguments })\n    }\n\n    _filterValidator(filterOperatorName): Validator {\n      return new FilterValidator(\n        filterOperatorName,\n        this.invalidArguments,\n        this.constructor\n      )\n    }\n  }\n\nfunction isConjunctiveFormFilter(filterTree) {\n  return isArray(filterTree.$and)\n}\n\nfunction isEmptyObject(obj) {\n  return Object.keys(obj).length === 0\n}\n\nfunction inAnd(...args) {\n  return {\n    $and: args,\n  }\n}\n\nfunction inAndOptimized(...args) {\n  return {\n    $and: args.reduce(\n      (aggr, val) =>\n        isConjunctiveFormFilter(val)\n          ? aggr.concat(val.$and)\n          : aggr.concat([val]),\n      []\n    ),\n  }\n}\n\nfunction isEmptyAnd(node) {\n  return node && node.$and && node.$and.length === 0\n}\n\nexport default filterMixin\n"]}

package/dist/cjs/filter-validator.js

@@ -0,0 +1,101 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.FilterValidator = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _typeUtils = require("./type-utils");
+
+var _clone = _interopRequireDefault(require("./clone"));
+
+class FilterValidator {
+  constructor(operatorName, previousInvalidArguments, ctor) {
+    (0, _defineProperty2.default)(this, "ctor", void 0);
+    (0, _defineProperty2.default)(this, "_invalidArguments", void 0);
+    (0, _defineProperty2.default)(this, "_validations", void 0);
+    (0, _defineProperty2.default)(this, "operatorName", void 0);
+    this._validations = [];
+    this.operatorName = operatorName;
+    this.ctor = ctor;
+    this._invalidArguments = (0, _clone.default)(previousInvalidArguments);
+  }
+
+  typeIsString(value) {
+    return this.addValidation(() => (0, _typeUtils.isString)(value), () => `Invalid ${this.operatorName} parameter value [${(0, _typeUtils.typeForDisplay)(value)}]. ${this.operatorName} parameter must be a String.`);
+  }
+
+  typeIsStringNumberOrDate(value) {
+    return this.addValidation(() => isDateStringOrNumber(value), () => `Invalid ${this.operatorName} parameter value [${(0, _typeUtils.typeForDisplay)(value)}]. Valid ${this.operatorName} parameter types are String, Number or Date.`);
+  }
+
+  sameType(first, second) {
+    return this.addValidation(() => (0, _typeUtils.typeForDisplay)(first) === (0, _typeUtils.typeForDisplay)(second), () => `Invalid ${this.operatorName} parameter values [${(0, _typeUtils.typeForDisplay)(first)}] and [${(0, _typeUtils.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(() => (0, _typeUtils.isString)(field), () => `Invalid ${this.operatorName} field value [${(0, _typeUtils.typeForDisplay)(field)}]. ${this.operatorName} field must be a String.`);
+  }
+
+  isInstanceOfSameClass(obj) {
+    return this.addValidation(() => obj instanceof this.ctor, () => `Invalid ${this.operatorName} parameter [${(0, _typeUtils.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,
+      messageFn
+    });
+
+    return this;
+  }
+
+  validateAndAggregate() {
+    const valid = this._validations.every(({
+      predicateFn,
+      messageFn
+    }) => this._appendIfInvalid(predicateFn(), messageFn()));
+
+    return [this._invalidArguments, valid];
+  }
+
+  _appendIfInvalid(valid, message) {
+    if (!valid) {
+      this._invalidArguments.push(message);
+
+      return false;
+    }
+
+    return true;
+  }
+
+}
+
+exports.FilterValidator = FilterValidator;
+
+function isDateStringOrNumber(value) {
+  return (0, _typeUtils.isString)(value) || (0, _typeUtils.isNumber)(value) || (0, _typeUtils.isDate)(value);
+}
+//# sourceMappingURL=filter-validator.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/filter-validator.ts"],"names":["FilterValidator","constructor","operatorName","previousInvalidArguments","ctor","_validations","_invalidArguments","typeIsString","value","addValidation","typeIsStringNumberOrDate","isDateStringOrNumber","sameType","first","second","typeIsStringNumberOrDateForAll","values","every","validFieldName","field","isInstanceOfSameClass","obj","arityIsOne","args","length","arityIsTwo","arityIsThree","arityIsAtLeastTwo","predicateFn","messageFn","push","validateAndAggregate","valid","_appendIfInvalid","message"],"mappings":"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","sourcesContent":["import { typeForDisplay, isDate, isString, isNumber } from './type-utils'\nimport clone from './clone'\nimport { Validator } from './validator'\n\nexport class FilterValidator implements Validator {\n  private ctor\n  private _invalidArguments: string[]\n  public _validations: Validation[]\n  public operatorName?: string\n\n  constructor(operatorName, previousInvalidArguments, ctor) {\n    this._validations = []\n    this.operatorName = operatorName\n    this.ctor = ctor\n    this._invalidArguments = clone(previousInvalidArguments)\n  }\n\n  typeIsString(value) {\n    return this.addValidation(\n      () => isString(value),\n      () => `Invalid ${this.operatorName} parameter value [${typeForDisplay(value)}]. ${this.operatorName} parameter must be a String.`\n    )\n  }\n\n  typeIsStringNumberOrDate(value) {\n    return this.addValidation(\n      () => isDateStringOrNumber(value),\n      () => `Invalid ${this.operatorName} parameter value [${typeForDisplay(value)}]. Valid ${this.operatorName} parameter types are String, Number or Date.`\n    )\n  }\n\n  sameType(first, second) {\n    return this.addValidation(\n      () => typeForDisplay(first) === typeForDisplay(second),\n      () => `Invalid ${this.operatorName} parameter values [${typeForDisplay(first)}] and [${typeForDisplay(second)}]. Both parameters must be of the same type.`\n    )\n  }\n\n  typeIsStringNumberOrDateForAll(values) {\n    return this.addValidation(\n      () => values.every(isDateStringOrNumber),\n      () => `Invalid ${this.operatorName} usage. ${this.operatorName} supports only Number, String or Date items.`\n    )\n  }\n\n  validFieldName(field) {\n    return this.addValidation(\n      () => isString(field),\n      () => `Invalid ${this.operatorName} field value [${typeForDisplay(field)}]. ${this.operatorName} field must be a String.`\n    )\n  }\n\n  isInstanceOfSameClass(obj) {\n    return this.addValidation(\n      () => obj instanceof this.ctor,\n      () => `Invalid ${this.operatorName} parameter [${typeForDisplay(obj)}]. ${this.operatorName} expects FilterBuilder only.`\n    )\n  }\n\n  arityIsOne(args) {\n    return this.addValidation(\n      () => args.length === 1,\n      () => `Invalid ${this.operatorName} usage. ${this.operatorName} requires one parameter.`\n    )\n  }\n\n  arityIsTwo(args) {\n    return this.addValidation(\n      () => args.length === 2,\n      () => `Invalid ${this.operatorName} usage. ${this.operatorName} requires two parameters.`\n    )\n  }\n\n  arityIsThree(args) {\n    return this.addValidation(\n      () => args.length === 3,\n      () => `Invalid ${this.operatorName} usage. ${this.operatorName} requires three parameters.`\n    )\n  }\n\n  arityIsAtLeastTwo(args) {\n    return this.addValidation(\n      () => args.length >= 2,\n      () => `Invalid ${this.operatorName} usage. ${this.operatorName} requires at least two parameters.`\n    )\n  }\n\n  addValidation(predicateFn, messageFn) {\n    this._validations.push({\n      predicateFn,\n      messageFn,\n    })\n    return this\n  }\n\n  validateAndAggregate(): [string[], boolean] {\n    const valid = this._validations.every(({ predicateFn, messageFn }) =>\n      this._appendIfInvalid(predicateFn(), messageFn())\n    )\n    return [this._invalidArguments, valid]\n  }\n\n  _appendIfInvalid(valid, message) {\n    if (!valid) {\n      this._invalidArguments.push(message)\n      return false\n    }\n    return true\n  }\n}\n\nfunction isDateStringOrNumber(value) {\n  return isString(value) || isNumber(value) || isDate(value)\n}\n\ninterface Validation {\n  predicateFn: Function\n  messageFn: Function\n}\n"]}

package/dist/cjs/index.js

@@ -0,0 +1,25 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _filterBuilder = require("./filter-builder");
+
+exports.filterBuilder = _filterBuilder.filterBuilder;
+
+var _filterMixin = _interopRequireDefault(require("./filter-mixin"));
+
+exports.filterMixin = _filterMixin.default;
+
+var _queryOptimiser = require("./query-optimiser");
+
+exports.optimiseQuery = _queryOptimiser.optimisedQuery;
+
+var _validator = require("./validator");
+
+exports.Validator = _validator.Validator;
+var _default = _filterBuilder.filterBuilder;
+exports.default = _default;
+//# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/index.ts"],"names":["filterBuilder"],"mappings":";;;;;;;AAAA;;;;AACA;;;;AACA;;;;AACA;;;eAIeA,4B","sourcesContent":["import { filterBuilder } from './filter-builder'\nimport filterMixin from './filter-mixin'\nimport { optimisedQuery as optimiseQuery } from './query-optimiser'\nimport { Validator } from './validator'\n\nexport { filterMixin, filterBuilder, optimiseQuery, Validator }\n\nexport default filterBuilder\n"]}