@woosh/meep-engine 2.104.0 → 2.106.0

package/build/meep.cjs

@@ -251,7 +251,9 @@ class InMemoryDescriptor extends BaseDescription {
 
 function equal(a, b, m) {
     if (a !== b) {
-        const message = m !== undefined ? m : `${a} !== ${b}`;
+        const details = `${a} !== ${b}`;
+
+        const message = (m !== undefined && m !== "") ? `${m}. ${details}` : details;
         throw new Error(message);
     }
 }
@@ -60005,28 +60007,6 @@ const RESERVED_HASH_SUBSTITUTE = 0;
 const UNDEFINED_BIN_INDEX = ~0;
 
 
-/**
- * @template K,V
- * @param {HashMapEntry<K,V>} record
- * @param {number} hash
- * @param {K} key
- * @param {function(a:K,b:K):boolean} equality_op
- */
-function entry_equality_check(record, hash, key, equality_op) {
-    if (record.hash !== hash) {
-        return false;
-    }
-
-    if (record.key === key) {
-        return true;
-    }
-
-    const result = equality_op(record.key, key);
-
-    return result;
-}
-
-
 const EMPTY_BINS = new Uint32Array(0);
 
 /**
@@ -60094,6 +60074,10 @@ class HashMap {
      */
     #load_factor = DEFAULT_LOAD_FACTOR;
 
+    /**
+     * Used to track modifications to prevent concurrent changes during iteration
+     * @type {number}
+     */
     #version = 0;
 
     /**
@@ -60159,6 +60143,8 @@ class HashMap {
         this.#bin_count = 2 ** this.#bin_count_power_of_two;
         this.#bin_count_mask = this.#bin_count - 1;
 
+        const old_entry_allocation_count = this.#entries_allocated_count;
+
         this.#entries_allocated_count = 2 ** this.#entries_count_power_of_two;
 
         const BinsArray = UintArrayForCount(this.#entries_allocated_count + ENTRY_BASE);
@@ -60170,7 +60156,7 @@ class HashMap {
 
         this.#entries = new_entries;
 
-        array_copy(old_entries, 0, new_entries, 0, min2(old_entries.length, this.#entries_allocated_count));
+        array_copy(old_entries, 0, new_entries, 0, min2(old_entry_allocation_count, this.#entries_allocated_count));
 
         if (this.#size > 0) {
             // re-hash
@@ -60206,6 +60192,25 @@ class HashMap {
         return original === RESERVED_HASH ? RESERVED_HASH_SUBSTITUTE : original;
     }
 
+    /**
+     * @param {HashMapEntry<K,V>} record
+     * @param {number} hash
+     * @param {K} key
+     */
+    #entry_equality_check(record, hash, key) {
+        if (record.hash !== hash) {
+            return false;
+        }
+
+        if (record.key === key) {
+            return true;
+        }
+
+        const result = this.keyEqualityFunction(record.key, key);
+
+        return result;
+    }
+
     /**
      *
      * @param {K} k
@@ -60221,6 +60226,7 @@ class HashMap {
 
         if (this.#entries[i] !== undefined) {
             const entry = this.#entries[i];
+
             entry.hash = hash;
             entry.key = k;
             entry.value = v;
@@ -60281,11 +60287,12 @@ class HashMap {
                 // check if it's the entry that we're looking for
                 const entry = this.#entries[bin - ENTRY_BASE];
 
-                if (entry_equality_check(entry, raw_hash, key, this.keyEqualityFunction)) {
+                if (this.#entry_equality_check(entry, raw_hash, key)) {
                     // found the right entry
                     entry.value = value;
                     return;
                 }
+
             } else if (bin === BIN_RESERVED_VALUE_EMPTY) {
                 // bin is empty
 
@@ -60296,7 +60303,9 @@ class HashMap {
 
                 const entry_index = this.#allocate_entry(key, value, raw_hash);
 
-                this.#bins[bin_index] = entry_index + ENTRY_BASE;
+                const bin_value = entry_index + ENTRY_BASE;
+
+                this.#bins[bin_index] = bin_value;
 
                 break;
 
@@ -60344,7 +60353,7 @@ class HashMap {
                 // check if the entry is what we're looking for
                 const entry = this.#entries[bin - ENTRY_BASE];
 
-                if (entry_equality_check(entry, raw_hash, key, this.keyEqualityFunction)) {
+                if (this.#entry_equality_check(entry, raw_hash, key)) {
                     // found the right entry
                     return entry.value;
                 }
@@ -60444,7 +60453,7 @@ class HashMap {
                 const entry_index = bin - ENTRY_BASE;
                 const entry = entries[entry_index];
 
-                if (entry_equality_check(entry, raw_hash, key, this.keyEqualityFunction)) {
+                if (this.#entry_equality_check(entry, raw_hash, key)) {
                     // found the right entry
 
                     // record entry as dead
@@ -60526,7 +60535,11 @@ class HashMap {
 
         let written_entries = 0;
 
-        for (let existing_entry_index = this.#entries_start; existing_entry_index < entries_bound; existing_entry_index++) {
+        for (
+            let existing_entry_index = this.#entries_start;
+            existing_entry_index < entries_bound;
+            existing_entry_index++
+        ) {
             const entry = entries[existing_entry_index];
 
             const hash = entry.hash;
@@ -60778,16 +60791,27 @@ class CacheElement {
             next.previous = previous;
         }
     }
+
+    toString() {
+        return `CacheElement{ hasNext:${this.next !== null}, hasPrevious:${this.previous !== null}, weight:${this.weight}, key:${this.key}, value:${this.value} }`;
+    }
 }
 
-// TODO validate hashes of held elements to keep them up to date. Keys are assumed to be immutable, but this assumption may be broken by users
-
 /**
  * Hash-based cache, uses LRU (least-recently-used) eviction policy
+ * Make sure that keys being used are truly immutable when it comes to hash and equality calculation, otherwise cache corruption is inevitable
  * @template Key, Value
  * @extends Map<Key,Value>
  */
 class Cache {
+    #maxWeight = Number.POSITIVE_INFINITY;
+    /**
+     *
+     * @type {number}
+     * @private
+     */
+    #weight = 0;
+
     /**
      * @param {number} [maxWeight=Number.POSITIVE_INFINITY]
      * @param {function(key:Key):number} [keyWeigher= key=>0]
@@ -60811,14 +60835,8 @@ class Cache {
          * @type {number}
          * @private
          */
-        this.maxWeight = maxWeight;
+        this.#maxWeight = maxWeight;
 
-        /**
-         *
-         * @type {number}
-         * @private
-         */
-        this.weight = 0;
 
         /**
          *
@@ -60919,18 +60937,37 @@ class Cache {
         return this.data.size;
     }
 
+    /**
+     * @deprecated use {@link maxWeight} directly instead
+     */
+    setMaxWeight(value) {
+        this.maxWeight = value;
+    }
+
+    /**
+     * Total weight of all elements currently in the cache
+     * @returns {number}
+     */
+    get weight() {
+        return this.#weight;
+    }
+
     /**
      * Will cause evictions if current weight is smaller than what we're setting
      * @param {number} value
      */
-    setMaxWeight(value) {
+    set maxWeight(value) {
         if (typeof value !== "number" || value < 0) {
             throw new Error(`Weight must be a non-negative number, instead was '${value}'`);
         }
 
-        this.maxWeight = value;
+        this.#maxWeight = value;
 
-        this.evictUntilWeight(this.maxWeight);
+        this.evictUntilWeight(this.#maxWeight);
+    }
+
+    get maxWeight() {
+        return this.#maxWeight;
     }
 
     /**
@@ -60949,7 +60986,8 @@ class Cache {
             result += weight;
         }
 
-        this.weight = result;
+        this.#weight = result;
+        this.evictUntilWeight(this.#maxWeight);
     }
 
     /**
@@ -60979,13 +61017,13 @@ class Cache {
 
         const delta_weight = new_weight - old_weight;
 
-        this.weight += delta_weight;
+        this.#weight += delta_weight;
 
         if (
-            this.weight > this.maxWeight
-            && new_weight <= this.maxWeight //make it less likely to drop entire cache
+            this.#weight > this.#maxWeight
+            && new_weight <= this.#maxWeight //make it less likely to drop entire cache
         ) {
-            this.evictUntilWeight(this.maxWeight);
+            this.evictUntilWeight(this.#maxWeight);
         }
 
         return true;
@@ -61041,7 +61079,7 @@ class Cache {
 
         const target = Math.max(targetWeight, 0);
 
-        while (this.weight > target) {
+        while (this.#weight > target) {
             this.evictOne();
         }
     }
@@ -61055,6 +61093,22 @@ class Cache {
         let element = this.data.get(key);
 
         if (element === undefined) {
+            //compute weight
+            const elementWeight = this.computeElementWeight(key, value);
+
+            /**
+             * It's possible that element being added is larger than cache's capacity,
+             * in which case entire cache will be evicted, but there still won't be enough space
+             * @type {number}
+             */
+            const weightTarget = this.#maxWeight - elementWeight;
+
+            if (weightTarget < 0) {
+                // Special case
+                // element does not fit into cache, attempting to insert it forcibly would result in a full flush and overflow
+                return;
+            }
+
             element = new CacheElement();
 
             element.key = key;
@@ -61072,25 +61126,8 @@ class Cache {
                 this.__last = element;
             }
 
-            //compute weight
-            const elementWeight = this.computeElementWeight(key, value);
-
             element.weight = elementWeight;
 
-
-            /**
-             * It's possible that element being added is larger than cache's capacity,
-             * in which case entire cache will be evicted, but there still won't be enough space
-             * @type {number}
-             */
-            const weightTarget = this.maxWeight - elementWeight;
-
-            if (weightTarget < 0) {
-                // Special case
-                // element does not fit into cache, attempting to insert it forcibly would result in a full flush and overflow
-                return;
-            }
-
             //evict elements until there is enough space for the element
             this.evictUntilWeight(weightTarget);
 
@@ -61098,14 +61135,19 @@ class Cache {
             this.data.set(key, element);
 
             //update weight
-            this.weight += elementWeight;
+            this.#weight += elementWeight;
         } else {
             // check if value is the same
             if (value === element.value) ; else {
                 // replace value, adjust weight
-                this.weight -= this.valueWeigher(element.value);
-                this.weight += this.valueWeigher(value);
+                this.#weight -= element.weight;
 
+                const elementWeight = this.computeElementWeight(key, value);
+
+                this.#weight += elementWeight;
+
+                // assign new values
+                element.weight = elementWeight;
                 element.value = value;
             }
 
@@ -61190,7 +61232,7 @@ class Cache {
         this.data.delete(key);
 
         //update weight
-        this.weight -= element.weight;
+        this.#weight -= element.weight;
     }
 
     /**
@@ -61262,7 +61304,7 @@ class Cache {
         this.__first = null;
         this.__last = null;
 
-        this.weight = 0;
+        this.#weight = 0;
     }
 
     /**
@@ -63123,12 +63165,14 @@ class LineBuilder {
      *
      * @type {Line[]}
      */
-    lines = [];
+    #lines = [];
+
     /**
      *
      * @type {number}
      */
-    indentation = 0;
+    #indentation = 0;
+
     /**
      *
      * @type {number}
@@ -63140,7 +63184,7 @@ class LineBuilder {
      * @return {number}
      */
     get count() {
-        return this.lines.length;
+        return this.#lines.length;
     }
 
     /**
@@ -63149,7 +63193,7 @@ class LineBuilder {
      * @param {string} term
      */
     containsSubstring(term) {
-        const lines = this.lines;
+        const lines = this.#lines;
         const n = lines.length;
         for (let i = 0; i < n; i++) {
             const line = lines[i];
@@ -63169,7 +63213,7 @@ class LineBuilder {
      * @returns {LineBuilder}
      */
     indent() {
-        this.indentation++;
+        this.#indentation++;
         return this;
     }
 
@@ -63178,7 +63222,7 @@ class LineBuilder {
      * @returns {LineBuilder}
      */
     dedent() {
-        this.indentation--;
+        this.#indentation--;
         return this;
     }
 
@@ -63189,9 +63233,9 @@ class LineBuilder {
      */
     add(line_text) {
 
-        const line = new Line(line_text, this.indentation);
+        const line = new Line(line_text, this.#indentation);
 
-        this.lines.push(line);
+        this.#lines.push(line);
 
         return this;
     }
@@ -63202,23 +63246,23 @@ class LineBuilder {
      */
     addLines(lines) {
 
-        const other_lines = lines.lines;
+        const other_lines = lines.#lines;
 
         const other_line_count = other_lines.length;
 
         for (let i = 0; i < other_line_count; i++) {
             const otherLine = other_lines[i];
 
-            const line = new Line(otherLine.text, otherLine.indentation + this.indentation);
+            const line = new Line(otherLine.text, otherLine.indentation + this.#indentation);
 
-            this.lines.push(line);
+            this.#lines.push(line);
         }
 
     }
 
     clear() {
-        this.lines = [];
-        this.indentation = 0;
+        this.#lines = [];
+        this.#indentation = 0;
     }
 
     /**
@@ -63230,7 +63274,7 @@ class LineBuilder {
 
         let i, j, l;
 
-        const lines = this.lines;
+        const lines = this.#lines;
 
         for (i = 0, l = lines.length; i < l; i++) {
             const line = lines[i];
@@ -63263,7 +63307,9 @@ class LineBuilder {
 
         for (let i = 0; i < n; i++) {
 
-            r.add(lines[i]);
+            const line_text = lines[i];
+
+            r.add(line_text);
 
         }
 
@@ -66277,7 +66323,7 @@ class GeometrySpatialQueryAccelerator {
      * @param {number} value in bytes
      */
     set cache_size(value) {
-        this.cache.setMaxWeight(value);
+        this.cache.maxWeight = value;
     }
 
     /**