@wix/filter-builder 1.0.16 → 1.0.18

package/dist/cjs/query-optimiser.js

@@ -3,117 +3,92 @@
 exports.__esModule = true;
 exports.optimisedQuery = optimisedQuery;
 const optimisations = [optimisedUnaryAnd, optimisedEmptyAnd, optimisedAndsAsObjects, optimisedNestedAnds, optimisedNestedOrs];
-
 function optimisedQuery(query) {
   const _fullyOptimised = fullyOptimised(query),
-        newQuery = _fullyOptimised[0];
-
+    newQuery = _fullyOptimised[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) {
   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) {
   const _fullEntriesOptimisat = fullEntriesOptimisation(query),
-        queryAfterOptimisingEntries = _fullEntriesOptimisat[0],
-        changedStage1 = _fullEntriesOptimisat[1];
-
+    queryAfterOptimisingEntries = _fullEntriesOptimisat[0],
+    changedStage1 = _fullEntriesOptimisat[1];
   const _fullObjectOptimisati = fullObjectOptimisation(queryAfterOptimisingEntries),
-        queryAfterFullOptimisation = _fullObjectOptimisati[0],
-        changedStage2 = _fullObjectOptimisati[1];
-
+    queryAfterFullOptimisation = _fullObjectOptimisati[0],
+    changedStage2 = _fullObjectOptimisati[1];
   const changed = changedStage1 || changedStage2;
   return [queryAfterFullOptimisation, changed];
-
   function fullObjectOptimisation(query) {
     const updatedQuery = applyFirstOptimisation(query);
-
     if (!updatedQuery) {
       return [query, false];
     }
-
     const _fullyOptimised2 = fullyOptimised(updatedQuery),
-          finalQuery = _fullyOptimised2[0];
-
+      finalQuery = _fullyOptimised2[0];
     return [finalQuery, true];
   }
-
   function fullEntriesOptimisation(query) {
     const changedEntries = Object.entries(query).map(entryOptimisation).filter(([,, changed]) => changed);
-    const newQuery = { ...query,
+    const newQuery = {
+      ...query,
       ...entriesAsObject(changedEntries)
     };
     const changed = !!changedEntries.length;
     return [newQuery, changed];
   }
-
   function entryOptimisation([key, value]) {
     const _fullyOptimised3 = fullyOptimised(value),
-          newValue = _fullyOptimised3[0],
-          changed = _fullyOptimised3[1];
-
+      newValue = _fullyOptimised3[0],
+      changed = _fullyOptimised3[1];
     return [key, newValue, changed];
   }
-
   function entriesAsObject(entries) {
-    return entries.reduce((acc, [key, value]) => ({ ...acc,
+    return entries.reduce((acc, [key, value]) => ({
+      ...acc,
       [key]: value
     }), {});
   }
 }
-
 function applyFirstOptimisation(node) {
   for (const optimisation of optimisations) {
     const newNode = optimisation(node);
-
     if (newNode) {
       return newNode;
     }
   }
 }
-
 function optimisedUnaryAnd(node) {
   const args = node.$and;
-
   if (Array.isArray(args) && args.length === 1) {
     return args[0];
   }
 }
-
 function optimisedEmptyAnd(node) {
   const args = node.$and;
-
   if (Array.isArray(args) && args.length === 0) {
     return {};
   }
-
   return null;
 }
-
 function optimisedAndsAsObjects(node) {
   const args = node.$and;
-
   if (!args) {
     return;
   }
-
   let basicObjects = [];
   let operatorObjects = [];
   args.forEach(arg => {
@@ -123,88 +98,68 @@ function optimisedAndsAsObjects(node) {
       basicObjects = [...basicObjects, arg];
     }
   });
-
   if (basicObjects.length <= 1 || haveOverlappingFields(basicObjects)) {
     return;
   }
-
   const combinedBasicObjects = Object.assign({}, ...basicObjects);
   return {
     $and: [combinedBasicObjects, ...operatorObjects]
   };
-
   function isOperator(node) {
     const keys = Object.keys(node);
     return keys.every(name => name.startsWith('$')) && keys.length > 0;
   }
-
   function haveOverlappingFields(objects) {
     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) {
     const dict = {};
     values.forEach(v => dict[v] = true);
     return Object.keys(dict);
   }
 }
-
 function optimisedNestedAnds(node) {
   const args = node.$and;
-
   if (!args) {
     return;
   }
-
   const hasNestedAnds = !!args.find(it => it.$and);
-
   if (!hasNestedAnds) {
     return;
   }
-
   const newArgs = args.reduce((result, current) => {
     const and = current.$and;
-
     if (!and) {
       return [...result, current];
     }
-
     return [...result, ...and];
   }, []);
   return {
     $and: newArgs
   };
 }
-
 function optimisedNestedOrs(node) {
   const args = node.$or;
-
   if (!args) {
     return;
   }
-
   const hasNestedOrs = !!args.find(it => it.$or);
-
   if (!hasNestedOrs) {
     return;
   }
-
   const newArgs = args.reduce((result, current) => {
     const or = current.$or;
-
     if (!or) {
       return [...result, current];
     }
-
     return [...result, ...or];
   }, []);
   return {
     $or: newArgs
   };
 }
-
 function instanceOfIgnoredType(obj) {
   return obj instanceof Date;
 }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/query-optimiser.ts"],"names":["optimisations","optimisedUnaryAnd","optimisedEmptyAnd","optimisedAndsAsObjects","optimisedNestedAnds","optimisedNestedOrs","optimisedQuery","query","fullyOptimised","newQuery","Array","isArray","fullyOptimisedArray","instanceOfIgnoredType","fullyOptimisedObject","optimisedElements","map","somethingChanged","filter","elementChanged","length","newElements","element","fullEntriesOptimisation","queryAfterOptimisingEntries","changedStage1","fullObjectOptimisation","queryAfterFullOptimisation","changedStage2","changed","updatedQuery","applyFirstOptimisation","finalQuery","changedEntries","Object","entries","entryOptimisation","entriesAsObject","key","value","newValue","reduce","acc","node","optimisation","newNode","args","$and","basicObjects","operatorObjects","forEach","arg","isOperator","haveOverlappingFields","combinedBasicObjects","assign","keys","every","name","startsWith","objects","nonUniqueKeys","it","a","b","uniqueKeys","unique","values","dict","v","hasNestedAnds","find","newArgs","result","current","and","$or","hasNestedOrs","or","obj","Date"],"mappings":"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","sourcesContent":["const optimisations = [\n  optimisedUnaryAnd,\n  optimisedEmptyAnd,\n  optimisedAndsAsObjects,\n  optimisedNestedAnds,\n  optimisedNestedOrs,\n]\n\nexport function optimisedQuery(query) {\n  const [newQuery] = fullyOptimised(query)\n  return newQuery\n}\n\nfunction fullyOptimised(query) {\n  if (Array.isArray(query)) {\n    return fullyOptimisedArray(query)\n  }\n  if (\n    typeof query === 'object' &&\n    query !== null &&\n    !instanceOfIgnoredType(query)\n  ) {\n    return fullyOptimisedObject(query)\n  }\n  return [query, false]\n}\n\nfunction fullyOptimisedArray(query) {\n  const optimisedElements = query.map(fullyOptimised)\n  const somethingChanged =\n    0 < optimisedElements.filter(([, elementChanged]) => elementChanged).length\n  const newElements = optimisedElements.map(([element]) => element)\n  return [newElements, somethingChanged]\n}\n\nfunction fullyOptimisedObject(query) {\n  const [queryAfterOptimisingEntries, changedStage1] =\n    fullEntriesOptimisation(query)\n  const [queryAfterFullOptimisation, changedStage2] = fullObjectOptimisation(\n    queryAfterOptimisingEntries\n  )\n  const changed = changedStage1 || changedStage2\n  return [queryAfterFullOptimisation, changed]\n\n  function fullObjectOptimisation(query) {\n    const updatedQuery = applyFirstOptimisation(query)\n    if (!updatedQuery) {\n      return [query, false]\n    }\n    const [finalQuery] = fullyOptimised(updatedQuery)\n    return [finalQuery, true]\n  }\n\n  function fullEntriesOptimisation(query) {\n    const changedEntries = Object.entries(query)\n      .map(entryOptimisation)\n      .filter(([, , changed]) => changed)\n    const newQuery = { ...query, ...entriesAsObject(changedEntries) }\n    const changed = !!changedEntries.length\n    return [newQuery, changed]\n  }\n\n  function entryOptimisation([key, value]) {\n    const [newValue, changed] = fullyOptimised(value)\n    return [key, newValue, changed]\n  }\n\n  function entriesAsObject(entries) {\n    return entries.reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})\n  }\n}\n\nfunction applyFirstOptimisation(node) {\n  for (const optimisation of optimisations) {\n    const newNode = optimisation(node)\n    if (newNode) {\n      return newNode\n    }\n  }\n}\n\nfunction optimisedUnaryAnd(node) {\n  const args = node.$and\n  if (Array.isArray(args) && args.length === 1) {\n    return args[0]\n  }\n}\n\nfunction optimisedEmptyAnd(node) {\n  const args = node.$and\n  if (Array.isArray(args) && args.length === 0) {\n    return {}\n  }\n  return null\n}\n\nfunction optimisedAndsAsObjects(node) {\n  const args = node.$and\n  if (!args) {\n    return\n  }\n\n  let basicObjects: any[] = []\n  let operatorObjects: any[] = []\n\n  args.forEach((arg) => {\n    if (isOperator(arg)) {\n      operatorObjects = [...operatorObjects, arg]\n    } else {\n      basicObjects = [...basicObjects, arg]\n    }\n  })\n\n  if (basicObjects.length <= 1 || haveOverlappingFields(basicObjects)) {\n    return\n  }\n  const combinedBasicObjects = Object.assign({}, ...basicObjects)\n\n  return { $and: [combinedBasicObjects, ...operatorObjects] }\n\n  function isOperator(node) {\n    const keys = Object.keys(node)\n    return keys.every((name) => name.startsWith('$')) && keys.length > 0\n  }\n\n  function haveOverlappingFields(objects) {\n    const nonUniqueKeys = objects\n      .map((it) => Object.keys(it))\n      .reduce((a, b) => [...a, ...b], [])\n    const uniqueKeys = unique(nonUniqueKeys)\n    return uniqueKeys.length !== nonUniqueKeys.length\n  }\n\n  function unique(values) {\n    const dict = {}\n    values.forEach((v) => (dict[v] = true))\n    return Object.keys(dict)\n  }\n}\n\nfunction optimisedNestedAnds(node) {\n  const args = node.$and\n  if (!args) {\n    return\n  }\n\n  const hasNestedAnds = !!args.find((it) => it.$and)\n  if (!hasNestedAnds) {\n    return\n  }\n\n  const newArgs = args.reduce((result, current) => {\n    const and = current.$and\n    if (!and) {\n      return [...result, current]\n    }\n    return [...result, ...and]\n  }, [])\n  return { $and: newArgs }\n}\n\nfunction optimisedNestedOrs(node) {\n  const args = node.$or\n  if (!args) {\n    return\n  }\n\n  const hasNestedOrs = !!args.find((it) => it.$or)\n  if (!hasNestedOrs) {\n    return\n  }\n\n  const newArgs = args.reduce((result, current) => {\n    const or = current.$or\n    if (!or) {\n      return [...result, current]\n    }\n    return [...result, ...or]\n  }, [])\n  return { $or: newArgs }\n}\n\nfunction instanceOfIgnoredType(obj) {\n  return obj instanceof Date\n}\n"]}
+{"version":3,"names":["optimisations","optimisedUnaryAnd","optimisedEmptyAnd","optimisedAndsAsObjects","optimisedNestedAnds","optimisedNestedOrs","optimisedQuery","query","_fullyOptimised","fullyOptimised","newQuery","Array","isArray","fullyOptimisedArray","instanceOfIgnoredType","fullyOptimisedObject","optimisedElements","map","somethingChanged","filter","elementChanged","length","newElements","element","_fullEntriesOptimisat","fullEntriesOptimisation","queryAfterOptimisingEntries","changedStage1","_fullObjectOptimisati","fullObjectOptimisation","queryAfterFullOptimisation","changedStage2","changed","updatedQuery","applyFirstOptimisation","_fullyOptimised2","finalQuery","changedEntries","Object","entries","entryOptimisation","entriesAsObject","key","value","_fullyOptimised3","newValue","reduce","acc","node","optimisation","newNode","args","$and","basicObjects","operatorObjects","forEach","arg","isOperator","haveOverlappingFields","combinedBasicObjects","assign","keys","every","name","startsWith","objects","nonUniqueKeys","it","a","b","uniqueKeys","unique","values","dict","v","hasNestedAnds","find","newArgs","result","current","and","$or","hasNestedOrs","or","obj","Date"],"sources":["../../src/query-optimiser.ts"],"sourcesContent":["const optimisations = [\n  optimisedUnaryAnd,\n  optimisedEmptyAnd,\n  optimisedAndsAsObjects,\n  optimisedNestedAnds,\n  optimisedNestedOrs,\n]\n\nexport function optimisedQuery(query) {\n  const [newQuery] = fullyOptimised(query)\n  return newQuery\n}\n\nfunction fullyOptimised(query) {\n  if (Array.isArray(query)) {\n    return fullyOptimisedArray(query)\n  }\n  if (\n    typeof query === 'object' &&\n    query !== null &&\n    !instanceOfIgnoredType(query)\n  ) {\n    return fullyOptimisedObject(query)\n  }\n  return [query, false]\n}\n\nfunction fullyOptimisedArray(query) {\n  const optimisedElements = query.map(fullyOptimised)\n  const somethingChanged =\n    0 < optimisedElements.filter(([, elementChanged]) => elementChanged).length\n  const newElements = optimisedElements.map(([element]) => element)\n  return [newElements, somethingChanged]\n}\n\nfunction fullyOptimisedObject(query) {\n  const [queryAfterOptimisingEntries, changedStage1] =\n    fullEntriesOptimisation(query)\n  const [queryAfterFullOptimisation, changedStage2] = fullObjectOptimisation(\n    queryAfterOptimisingEntries\n  )\n  const changed = changedStage1 || changedStage2\n  return [queryAfterFullOptimisation, changed]\n\n  function fullObjectOptimisation(query) {\n    const updatedQuery = applyFirstOptimisation(query)\n    if (!updatedQuery) {\n      return [query, false]\n    }\n    const [finalQuery] = fullyOptimised(updatedQuery)\n    return [finalQuery, true]\n  }\n\n  function fullEntriesOptimisation(query) {\n    const changedEntries = Object.entries(query)\n      .map(entryOptimisation)\n      .filter(([, , changed]) => changed)\n    const newQuery = { ...query, ...entriesAsObject(changedEntries) }\n    const changed = !!changedEntries.length\n    return [newQuery, changed]\n  }\n\n  function entryOptimisation([key, value]) {\n    const [newValue, changed] = fullyOptimised(value)\n    return [key, newValue, changed]\n  }\n\n  function entriesAsObject(entries) {\n    return entries.reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})\n  }\n}\n\nfunction applyFirstOptimisation(node) {\n  for (const optimisation of optimisations) {\n    const newNode = optimisation(node)\n    if (newNode) {\n      return newNode\n    }\n  }\n}\n\nfunction optimisedUnaryAnd(node) {\n  const args = node.$and\n  if (Array.isArray(args) && args.length === 1) {\n    return args[0]\n  }\n}\n\nfunction optimisedEmptyAnd(node) {\n  const args = node.$and\n  if (Array.isArray(args) && args.length === 0) {\n    return {}\n  }\n  return null\n}\n\nfunction optimisedAndsAsObjects(node) {\n  const args = node.$and\n  if (!args) {\n    return\n  }\n\n  let basicObjects: any[] = []\n  let operatorObjects: any[] = []\n\n  args.forEach((arg) => {\n    if (isOperator(arg)) {\n      operatorObjects = [...operatorObjects, arg]\n    } else {\n      basicObjects = [...basicObjects, arg]\n    }\n  })\n\n  if (basicObjects.length <= 1 || haveOverlappingFields(basicObjects)) {\n    return\n  }\n  const combinedBasicObjects = Object.assign({}, ...basicObjects)\n\n  return { $and: [combinedBasicObjects, ...operatorObjects] }\n\n  function isOperator(node) {\n    const keys = Object.keys(node)\n    return keys.every((name) => name.startsWith('$')) && keys.length > 0\n  }\n\n  function haveOverlappingFields(objects) {\n    const nonUniqueKeys = objects\n      .map((it) => Object.keys(it))\n      .reduce((a, b) => [...a, ...b], [])\n    const uniqueKeys = unique(nonUniqueKeys)\n    return uniqueKeys.length !== nonUniqueKeys.length\n  }\n\n  function unique(values) {\n    const dict = {}\n    values.forEach((v) => (dict[v] = true))\n    return Object.keys(dict)\n  }\n}\n\nfunction optimisedNestedAnds(node) {\n  const args = node.$and\n  if (!args) {\n    return\n  }\n\n  const hasNestedAnds = !!args.find((it) => it.$and)\n  if (!hasNestedAnds) {\n    return\n  }\n\n  const newArgs = args.reduce((result, current) => {\n    const and = current.$and\n    if (!and) {\n      return [...result, current]\n    }\n    return [...result, ...and]\n  }, [])\n  return { $and: newArgs }\n}\n\nfunction optimisedNestedOrs(node) {\n  const args = node.$or\n  if (!args) {\n    return\n  }\n\n  const hasNestedOrs = !!args.find((it) => it.$or)\n  if (!hasNestedOrs) {\n    return\n  }\n\n  const newArgs = args.reduce((result, current) => {\n    const or = current.$or\n    if (!or) {\n      return [...result, current]\n    }\n    return [...result, ...or]\n  }, [])\n  return { $or: newArgs }\n}\n\nfunction instanceOfIgnoredType(obj) {\n  return obj instanceof Date\n}\n"],"mappings":"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"}

package/dist/cjs/type-utils.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports.isArray = isArray;
 exports.isBoolean = isBoolean;
@@ -13,54 +12,41 @@ exports.isObject = isObject;
 exports.isString = isString;
 exports.isUndefined = isUndefined;
 exports.typeForDisplay = typeForDisplay;
-
 var _kindOf = _interopRequireDefault(require("kind-of"));
-
 function isObject(obj) {
   return (0, _kindOf.default)(obj) === 'object';
 }
-
 function isArray(arr) {
   return (0, _kindOf.default)(arr) === 'array';
 }
-
 function isDate(obj) {
   return (0, _kindOf.default)(obj) === 'date';
 }
-
 function isNumber(obj) {
   return (0, _kindOf.default)(obj) === 'number';
 }
-
 function isBoolean(obj) {
   return (0, _kindOf.default)(obj) === 'boolean';
 }
-
 function isString(obj) {
   return (0, _kindOf.default)(obj) === 'string';
 }
-
 function isFunction(obj) {
   return (0, _kindOf.default)(obj) === 'function';
 }
-
 function typeForDisplay(obj) {
   return upperCaseFirst((0, _kindOf.default)(obj));
 }
-
 function isUndefined(obj) {
   return (0, _kindOf.default)(obj) === 'undefined';
 }
-
 function isNull(obj) {
   return (0, _kindOf.default)(obj) === 'null';
 }
-
 function upperCaseFirst(str) {
   if (!isString(str)) {
     return str;
   }
-
   const first = str.slice(0, 1).toUpperCase();
   const rest = str.slice(1, str.length);
   return first + rest;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/type-utils.ts"],"names":["isObject","obj","isArray","arr","isDate","isNumber","isBoolean","isString","isFunction","typeForDisplay","upperCaseFirst","isUndefined","isNull","str","first","slice","toUpperCase","rest","length"],"mappings":";;;;;;;;;;;;;;;;AAAA;;AAEO,SAASA,QAAT,CAAkBC,GAAlB,EAAuB;AAC5B,SAAO,qBAAQA,GAAR,MAAiB,QAAxB;AACD;;AAEM,SAASC,OAAT,CAAiBC,GAAjB,EAAsB;AAC3B,SAAO,qBAAQA,GAAR,MAAiB,OAAxB;AACD;;AAEM,SAASC,MAAT,CAAgBH,GAAhB,EAAqB;AAC1B,SAAO,qBAAQA,GAAR,MAAiB,MAAxB;AACD;;AAEM,SAASI,QAAT,CAAkBJ,GAAlB,EAAuB;AAC5B,SAAO,qBAAQA,GAAR,MAAiB,QAAxB;AACD;;AAEM,SAASK,SAAT,CAAmBL,GAAnB,EAAwB;AAC7B,SAAO,qBAAQA,GAAR,MAAiB,SAAxB;AACD;;AAEM,SAASM,QAAT,CAAkBN,GAAlB,EAAuB;AAC5B,SAAO,qBAAQA,GAAR,MAAiB,QAAxB;AACD;;AAEM,SAASO,UAAT,CAAoBP,GAApB,EAAyB;AAC9B,SAAO,qBAAQA,GAAR,MAAiB,UAAxB;AACD;;AAEM,SAASQ,cAAT,CAAwBR,GAAxB,EAA6B;AAClC,SAAOS,cAAc,CAAC,qBAAQT,GAAR,CAAD,CAArB;AACD;;AAEM,SAASU,WAAT,CAAqBV,GAArB,EAA0B;AAC/B,SAAO,qBAAQA,GAAR,MAAiB,WAAxB;AACD;;AAEM,SAASW,MAAT,CAAgBX,GAAhB,EAAqB;AAC1B,SAAO,qBAAQA,GAAR,MAAiB,MAAxB;AACD;;AAED,SAASS,cAAT,CAAwBG,GAAxB,EAA6B;AAC3B,MAAI,CAACN,QAAQ,CAACM,GAAD,CAAb,EAAoB;AAClB,WAAOA,GAAP;AACD;;AACD,QAAMC,KAAK,GAAGD,GAAG,CAACE,KAAJ,CAAU,CAAV,EAAa,CAAb,EAAgBC,WAAhB,EAAd;AACA,QAAMC,IAAI,GAAGJ,GAAG,CAACE,KAAJ,CAAU,CAAV,EAAaF,GAAG,CAACK,MAAjB,CAAb;AACA,SAAOJ,KAAK,GAAGG,IAAf;AACD","sourcesContent":["import getKind from 'kind-of'\n\nexport function isObject(obj) {\n  return getKind(obj) === 'object'\n}\n\nexport function isArray(arr) {\n  return getKind(arr) === 'array'\n}\n\nexport function isDate(obj) {\n  return getKind(obj) === 'date'\n}\n\nexport function isNumber(obj) {\n  return getKind(obj) === 'number'\n}\n\nexport function isBoolean(obj) {\n  return getKind(obj) === 'boolean'\n}\n\nexport function isString(obj) {\n  return getKind(obj) === 'string'\n}\n\nexport function isFunction(obj) {\n  return getKind(obj) === 'function'\n}\n\nexport function typeForDisplay(obj) {\n  return upperCaseFirst(getKind(obj))\n}\n\nexport function isUndefined(obj) {\n  return getKind(obj) === 'undefined'\n}\n\nexport function isNull(obj) {\n  return getKind(obj) === 'null'\n}\n\nfunction upperCaseFirst(str) {\n  if (!isString(str)) {\n    return str\n  }\n  const first = str.slice(0, 1).toUpperCase()\n  const rest = str.slice(1, str.length)\n  return first + rest\n}\n"]}
+{"version":3,"names":["_kindOf","_interopRequireDefault","require","isObject","obj","getKind","isArray","arr","isDate","isNumber","isBoolean","isString","isFunction","typeForDisplay","upperCaseFirst","isUndefined","isNull","str","first","slice","toUpperCase","rest","length"],"sources":["../../src/type-utils.ts"],"sourcesContent":["import getKind from 'kind-of'\n\nexport function isObject(obj) {\n  return getKind(obj) === 'object'\n}\n\nexport function isArray(arr) {\n  return getKind(arr) === 'array'\n}\n\nexport function isDate(obj) {\n  return getKind(obj) === 'date'\n}\n\nexport function isNumber(obj) {\n  return getKind(obj) === 'number'\n}\n\nexport function isBoolean(obj) {\n  return getKind(obj) === 'boolean'\n}\n\nexport function isString(obj) {\n  return getKind(obj) === 'string'\n}\n\nexport function isFunction(obj) {\n  return getKind(obj) === 'function'\n}\n\nexport function typeForDisplay(obj) {\n  return upperCaseFirst(getKind(obj))\n}\n\nexport function isUndefined(obj) {\n  return getKind(obj) === 'undefined'\n}\n\nexport function isNull(obj) {\n  return getKind(obj) === 'null'\n}\n\nfunction upperCaseFirst(str) {\n  if (!isString(str)) {\n    return str\n  }\n  const first = str.slice(0, 1).toUpperCase()\n  const rest = str.slice(1, str.length)\n  return first + rest\n}\n"],"mappings":";;;;;;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEO,SAASC,QAAQA,CAACC,GAAG,EAAE;EAC5B,OAAO,IAAAC,eAAO,EAACD,GAAG,CAAC,KAAK,QAAQ;AAClC;AAEO,SAASE,OAAOA,CAACC,GAAG,EAAE;EAC3B,OAAO,IAAAF,eAAO,EAACE,GAAG,CAAC,KAAK,OAAO;AACjC;AAEO,SAASC,MAAMA,CAACJ,GAAG,EAAE;EAC1B,OAAO,IAAAC,eAAO,EAACD,GAAG,CAAC,KAAK,MAAM;AAChC;AAEO,SAASK,QAAQA,CAACL,GAAG,EAAE;EAC5B,OAAO,IAAAC,eAAO,EAACD,GAAG,CAAC,KAAK,QAAQ;AAClC;AAEO,SAASM,SAASA,CAACN,GAAG,EAAE;EAC7B,OAAO,IAAAC,eAAO,EAACD,GAAG,CAAC,KAAK,SAAS;AACnC;AAEO,SAASO,QAAQA,CAACP,GAAG,EAAE;EAC5B,OAAO,IAAAC,eAAO,EAACD,GAAG,CAAC,KAAK,QAAQ;AAClC;AAEO,SAASQ,UAAUA,CAACR,GAAG,EAAE;EAC9B,OAAO,IAAAC,eAAO,EAACD,GAAG,CAAC,KAAK,UAAU;AACpC;AAEO,SAASS,cAAcA,CAACT,GAAG,EAAE;EAClC,OAAOU,cAAc,CAAC,IAAAT,eAAO,EAACD,GAAG,CAAC,CAAC;AACrC;AAEO,SAASW,WAAWA,CAACX,GAAG,EAAE;EAC/B,OAAO,IAAAC,eAAO,EAACD,GAAG,CAAC,KAAK,WAAW;AACrC;AAEO,SAASY,MAAMA,CAACZ,GAAG,EAAE;EAC1B,OAAO,IAAAC,eAAO,EAACD,GAAG,CAAC,KAAK,MAAM;AAChC;AAEA,SAASU,cAAcA,CAACG,GAAG,EAAE;EAC3B,IAAI,CAACN,QAAQ,CAACM,GAAG,CAAC,EAAE;IAClB,OAAOA,GAAG;EACZ;EACA,MAAMC,KAAK,GAAGD,GAAG,CAACE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAACC,WAAW,EAAE;EAC3C,MAAMC,IAAI,GAAGJ,GAAG,CAACE,KAAK,CAAC,CAAC,EAAEF,GAAG,CAACK,MAAM,CAAC;EACrC,OAAOJ,KAAK,GAAGG,IAAI;AACrB"}

package/dist/cjs/validator.js.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","sourcesContent":[]}
+{"version":3,"names":[],"sources":["../../src/validator.ts"],"sourcesContent":["export interface Validator {\n  typeIsString(value): Validator\n  typeIsStringNumberOrDate(value): Validator\n  sameType(first, second): Validator\n  typeIsStringNumberOrDateForAll(values): Validator\n  validFieldName(field): Validator\n  isInstanceOfSameClass(obj): Validator\n  arityIsOne(args): Validator\n  arityIsTwo(args): Validator\n  arityIsThree(args): Validator\n  arityIsAtLeastTwo(args): Validator\n  validateAndAggregate(): [string[], boolean]\n}\n"],"mappings":""}

package/dist/cjs/wix-data-encoder.js

@@ -2,9 +2,7 @@
 
 exports.__esModule = true;
 exports.wixDataEncoder = wixDataEncoder;
-
 var _typeUtils = require("./type-utils");
-
 function wixDataEncoder(operand) {
   if ((0, _typeUtils.isDate)(operand)) {
     return {

package/dist/cjs/wix-data-encoder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/wix-data-encoder.ts"],"names":["wixDataEncoder","operand","$date","toJSON"],"mappings":";;;;;AAAA;;AAEO,SAASA,cAAT,CAAwBC,OAAxB,EAAiC;AACtC,MAAI,uBAAOA,OAAP,CAAJ,EAAqB;AACnB,WAAO;AAAEC,MAAAA,KAAK,EAAED,OAAO,CAACE,MAAR;AAAT,KAAP;AACD,GAFD,MAEO;AACL,WAAOF,OAAP;AACD;AACF","sourcesContent":["import { isDate } from './type-utils'\n\nexport function wixDataEncoder(operand) {\n  if (isDate(operand)) {\n    return { $date: operand.toJSON() }\n  } else {\n    return operand\n  }\n}\n"]}
+{"version":3,"names":["_typeUtils","require","wixDataEncoder","operand","isDate","$date","toJSON"],"sources":["../../src/wix-data-encoder.ts"],"sourcesContent":["import { isDate } from './type-utils'\n\nexport function wixDataEncoder(operand) {\n  if (isDate(operand)) {\n    return { $date: operand.toJSON() }\n  } else {\n    return operand\n  }\n}\n"],"mappings":";;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAEO,SAASC,cAAcA,CAACC,OAAO,EAAE;EACtC,IAAI,IAAAC,iBAAM,EAACD,OAAO,CAAC,EAAE;IACnB,OAAO;MAAEE,KAAK,EAAEF,OAAO,CAACG,MAAM;IAAG,CAAC;EACpC,CAAC,MAAM;IACL,OAAOH,OAAO;EAChB;AACF"}