@calcit/procs 0.28.0 → 0.28.1

package/lib/calcit-data.mjs

@@ -225,6 +225,9 @@ let defaultHash_struct = valueHash("struct:");
 let defaultHash_enum = valueHash("enum:");
 let defaultHash_cirru_quote = valueHash("cirru-quote:");
 let defaultHash_unknown = valueHash("unknown:");
+let defaultHash_buffer = valueHash("buffer:");
+/** Identity hashes for host values, kept outside the objects so frozen or DOM objects are never mutated. */
+let hostValueHashes = new WeakMap();
 let fnHashCounter = 0;
 let jsObjectHashCounter = 0;
 export let hashFunction = (x) => {
@@ -265,15 +268,20 @@ export let hashFunction = (x) => {
     if (typeof x === "function") {
         // method values are closures created on the fly (see invoke_method_closure);
         // hash by method name so equal methods share the same hash, matching isEqual
+        // cache in a WeakMap instead of writing onto the function, so frozen functions hash safely
+        const cachedFn = hostValueHashes.get(x);
+        if (cachedFn != null) {
+            return cachedFn;
+        }
         const methodName = x.__calcitMethodName;
         if (methodName != null) {
             let h = mergeValueHash(defaultHash_fn, methodName);
-            x[calcit_dirty_hash_key] = h;
+            hostValueHashes.set(x, h);
             return h;
         }
         fnHashCounter = fnHashCounter + 1;
         let h = mergeValueHash(defaultHash_fn, fnHashCounter);
-        x[calcit_dirty_hash_key] = h;
+        hostValueHashes.set(x, h);
         return h;
     }
     if (x instanceof CalcitRef) {
@@ -397,15 +405,28 @@ export let hashFunction = (x) => {
         base = hashCirru(base, x.value);
         return base;
     }
-    console.warn(`[warn] calcit-js has no method for hashing this: ${x}`);
-    // currently we use dirty solution here to generate a custom hash
-    // probably happening in .to-pairs of maps, putting a js object into a set
-    // better forbid this, use .to-list instead
-    let hashJsObject = defaultHash_unknown;
+    if (x instanceof Uint8Array) {
+        // Buffers are values: equal bytes must hash equally, matching native Buffer equality.
+        let base = mergeValueHash(defaultHash_buffer, x.length);
+        for (let idx = 0; idx < x.length; idx++) {
+            base = mergeValueHash(base, x[idx]);
+        }
+        return base;
+    }
+    if (typeof x === "object" || typeof x === "function") {
+        // Host values compare by identity, so they hash by identity as well.
+        let cached = hostValueHashes.get(x);
+        if (cached != null) {
+            return cached;
+        }
+        jsObjectHashCounter = jsObjectHashCounter + 1;
+        let hashHostValue = mergeValueHash(defaultHash_unknown, jsObjectHashCounter);
+        hostValueHashes.set(x, hashHostValue);
+        return hashHostValue;
+    }
+    console.warn(`[warn] calcit-js has no method for hashing this: ${String(x)}`);
     jsObjectHashCounter = jsObjectHashCounter + 1;
-    hashJsObject = mergeValueHash(hashJsObject, jsObjectHashCounter);
-    x[calcit_dirty_hash_key] = hashJsObject;
-    return hashJsObject;
+    return mergeValueHash(defaultHash_unknown, jsObjectHashCounter);
 };
 /// traverse Cirru tree to make unique hash
 let hashCirru = (base, x) => {
@@ -826,6 +847,22 @@ export let _$n__$e_ = (x, y) => {
         }
         return false;
     }
+    if (x instanceof Uint8Array) {
+        if (!(y instanceof Uint8Array) || x.length !== y.length) {
+            return false;
+        }
+        for (let idx = 0; idx < x.length; idx++) {
+            if (x[idx] !== y[idx]) {
+                return false;
+            }
+        }
+        return true;
+    }
+    if (tx === "object") {
+        // Host objects (DOM nodes, JS class instances, BufList) compare by identity;
+        // identical references were accepted at the top of this function.
+        return false;
+    }
     throw new Error("Missing handler for this type");
 };
 // overwrite internary comparator of ternary-tree

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@calcit/procs",
-    "version": "0.28.0",
+    "version": "0.28.1",
     "main": "./lib/calcit.procs.mjs",
     "files": [
         "lib/",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.28.0",
+  "version": "0.28.1",
   "main": "./lib/calcit.procs.mjs",
   "files": [
     "lib/",