Use prev to eliminate methods.preventFunctions

Author: TotalTechGeek

compiler.js

@@ -308,7 +308,7 @@ function processBuiltString (method, str, buildState) {
     str = str.replace(`__%%%${x}%%%__`, item)
   })
 
-  const final = `(values, methods, notTraversed, asyncIterators, engine, above, coerceArray, downgrade, precoerceNumber) => ${buildState.asyncDetected ? 'async' : ''} (context ${buildState.extraArguments ? ',' + buildState.extraArguments : ''}) => { let prev; const result = ${str}; return result }`
+  const final = `(values, methods, notTraversed, asyncIterators, engine, above, coerceArray, downgrade, precoerceNumber) => ${buildState.asyncDetected ? 'async' : ''} (context ${buildState.extraArguments ? ',' + buildState.extraArguments : ''}) => { ${str.includes('prev') ? 'let prev;' : ''} const result = ${str}; return result }`
   // console.log(str)
   // console.log(final)
   // eslint-disable-next-line no-eval

defaultMethods.js

@@ -404,13 +404,13 @@ const defaultMethods = {
     },
     compile: (data, buildState) => {
       function wrapNull (data) {
-        if (!chainingSupported) return buildState.compile`(methods.preventFunctions(((a) => a === null || a === undefined ? null : a)(${data})))`
-        return buildState.compile`(methods.preventFunctions(${data} ?? null))`
+        let res
+        if (!chainingSupported) res = buildState.compile`(((a) => a === null || a === undefined ? null : a)(${data}))`
+        else res = buildState.compile`(${data} ?? null)`
+        if (!buildState.engine.allowFunctions) res = buildState.compile`(typeof (prev = ${res}) === 'function' ? null : prev)`
+        return res
       }
 
-      if (!buildState.engine.allowFunctions) buildState.methods.preventFunctions = a => typeof a === 'function' ? null : a
-      else buildState.methods.preventFunctions = a => a
-
       if (typeof data === 'object' && !Array.isArray(data)) {
         // If the input for this function can be inlined, we will do so right here.
         if (isSyncDeep(data, buildState.engine, buildState) && isDeterministic(data, buildState.engine, buildState) && !buildState.engine.disableInline) data = (buildState.engine.fallback || buildState.engine).run(data, buildState.context, { above: buildState.above })

legacy.js

@@ -116,19 +116,20 @@ const legacyMethods = {
 
         const pieces = splitPathMemoized(key)
 
-        if (!buildState.engine.allowFunctions) buildState.methods.preventFunctions = a => typeof a === 'function' ? null : a
-        else buildState.methods.preventFunctions = a => a
-
         // support older versions of node
         if (!chainingSupported) {
-          return `(methods.preventFunctions(((a,b) => (typeof a === 'undefined' || a === null) ? b : a)(${pieces.reduce(
+          const res = `((((a,b) => (typeof a === 'undefined' || a === null) ? b : a)(${pieces.reduce(
               (text, i) => `(${text}||0)[${JSON.stringify(i)}]`,
               '(context||0)'
             )}, ${buildString(defaultValue, buildState)})))`
+          if (buildState.engine.allowFunctions) return res
+          return `(typeof (prev = ${res}) === 'function' ? null : prev)`
         }
-        return `(methods.preventFunctions(context${pieces
+        const res = `(context${pieces
             .map((i) => `?.[${JSON.stringify(i)}]`)
-            .join('')} ?? ${buildString(defaultValue, buildState)}))`
+            .join('')} ?? ${buildString(defaultValue, buildState)})`
+        if (buildState.engine.allowFunctions) return res
+        return `(typeof (prev = ${res}) === 'function' ? null : prev)`
       }
       return false
     }