Expand test suite

Author: TotalTechGeek

defaultMethods.js

@@ -346,6 +346,7 @@ const defaultMethods = {
       // A unary optimization
       if (!Array.isArray(args)) {
         if (unFound && !(context && args in context)) return unFound
+        if (context === null || context === undefined) return null
         const result = context[args]
         if (typeof result === 'undefined') return null
         return result
@@ -405,7 +406,7 @@ const defaultMethods = {
       }
       if (Array.isArray(data) && data.length === 1) data = data[0]
       if (data === null) return wrapNull(buildState.compile`context`)
-      if (!Array.isArray(data)) return wrapNull(buildState.compile`context[${data}]`)
+      if (!Array.isArray(data)) return wrapNull(buildState.compile`(context || 0)[${data}]`)
       if (Array.isArray(data)) {
         let res = buildState.compile`context`
         for (let i = 0; i < data.length; i++) {

logic.js

@@ -76,7 +76,7 @@ class LogicEngine {
     // Later on, I could define something to shut this off if var / val are redefined.
     if ((func === 'var' || func === 'val') && this.methods[func][OriginalImpl]) {
       const input = (!data || typeof data !== 'object') ? data : this.run(data, context, { above })
-      return this.methods[func].method(input, context, above, this)
+      return this.methods[func].method(input, context, above, this, null)
     }
 
     if (typeof this.methods[func] === 'function') {

suites/val.json

@@ -42,6 +42,18 @@
         "data": { "." : 20 },
         "result": 20
     },
+    {
+        "description": "Fetching a value from null returns null",
+        "rule": { "val": "hello" },
+        "data": { "hello" : null },
+        "result": null
+    },
+    {
+        "description": "Fetching a value from a null fetched value returns null",
+        "rule": { "val": ["hello", "world"] },
+        "data": { "hello" : null },
+        "result": null
+    },
     {
         "description": "Fetches the entire context",
         "rule": { "val": [] },