bare-script 3.1.0 → 3.2.1

package/lib/value.js

@@ -116,6 +116,8 @@ function valueJSONSort(value) {
             valueCopy[valueKey] = valueJSONSort(value[valueKey]);
         }
         return valueCopy;
+    } else if (type === 'function') {
+        return valueString(value);
     }
 
     // Everything else is null
@@ -199,6 +201,24 @@ export function valueCompare(left, right) {
             }
         }
         return left.length < right.length ? -1 : (left.length === right.length ? 0 : 1);
+    } else if (leftType === 'object' && Object.getPrototypeOf(left) === Object.prototype &&
+               rightType === 'object' && Object.getPrototypeOf(right) === Object.prototype) {
+        const leftKeyValues = Object.entries(left).sort((kv1, kv2) => kv1[0].localeCompare(kv2[0]));
+        const rightKeyValues = Object.entries(right).sort((kv1, kv2) => kv1[0].localeCompare(kv2[0]));
+        const ixMax = Math.min(leftKeyValues.length, rightKeyValues.length);
+        let ix = 0;
+        while (ix < ixMax) {
+            const keyCompare = valueCompare(leftKeyValues[ix][0], rightKeyValues[ix][0]);
+            if (keyCompare !== 0) {
+                return keyCompare;
+            }
+            const valCompare = valueCompare(leftKeyValues[ix][1], rightKeyValues[ix][1]);
+            if (valCompare !== 0) {
+                return valCompare;
+            }
+            ix += 1;
+        }
+        return leftKeyValues.length < rightKeyValues.length ? -1 : (leftKeyValues.length === rightKeyValues.length ? 0 : 1);
     }
 
     // Invalid comparison - compare by type name

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "bare-script",
-    "version": "3.1.0",
+    "version": "3.2.1",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",
@@ -31,7 +31,7 @@
     },
     "devDependencies": {
         "c8": "~10.1",
-        "eslint": "~9.19",
+        "eslint": "~9.21",
         "jsdoc": "~4.0"
     }
 }