Merge pull request #3 from MikeIbberson/feat/array-or

[FEATURE] Array as serialized string

lib/__tests__/comparison.test.js

@@ -2,7 +2,7 @@ const sift = require('sift').default;
 const Comparison = require('..');
 
 const exp = [
-  'foo=bar',
+  'foo=bar,quuz',
   'age<30',
   'age>=21',
   'language=EN',

lib/index.js

@@ -9,6 +9,7 @@ const {
   isLessThanOrEqualTo,
   isEmpty,
   cast,
+  isSerialized,
 } = require('./utils');
 
 const ops = {
@@ -21,6 +22,9 @@ const ops = {
 };
 
 const getAssignment = {
+  'in': (v) => ({
+    $in: v,
+  }),
   'equals': cast,
   'isEmpty': cast,
   'isLessThan': (v) => ({
@@ -78,13 +82,14 @@ class Comparison {
 
   query() {
     return {
-      $and: this.eligible.reduce(
-        (a, [key, value, fn]) =>
-          a.concat({
-            [key]: getAssignment[fn.name](value),
-          }),
-        [],
-      ),
+      $and: this.eligible.reduce((a, [key, value, fn]) => {
+        const v = isSerialized(value) ? value.split(',') : value;
+        const name = Array.isArray(v) ? 'in' : fn.name;
+
+        return a.concat({
+          [key]: getAssignment[name](v),
+        });
+      }, []),
     };
   }
 

lib/utils.js

@@ -64,9 +64,12 @@ const runCompare = (a, b, locale) =>
   });
 
 const equals = (a, b, locale) => {
+  const comp = (v) => runCompare(a, v, locale) === 0;
   if (b === '*') return a !== '' && a !== undefined && a !== null;
+  if (typeof b === 'string' && b.includes(','))
+    return b.split(',').some(comp);
 
-  return runCompare(a, b, locale) === 0;
+  return comp(b);
 };
 
 const doesNotEqual = (a, b, locale) => runCompare(a, b, locale) !== 0;
@@ -104,6 +107,8 @@ const cast = (v) => {
 const isEmpty = (v) =>
   v === undefined || v === null || v === 'undefined' || v === 'null';
 
+const isSerialized = (v) => typeof v === 'string' && v.includes(',');
+
 module.exports = {
   equals,
   doesNotEqual,
@@ -114,4 +119,5 @@ module.exports = {
   isEmpty,
   validate,
   cast,
+  isSerialized,
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "comparisons",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "main": "lib/index.js",
   "license": "MIT",
   "jest": {