Switch more tests to val, make further optimizations.

Author: TotalTechGeek

compiler.js

@@ -205,7 +205,7 @@ function buildString (method, buildState = {}) {
     }
 
     let coerce = engine.methods[func].optimizeUnary ? '' : 'coerceArray'
-    if (!coerce && Array.isArray(lower) && lower.length === 1) lower = lower[0]
+    if (!coerce && Array.isArray(lower) && lower.length === 1 && !Array.isArray(lower[0])) lower = lower[0]
     else if (coerce && Array.isArray(lower)) coerce = ''
 
     const argumentsDict = [', context', ', context, above', ', context, above, engine']

defaultMethods.js

@@ -341,8 +341,9 @@ const defaultMethods = {
   },
   val: {
     [OriginalImpl]: true,
+    [Sync]: true,
     method: (args, context, above, engine, /** @type {null | Symbol} */ unFound = null) => {
-      if (Array.isArray(args) && args.length === 1) args = args[0]
+      if (Array.isArray(args) && args.length === 1 && !Array.isArray(args[0])) args = args[0]
       // A unary optimization
       if (!Array.isArray(args)) {
         if (unFound && !(context && args in context)) return unFound
@@ -406,7 +407,10 @@ 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 || 0)[${data}]`)
+      if (!Array.isArray(data)) {
+        if (chainingSupported) return wrapNull(buildState.compile`context?.[${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++) {
@@ -560,7 +564,10 @@ const defaultMethods = {
       if (typeof arr === 'string') return arr
       if (!Array.isArray(arr)) return arr.toString()
       let res = ''
-      for (let i = 0; i < arr.length; i++) res += arr[i].toString()
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i] === null || arr[i] === undefined) continue
+        res += arr[i]
+      }
       return res
     },
     deterministic: true,

perf.js

@@ -4,13 +4,13 @@ async function test () {
   const logic = {
     if: [
       {
-        '>': [{ var: 'x' }, { '+': [11, 5, { '+': [1, { var: 'y' }, 1] }, 2] }]
+        '>': [{ val: 'x' }, { '+': [11, 5, { '+': [1, { val: 'y' }, 1] }, 2] }]
       },
       {
-        '*': [{ var: 'x' }, { '*': { map: [[2, 5, 5], { var: '' }] } }]
+        '*': [{ val: 'x' }, { '*': { map: [[2, 5, 5], { val: [] }] } }]
       },
       {
-        '/': [{ var: 'x' }, { '-': { map: [[100, 50, 30, 10], { var: '' }] } }]
+        '/': [{ val: 'x' }, { '-': { map: [[100, 50, 30, 10], { val: [] }] } }]
       }
     ]
   }

perf2.js

@@ -8,13 +8,13 @@ async function main () {
   const logic = {
     if: [
       {
-        '>': [{ var: 'x' }, { '+': [11, 5, { '+': [1, { var: 'y' }, 1] }, 2] }]
+        '>': [{ val: 'x' }, { '+': [11, 5, { '+': [1, { val: 'y' }, 1] }, 2] }]
       },
       {
-        '*': [{ var: 'x' }, { '*': { map: [[2, 5, 5], { var: '' }] } }]
+        '*': [{ val: 'x' }, { '*': { map: [[2, 5, 5], { val: [] }] } }]
       },
       {
-        '/': [{ var: 'x' }, { '-': { map: [[100, 50, 30, 10], { var: '' }] } }]
+        '/': [{ val: 'x' }, { '-': { map: [[100, 50, 30, 10], { val: [] }] } }]
       }
     ]
   }

perf3.js

@@ -1,6 +1,6 @@
 import { LogicEngine } from './index.js'
 const x = new LogicEngine()
-const f = x.build({ '<': [{ var: '' }, 10] })
+const f = x.build({ '<': [{ val: [] }, 10] })
 console.time('Logic Built')
 for (let i = 0; i < 1e6; i++) {
   f(i % 20)

perf4.js

@@ -4,7 +4,7 @@ import { LogicEngine } from './index.js'
 const optimized = new LogicEngine()
 const unoptimized = new LogicEngine(undefined, { disableInterpretedOptimization: true })
 
-const dynamicRule = { '+': [1, 2, 3, { var: 'a' }] }
+const dynamicRule = { '+': [1, 2, 3, { val: 'a' }] }
 const staticRule = { '+': [1, 2, 3, 4] }
 
 console.time('Optimized, Same Object, Dynamic')
@@ -35,7 +35,7 @@ console.log('----')
 
 console.time('Optimized, Different Object, Dynamic')
 for (let i = 0; i < 1e6; i++) {
-  optimized.run({ '+': [1, 2, 3, { var: 'a' }] }, { a: i })
+  optimized.run({ '+': [1, 2, 3, { val: 'a' }] }, { a: i })
 }
 console.timeEnd('Optimized, Different Object, Dynamic')
 
@@ -49,7 +49,7 @@ console.timeEnd('Optimized, Different Object, Static')
 
 console.time('Unoptimized, Different Object, Dynamic')
 for (let i = 0; i < 1e6; i++) {
-  unoptimized.run({ '+': [1, 2, 3, { var: 'a' }] }, { a: i })
+  unoptimized.run({ '+': [1, 2, 3, { val: 'a' }] }, { a: i })
 }
 console.timeEnd('Unoptimized, Different Object, Dynamic')