Code cleanup and optimizations

Author: TotalTechGeek

asyncLogic.js

@@ -89,9 +89,8 @@ class AsyncLogicEngine {
     }
 
     if (typeof this.methods[func] === 'object') {
-      const { asyncMethod, method, traverse } = this.methods[func]
-      const shouldTraverse = typeof traverse === 'undefined' ? true : traverse
-      const parsedData = shouldTraverse ? ((!data || typeof data !== 'object') ? [data] : coerceArray(await this.run(data, context, { above }))) : data
+      const { asyncMethod, method, lazy } = this.methods[func]
+      const parsedData = !lazy ? ((!data || typeof data !== 'object') ? [data] : coerceArray(await this.run(data, context, { above }))) : data
       const result = await (asyncMethod || method)(parsedData, context, above, this)
       return Array.isArray(result) ? Promise.all(result) : result
     }
@@ -102,7 +101,7 @@ class AsyncLogicEngine {
   /**
    *
    * @param {String} name The name of the method being added.
-   * @param {((args: any, context: any, above: any[], engine: AsyncLogicEngine) => any) | { traverse?: Boolean, method?: (args: any, context: any, above: any[], engine: AsyncLogicEngine) => any, asyncMethod?: (args: any, context: any, above: any[], engine: AsyncLogicEngine) => Promise<any>, deterministic?: Function | Boolean }} method
+   * @param {((args: any, context: any, above: any[], engine: AsyncLogicEngine) => any) | { lazy?: Boolean, traverse?: Boolean, method?: (args: any, context: any, above: any[], engine: AsyncLogicEngine) => any, asyncMethod?: (args: any, context: any, above: any[], engine: AsyncLogicEngine) => Promise<any>, deterministic?: Function | Boolean }} method
    * @param {{ deterministic?: Boolean, async?: Boolean, sync?: Boolean, optimizeUnary?: boolean }} annotations This is used by the compiler to help determine if it can optimize the function being generated.
    */
   addMethod (
@@ -115,9 +114,9 @@ class AsyncLogicEngine {
     if (typeof async !== 'undefined') sync = !async
 
     if (typeof method === 'function') {
-      if (async) method = { asyncMethod: method, traverse: true }
-      else method = { method, traverse: true }
-    } else method = { ...method }
+      if (async) method = { asyncMethod: method, lazy: false }
+      else method = { method, lazy: false }
+    } else method = { ...method, lazy: typeof method.traverse !== 'undefined' ? !method.traverse : method.lazy }
 
     Object.assign(method, omitUndefined({ deterministic, optimizeUnary }))
     // @ts-ignore

async_optimizer.js

@@ -17,7 +17,7 @@ function getMethod (logic, engine, methodName, above) {
   const method = engine.methods[methodName]
   const called = method.asyncMethod ? method.asyncMethod : method.method ? method.method : method
 
-  if (method.traverse === false) {
+  if (method.lazy) {
     if (typeof method[Sync] === 'function' && method[Sync](logic, { engine })) {
       const called = method.method ? method.method : method
       return declareSync((data, abv) => called(logic[methodName], data, abv || above, engine.fallback), true)

compatibility.js

@@ -19,7 +19,7 @@ const all = {
     return oldAll.asyncMethod(args, context, above, engine)
   },
   deterministic: oldAll.deterministic,
-  traverse: oldAll.traverse
+  lazy: oldAll.lazy
 }
 
 function truthy (value) {

compiler.js

@@ -88,7 +88,7 @@ export function isDeterministic (method, engine, buildState) {
     if (lower === undefined) return true
     if (!engine.methods[func]) throw new Error(`Method '${func}' was not found in the Logic Engine.`)
 
-    if (engine.methods[func].traverse === false) {
+    if (engine.methods[func].lazy) {
       return typeof engine.methods[func].deterministic === 'function'
         ? engine.methods[func].deterministic(lower, buildState)
         : engine.methods[func].deterministic
@@ -119,7 +119,7 @@ function isDeepSync (method, engine) {
     const lower = method[func]
     if (!isSync(engine.methods[func])) return false
 
-    if (engine.methods[func].traverse === false) {
+    if (engine.methods[func].lazy) {
       if (typeof engine.methods[func][Sync] === 'function' && engine.methods[func][Sync](method, { engine })) return true
       return false
     }
@@ -194,7 +194,7 @@ function buildString (method, buildState = {}) {
     }
 
     let lower = method[func]
-    if ((!lower || typeof lower !== 'object') && (typeof engine.methods[func].traverse === 'undefined' || engine.methods[func].traverse)) lower = [lower]
+    if ((!lower || typeof lower !== 'object') && (!engine.methods[func].lazy)) lower = [lower]
 
     if (engine.methods[func] && engine.methods[func].compile) {
       let str = engine.methods[func].compile(lower, buildState)
@@ -220,7 +220,7 @@ function buildString (method, buildState = {}) {
       const argCount = countArguments(asyncDetected ? engine.methods[func].asyncMethod : engine.methods[func].method)
       const argumentsNeeded = argumentsDict[argCount - 1] || argumentsDict[2]
 
-      if (engine.methods[func] && (typeof engine.methods[func].traverse === 'undefined' ? true : engine.methods[func].traverse)) {
+      if (engine.methods[func] && !engine.methods[func].lazy) {
         return makeAsync(`engine.methods["${func}"]${asyncDetected ? '.asyncMethod' : '.method'}(${coerce}(` + buildString(lower, buildState) + ')' + argumentsNeeded + ')')
       } else {
         notTraversed.push(lower)

defaultMethods.js

@@ -21,11 +21,12 @@ function isDeterministic (method, engine, buildState) {
     if (engine.isData(method, func)) return true
     if (!engine.methods[func]) throw new Error(`Method '${func}' was not found in the Logic Engine.`)
 
-    if (engine.methods[func].traverse === false) {
+    if (engine.methods[func].lazy) {
       return typeof engine.methods[func].deterministic === 'function'
         ? engine.methods[func].deterministic(lower, buildState)
         : engine.methods[func].deterministic
     }
+
     return typeof engine.methods[func].deterministic === 'function'
       ? engine.methods[func].deterministic(lower, buildState)
       : engine.methods[func].deterministic &&
@@ -44,7 +45,7 @@ function isSyncDeep (method, engine, buildState) {
     const lower = method[func]
     if (engine.isData(method, func)) return true
     if (!engine.methods[func]) throw new Error(`Method '${func}' was not found in the Logic Engine.`)
-    if (engine.methods[func].traverse === false) return typeof engine.methods[func][Sync] === 'function' ? engine.methods[func][Sync](lower, buildState) : engine.methods[func][Sync]
+    if (engine.methods[func].lazy) return typeof engine.methods[func][Sync] === 'function' ? engine.methods[func][Sync](lower, buildState) : engine.methods[func][Sync]
     return typeof engine.methods[func][Sync] === 'function' ? engine.methods[func][Sync](lower, buildState) : engine.methods[func][Sync] && isSyncDeep(lower, engine, buildState)
   }
 
@@ -121,7 +122,7 @@ const defaultMethods = {
   min: (data) => Math.min(...data),
   in: ([item, array]) => (array || []).includes(item),
   preserve: {
-    traverse: false,
+    lazy: true,
     method: declareSync((i) => i, true),
     [Sync]: () => true
   },
@@ -182,7 +183,7 @@ const defaultMethods = {
 
       return engine.run(onFalse, context, { above })
     },
-    traverse: false
+    lazy: true
   },
   '<': (args) => {
     if (args.length === 2) return args[0] < args[1]
@@ -289,7 +290,7 @@ const defaultMethods = {
       if (Array.isArray(data) && data.length) return `(${data.map((i) => buildString(i, buildState)).join(' || ')})`
       return `(${buildString(data, buildState)}).reduce((a,b) => a||b, false)`
     },
-    traverse: false
+    lazy: true
   },
   '??': defineCoalesce(),
   try: defineCoalesce(downgrade),
@@ -319,7 +320,7 @@ const defaultMethods = {
       }
       return item
     },
-    traverse: false,
+    lazy: true,
     deterministic: (data, buildState) => isDeterministic(data, buildState.engine, buildState),
     compile: (data, buildState) => {
       if (!buildState.engine.truthy[OriginalImpl]) {
@@ -352,7 +353,6 @@ const defaultMethods = {
       const result = defaultMethods.val.method(key, context, above, engine, Unfound)
       return result !== Unfound
     },
-    traverse: true,
     deterministic: false
   },
   val: {
@@ -444,7 +444,7 @@ const defaultMethods = {
   all: createArrayIterativeMethod('every', true),
   none: {
     [Sync]: (data, buildState) => isSyncDeep(data, buildState.engine, buildState),
-    traverse: false,
+    lazy: true,
     // todo: add async build & build
     method: (val, context, above, engine) => {
       return !defaultMethods.some.method(val, context, above, engine)
@@ -580,7 +580,7 @@ const defaultMethods = {
         defaultValue
       )
     },
-    traverse: false
+    lazy: true
   },
   '!': (value, _1, _2, engine) => Array.isArray(value) ? !engine.truthy(value[0]) : !engine.truthy(value),
   '!!': (value, _1, _2, engine) => Boolean(Array.isArray(value) ? engine.truthy(value[0]) : engine.truthy(value)),
@@ -598,7 +598,6 @@ const defaultMethods = {
       return res
     },
     deterministic: true,
-    traverse: true,
     optimizeUnary: true,
     compile: (data, buildState) => {
       if (typeof data === 'string') return JSON.stringify(data)
@@ -611,7 +610,7 @@ const defaultMethods = {
   },
   keys: ([obj]) => typeof obj === 'object' ? Object.keys(obj) : [],
   pipe: {
-    traverse: false,
+    lazy: true,
     [Sync]: (data, buildState) => isSyncDeep(data, buildState.engine, buildState),
     method: (args, context, above, engine) => {
       if (!Array.isArray(args)) throw new Error('Data for pipe must be an array')
@@ -638,7 +637,7 @@ const defaultMethods = {
     }
   },
   eachKey: {
-    traverse: false,
+    lazy: true,
     [Sync]: (data, buildState) => isSyncDeep(Object.values(data[Object.keys(data)[0]]), buildState.engine, buildState),
     method: (object, context, above, engine) => {
       const result = Object.keys(object).reduce((accumulator, key) => {
@@ -744,7 +743,7 @@ function defineCoalesce (func) {
       }
       return `(${buildString(data, buildState)}).reduce((a,b) => ${funcCall}(a) ?? b, null)`
     },
-    traverse: false
+    lazy: true
   }
 }
 
@@ -814,7 +813,7 @@ function createArrayIterativeMethod (name, useTruthy = false) {
 
       return buildState.compile`(${selector} || [])[${name}]((i, x, z) => ${useTruthyMethod}(${method}(i, x, ${aboveArray})))`
     },
-    traverse: false
+    lazy: true
   }
 }
 defaultMethods['?:'] = defaultMethods.if

logic.js

@@ -64,8 +64,7 @@ class LogicEngine {
    * @param {*} above The context above (can be used for handlebars-style data traversal.)
    * @returns {{ result: *, func: string }}
    */
-  _parse (logic, context, above) {
-    const [func] = Object.keys(logic)
+  _parse (logic, context, above, func) {
     const data = logic[func]
 
     if (this.isData(logic, func)) return logic
@@ -85,9 +84,8 @@ class LogicEngine {
     }
 
     if (typeof this.methods[func] === 'object') {
-      const { method, traverse } = this.methods[func]
-      const shouldTraverse = typeof traverse === 'undefined' ? true : traverse
-      const parsedData = shouldTraverse ? ((!data || typeof data !== 'object') ? [data] : coerceArray(this.run(data, context, { above }))) : data
+      const { method, lazy } = this.methods[func]
+      const parsedData = !lazy ? ((!data || typeof data !== 'object') ? [data] : coerceArray(this.run(data, context, { above }))) : data
       return method(parsedData, context, above, this)
     }
 
@@ -97,12 +95,12 @@ class LogicEngine {
   /**
    *
    * @param {String} name The name of the method being added.
-   * @param {((args: any, context: any, above: any[], engine: LogicEngine) => any) |{ traverse?: Boolean, method: (args: any, context: any, above: any[], engine: LogicEngine) => any, deterministic?: Function | Boolean }} method
+   * @param {((args: any, context: any, above: any[], engine: LogicEngine) => any) |{ lazy?: Boolean, traverse?: Boolean, method: (args: any, context: any, above: any[], engine: LogicEngine) => any, deterministic?: Function | Boolean }} method
    * @param {{ deterministic?: Boolean, optimizeUnary?: Boolean }} annotations This is used by the compiler to help determine if it can optimize the function being generated.
    */
   addMethod (name, method, { deterministic, optimizeUnary } = {}) {
-    if (typeof method === 'function') method = { method, traverse: true }
-    else method = { ...method }
+    if (typeof method === 'function') method = { method, lazy: false }
+    else method = { ...method, lazy: typeof method.traverse !== 'undefined' ? !method.traverse : method.lazy }
     Object.assign(method, omitUndefined({ deterministic, optimizeUnary }))
     this.methods[name] = declareSync(method)
   }
@@ -161,7 +159,13 @@ class LogicEngine {
       return res
     }
 
-    if (logic && typeof logic === 'object' && Object.keys(logic).length > 0) return this._parse(logic, data, above)
+    if (logic && typeof logic === 'object') {
+      const keys = Object.keys(logic)
+      if (keys.length > 0) {
+        const func = keys[0]
+        return this._parse(logic, data, above, func)
+      }
+    }
 
     return logic
   }

optimizer.js

@@ -14,7 +14,7 @@ function getMethod (logic, engine, methodName, above) {
   const method = engine.methods[methodName]
   const called = method.method ? method.method : method
 
-  if (method.traverse === false) {
+  if (method.lazy) {
     const args = logic[methodName]
     return (data, abv) => called(args, data, abv || above, engine)
   }
@@ -30,7 +30,7 @@ function getMethod (logic, engine, methodName, above) {
       return called(evaluatedArgs, data, abv || above, engine)
     }
   } else {
-    let optimizedArgs = optimize(args, engine, above)
+    const optimizedArgs = optimize(args, engine, above)
     if (method.optimizeUnary) {
       if (typeof optimizedArgs === 'function') return (data, abv) => called(optimizedArgs(data, abv), data, abv || above, engine)
       return (data, abv) => called(optimizedArgs, data, abv || above, engine)