Rework comparison strictness NaN check, and separate out tests

Author: TotalTechGeek

defaultMethods.js

@@ -790,13 +790,14 @@ const defaultMethods = {
 
 function createComparator (name, func) {
   const opStr = { [Compiled]: name }
+  const strict = name.length === 3
   return {
     method: (args, context, above, engine) => {
       if (!Array.isArray(args) || args.length <= 1) throw INVALID_ARGUMENTS
       if (args.length === 2) {
         const a = runOptimizedOrFallback(args[0], engine, context, above)
         const b = runOptimizedOrFallback(args[1], engine, context, above)
-        if (typeof a !== typeof b) {
+        if (!strict && typeof a !== typeof b) {
           if (typeof a === 'string' && Number.isNaN(+a)) throw NaN
           if (typeof b === 'string' && Number.isNaN(+b)) throw NaN
         }
@@ -805,7 +806,7 @@ function createComparator (name, func) {
       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 (typeof current !== typeof prev) {
+        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
         }
@@ -819,7 +820,7 @@ 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 (typeof a !== typeof b) {
+        if (!strict && typeof a !== typeof b) {
           if (typeof a === 'string' && Number.isNaN(+a)) throw NaN
           if (typeof b === 'string' && Number.isNaN(+b)) throw NaN
         }
@@ -828,7 +829,7 @@ function createComparator (name, func) {
       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 (typeof current !== typeof prev) {
+        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
         }
@@ -840,9 +841,9 @@ function createComparator (name, func) {
     compile: (data, buildState) => {
       if (!Array.isArray(data)) return false
       if (data.length < 2) return false
-      if (data.length === 2) return buildState.compile`((prev = ${data[0]}) ${opStr} compareCheck(${data[1]}, prev))`
-      let res = buildState.compile`((prev = ${data[0]}) ${opStr} (prev = compareCheck(${data[1]}, prev)))`
-      for (let i = 2; i < data.length; i++) res = buildState.compile`(${res} && prev ${opStr} (prev = compareCheck(${data[i]}, prev)))`
+      if (data.length === 2) return buildState.compile`((prev = ${data[0]}) ${opStr} compareCheck(${data[1]}, prev, ${strict}))`
+      let res = buildState.compile`((prev = ${data[0]}) ${opStr} (prev = compareCheck(${data[1]}, prev, ${strict})))`
+      for (let i = 2; i < data.length; i++) res = buildState.compile`(${res} && prev ${opStr} (prev = compareCheck(${data[i]}, prev, ${strict})))`
       return res
     },
     [OriginalImpl]: true,

optimizer.js

@@ -119,13 +119,15 @@ function checkIdioms (logic, engine, above) {
     if (logic[comparison] && Array.isArray(logic[comparison]) && engine.methods[comparison][OriginalImpl]) {
       const _comparisonFunc = comparisons[comparison]
 
-      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
+      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 (logic[comparison].length === 2) {
         const [a, b] = logic[comparison]