Tweak how the rules execute to fail comparisons on arrays and objects.

Author: TotalTechGeek

defaultMethods.js

@@ -797,21 +797,18 @@ function createComparator (name, func) {
       if (args.length === 2) {
         const a = runOptimizedOrFallback(args[0], engine, context, above)
         const b = runOptimizedOrFallback(args[1], engine, context, above)
-        if (!strict && typeof a !== typeof b) {
-          if (typeof a === 'string' && Number.isNaN(+a)) throw NaN
-          if (typeof b === 'string' && Number.isNaN(+b)) throw NaN
-          return func(+a, +b)
-        }
-        return func(a, b)
+        if (strict || (typeof a === 'string' && typeof b === 'string')) return func(a, b)
+        if (Number.isNaN(+precoerceNumber(a))) throw NaN
+        if (Number.isNaN(+precoerceNumber(b))) throw NaN
+        return func(+a, +b)
       }
       let prev = runOptimizedOrFallback(args[0], engine, context, above)
       for (let i = 1; i < args.length; i++) {
         const current = runOptimizedOrFallback(args[i], engine, context, above)
-        if (!strict && typeof current !== typeof prev) {
-          if (typeof current === 'string' && Number.isNaN(+current)) throw NaN
-          if (i === 1 && typeof prev === 'string' && Number.isNaN(+prev)) throw NaN
-          if (!func(+prev, +current)) return false
-        } else if (!func(prev, current)) return false
+        if (strict || (typeof current === 'string' && typeof prev === 'string')) if (!func(prev, current)) return false
+        if (Number.isNaN(+precoerceNumber(current))) throw NaN
+        if (i === 1 && Number.isNaN(+precoerceNumber(prev))) throw NaN
+        if (!func(+prev, +current)) return false
         prev = current
       }
       return true
@@ -821,21 +818,18 @@ function createComparator (name, func) {
       if (args.length === 2) {
         const a = await runOptimizedOrFallback(args[0], engine, context, above)
         const b = await runOptimizedOrFallback(args[1], engine, context, above)
-        if (!strict && typeof a !== typeof b) {
-          if (typeof a === 'string' && Number.isNaN(+a)) throw NaN
-          if (typeof b === 'string' && Number.isNaN(+b)) throw NaN
-          return func(+a, +b)
-        }
-        return func(a, b)
+        if (strict || (typeof a === 'string' && typeof b === 'string')) return func(a, b)
+        if (Number.isNaN(+precoerceNumber(a))) throw NaN
+        if (Number.isNaN(+precoerceNumber(b))) throw NaN
+        return func(+a, +b)
       }
       let prev = await runOptimizedOrFallback(args[0], engine, context, above)
       for (let i = 1; i < args.length; i++) {
         const current = await runOptimizedOrFallback(args[i], engine, context, above)
-        if (!strict && typeof current !== typeof prev) {
-          if (typeof current === 'string' && Number.isNaN(+current)) throw NaN
-          if (i === 1 && typeof prev === 'string' && Number.isNaN(+prev)) throw NaN
-          if (!func(+prev, +current)) return false
-        } else if (!func(prev, current)) return false
+        if (strict || (typeof current === 'string' && typeof prev === 'string')) if (!func(prev, current)) return false
+        if (Number.isNaN(+precoerceNumber(current))) throw NaN
+        if (i === 1 && Number.isNaN(+precoerceNumber(prev))) throw NaN
+        if (!func(+prev, +current)) return false
         prev = current
       }
       return true

optimizer.js

@@ -2,6 +2,7 @@
 import { isDeterministic } from './compiler.js'
 import { OriginalImpl } from './constants.js'
 import { coerceArray } from './utilities/coerceArray.js'
+import { precoerceNumber } from './utilities/downgrade.js'
 import { splitPathMemoized } from './utilities/splitPath.js'
 
 /**
@@ -122,12 +123,10 @@ function checkIdioms (logic, engine, above) {
       const comparisonFunc = comparison.length === 3
         ? _comparisonFunc
         : function comparisonFunc (a, b) {
-          if (typeof a !== typeof b) {
-            if (typeof a === 'string' && Number.isNaN(+a)) throw NaN
-            if (typeof b === 'string' && Number.isNaN(+b)) throw NaN
-            return _comparisonFunc(+a, +b)
-          }
-          return _comparisonFunc(a, b)
+          if (typeof a === 'string' && typeof b === 'string') return _comparisonFunc(a, b)
+          if (Number.isNaN(+precoerceNumber(a))) throw NaN
+          if (Number.isNaN(+precoerceNumber(b))) throw NaN
+          return _comparisonFunc(+a, +b)
         }
 
       if (logic[comparison].length === 2) {

utilities/downgrade.js

@@ -27,14 +27,16 @@ export function assertSize (arr, size) {
  * @returns {number}
  */
 export function compareCheck (item, prev, strict) {
-  if (!strict && typeof item !== typeof prev) {
-    if (typeof item === 'string' && Number.isNaN(+item)) throw NaN
-    if (typeof prev === 'string' && Number.isNaN(+prev)) throw NaN
-    // The following two checks allow us to handle null == 0 and 0 == null; it's honestly
-    // kind of gross that JavaScript works this way out of the box. Like, why is 0 <= null true,
-    // but null == false. It's just weird.
-    if (prev === null && !item) return null
-    if (item === null && !prev) return 0
-  }
+  if (strict || (typeof item === 'string' && typeof prev === 'string')) return item
+
+  if (Number.isNaN(+precoerceNumber(item))) throw NaN
+  if (Number.isNaN(+precoerceNumber(prev))) throw NaN
+
+  // The following two checks allow us to handle null == 0 and 0 == null; it's honestly
+  // kind of gross that JavaScript works this way out of the box. Like, why is 0 <= null true,
+  // but null == false. It's just weird.
+  if (prev === null && !item) return null
+  if (item === null && !prev) return 0
+
   return item
 }