Fix a weird edge case where the returned result was null but it neede…

…d to check if it was a function
TotalTechGeek · Jun 5, 2023 · 4d33fae · 4d33fae
1 parent 025ecba
commit 4d33fae
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/async.test.js b/async.test.js
@@ -778,7 +778,7 @@ modes.forEach((logic) => {
               )
             }
 
-            if (engine.allowFunctions || typeof context[key] !== 'function') {
+            if (engine.allowFunctions || typeof (context && context[key]) !== 'function') {
               if (!(key in context)) {
                 return new YieldStructure({
                   message: 'Data does not exist in context.'

diff --git a/defaultMethods.js b/defaultMethods.js
@@ -194,7 +194,7 @@ const defaultMethods = {
     }
     const notFound = b === undefined ? null : b
     if (typeof key === 'undefined' || key === '' || key === null) {
-      if (engine.allowFunctions || typeof context[key] !== 'function') {
+      if (engine.allowFunctions || typeof (context && context[key]) !== 'function') {
         return context
       }
       return null
@@ -210,7 +210,7 @@ const defaultMethods = {
         return notFound
       }
     }
-    if (engine.allowFunctions || typeof context[key] !== 'function') {
+    if (engine.allowFunctions || typeof (context && context[key]) !== 'function') {
       return context
     }
     return null

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "json-logic-engine",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Construct complex rules with JSON & process them.",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",

diff --git a/yieldingIterators.test.js b/yieldingIterators.test.js
@@ -33,7 +33,7 @@ const yieldVar = (key, context, above, engine) => {
       return new YieldStructure({ message: 'Data is not found.' })
     }
   }
-  if (engine.allowFunctions || typeof context[key] !== 'function') {
+  if (engine.allowFunctions || typeof (context && context[key]) !== 'function') {
     return context
   }
   return null