feat: dynamic template variables

MikeIbberson · Jul 25, 2020 · 5ed3861 · 5ed3861
1 parent 0d33959
commit 5ed3861
Show file tree

Hide file tree

Showing 5 changed files with 345 additions and 618 deletions.
diff --git a/lib/__tests__/comparison.test.js b/lib/__tests__/comparison.test.js
@@ -26,6 +26,7 @@ const stub = {
   colleague: {
     age: true,
   },
+  dynamic: 21,
 };
 
 describe('Comparison', () => {
@@ -40,6 +41,11 @@ describe('Comparison', () => {
   });
 
   describe('eval', () => {
+    it('should return truthy on dynamic matching', () =>
+      expect(
+        new Comparison(['dynamic={{age}}']).eval(stub),
+      ).toBeTruthy());
+
     it('should return truthy', () =>
       expect(new Comparison(exp).eval(stub)).toBeTruthy());
 

diff --git a/lib/__tests__/utils.test.js b/lib/__tests__/utils.test.js
@@ -119,4 +119,11 @@ describe('Utils', () => {
     it('should return falsy on false', () =>
       expect(Utils.isEmpty(false)).toBeFalsy());
   });
+
+  describe('Validate', () => {
+    it('should detect ObjectId as string', () =>
+      expect(
+        Utils.validate('5f0dc7481681ee00225164a7').numeric(),
+      ).toBeFalsy());
+  });
 });
diff --git a/lib/index.js b/lib/index.js
@@ -47,11 +47,31 @@ const getAssignment = {
 const keys = Object.keys(ops);
 const re = new RegExp(`[${keys.map((v) => `(${v})`).join('')}]`, 'i');
 
-const hasLength = (v) => Array.isArray(v) && v.length;
-const hasNegation = (v) => typeof v === 'string' && v.startsWith('!');
+const TEMPLATE_VARIABLE_PATTERN = /{{\w*}}/gi;
 
-const getOp = (v) =>
-  hasNegation(v)
+const isString = (v) => typeof v === 'string';
+
+const isFn = (v) => typeof v === 'function';
+const hasLength = (v) => (Array.isArray(v) && v.length) || isFn(v);
+
+const hasNegation = (v) => isString(v) && v.startsWith('!');
+const hasTemplateVariables = (v) =>
+  isString(v) && new RegExp(TEMPLATE_VARIABLE_PATTERN).test(v);
+
+const getOp = (v) => {
+  // returning an object will mean that we can assemble the op response
+  // based on the input eval data
+  if (hasTemplateVariables(v))
+    return (obj) => {
+      try {
+        const prop = v.split('{{')[1].split('}}')[0];
+        return getOp(v.replace(TEMPLATE_VARIABLE_PATTERN, obj[prop]));
+      } catch (e) {
+        throw new Error('Template variable not properly formatted');
+      }
+    };
+
+  return hasNegation(v)
     ? // reference the cast function conditionals
       // this leverages how wildcards work, just the inverse
       [v.replace('!', ''), '!', isEmpty]
@@ -65,6 +85,7 @@ const getOp = (v) =>
             : a,
         [],
       );
+};
 
 class Comparison {
   constructor(exp, locale = 'en') {
@@ -97,11 +118,15 @@ class Comparison {
   }
 
   eval(obj) {
-    return this.eligible.every(([key, value, validator]) =>
-      typeof validator === 'function'
+    return this.eligible.every((params) => {
+      const [key, value, validator] = isFn(params)
+        ? params(obj)
+        : params;
+
+      return isFn(validator)
         ? validator(flat(obj)[key], value, this.locale)
-        : false,
-    );
+        : false;
+    });
   }
 }
 

diff --git a/lib/utils.js b/lib/utils.js
@@ -6,7 +6,15 @@ const toMongoBoolean = (exists) => (exists ? true : { $ne: true });
 const validate = (v) => ({
   alpha: () => new RegExp(/^[A-Z]+$/, 'gi').test(v),
   date: () => moment(v, moment.ISO_8601, true).isValid(),
-  numeric: () => !Number.isNaN(parseFloat(v)),
+  numeric: () => {
+    const float = parseFloat(v);
+
+    return (
+      // ensure that the parsed value doesn't drop any essential characters
+      // mongo's ObjectId, specifically, had this trouble
+      !Number.isNaN(float) && String(float).length === String(v).length
+    );
+  },
   boolean: () => toBoolean(v) || v === 'false',
 });