Merge branch 'json-logic:master' into master

Author: codetiger

asyncLogic.js

@@ -56,9 +56,16 @@ class AsyncLogicEngine {
    */
   truthy (value) {
     if (!value) return value
-    if (Array.isArray(value) && value.length === 0) return false
-    // Uncomment the following line to switch empty object to falsy.
-    // if (value && typeof value === 'object') return Object.keys(value).length > 0
+    // The following check could be erased, as it'd be caught by the iterator check,
+    // but it's here for performance reasons.
+    if (Array.isArray(value)) return value.length > 0
+    if (typeof value === 'object') {
+      if (value[Symbol.iterator]) {
+        if ('length' in value && value.length === 0) return false
+        if ('size' in value && value.size === 0) return false
+      }
+      if (value.constructor.name === 'Object') return Object.keys(value).length > 0
+    }
     return value
   }
 

general.test.js

@@ -153,6 +153,32 @@ describe('Various Test Cases', () => {
     for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { max: 5 }, {}, 5)
   })
 
+  it('sees empty structures as false', async () => {
+    for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { if: [{ var: 'x' }, true, false] }, { x: {} }, false)
+    for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { if: [{ var: 'x' }, true, false] }, { x: [] }, false)
+    for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { if: [{ var: 'x' }, true, false] }, { x: new Map() }, false)
+    for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { if: [{ var: 'x' }, true, false] }, { x: new Set() }, false)
+  })
+
+  it('sees filled structures as true', async () => {
+    for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { if: [{ var: 'x' }, true, false] }, { x: { a: 1 } }, true)
+    for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { if: [{ var: 'x' }, true, false] }, { x: [1] }, true)
+    for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { if: [{ var: 'x' }, true, false] }, { x: new Map([[1, 'a']]) }, true)
+    for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { if: [{ var: 'x' }, true, false] }, { x: new Set([1]) }, true)
+  })
+
+  it('sees classes as true', async () => {
+    for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { if: [{ var: 'x' }, true, false] }, { x: new Date() }, true)
+    for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { if: [{ var: 'x' }, true, false] }, { x: new RegExp() }, true)
+
+    class Empty {}
+    const empty = new Empty()
+
+    assert.strictEqual(Object.keys(empty).length, 0, 'Should have no keys')
+
+    for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { if: [{ var: 'x' }, true, false] }, { x: empty }, true)
+  })
+
   it('is able to handle path escaping in a var call', async () => {
     for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { var: 'hello\\.world' }, { 'hello.world': 2 }, 2)
   })

logic.js

@@ -47,9 +47,16 @@ class LogicEngine {
    */
   truthy (value) {
     if (!value) return value
-    if (Array.isArray(value) && value.length === 0) return false
-    // Uncomment the following line to switch empty object to falsy.
-    // if (typeof value === 'object') return Object.keys(value).length > 0
+    // The following check could be erased, as it'd be caught by the iterator check,
+    // but it's here for performance reasons.
+    if (Array.isArray(value)) return value.length > 0
+    if (typeof value === 'object') {
+      if (value[Symbol.iterator]) {
+        if ('length' in value && value.length === 0) return false
+        if ('size' in value && value.size === 0) return false
+      }
+      if (value.constructor.name === 'Object') return Object.keys(value).length > 0
+    }
     return value
   }
 

suites/control/if.json

@@ -21,13 +21,13 @@
     },
     "Object checks",
     {
-        "description": "Objects are always truthy, even without keys.",
+        "description": "Empty object is falsy.",
         "rule": { "if": [{}, "apple", "banana"] },
         "data": null,
-        "result": "apple"
+        "result": "banana"
     },
     {
-        "description": "Objects are always truthy, with keys defined",
+        "description": "Objects are truthy, with keys defined",
         "rule": { "if": [{ "val": [] }, "apple", "banana"] },
         "data": { "some": "value" },
         "result": "apple"
@@ -240,6 +240,12 @@
         "description": "Returns first truthy value, some conditions truthy (8)",
         "rule": { "if": [{}, "apple", 0, "banana", 7, "carrot", "date"] },
         "data": null,
+        "result": "carrot"
+    },
+    {
+        "description": "Returns first truthy value, some conditions truthy (9)",
+        "rule": { "if": [{ "val": "a" }, "apple", 0, "banana", 7, "carrot", "date"] },
+        "data": { "a": { "b": 1 } },
         "result": "apple"
     },
     "Bad Arguments",

suites/truthiness.json

@@ -37,10 +37,16 @@
         "result": false,
         "data": null
     },
+    {
+        "description": "Truthy: {}, Direct",
+        "rule": { "!!": {} },
+        "result": false,
+        "data": null
+    },
     {
         "description": "Truthy: {}",
         "rule": { "!!": [{}] },
-        "result": true,
+        "result": false,
         "data": null
     },
     {
@@ -59,7 +65,7 @@
     {
         "description": "Truthy: Zero Key Object",
         "rule": { "!!": { "val": "obj" } },
-        "result": true,
+        "result": false,
         "data": { "obj": {} }
     },
     {