@woosh/meep-engine 2.104.0 → 2.105.0

package/src/core/cache/Cache.spec.js

@@ -32,6 +32,19 @@ test("trying to insert an element into the cache that's larger than the cache ca
     expect(cache.contains(2)).toBe(false);
 });
 
+test("Recently accessed element should not be targeted for eviction where possible", () => {
+    const cache = new Cache();
+
+    cache.put(2, "hello");
+    cache.put(7, "world");
+
+    cache.get(2);
+
+    cache.evictOne();
+
+    expect(cache.has(2)).toBe(true);
+});
+
 test("removeListener is called when element is evicted", () => {
 
     const removeListener = jest.fn();
@@ -233,3 +246,32 @@ test("silentRemove should not notify", () => {
 
     expect(mock).not.toHaveBeenCalled();
 });
+
+test("setting maxWeight will drop data and update weight", () => {
+
+    const cache = new Cache();
+
+    cache.set("a", 1);
+    cache.set("b", 2);
+    cache.set("c", 3);
+
+    expect(cache.weight).toEqual(3);
+
+    cache.maxWeight = 1;
+
+    expect(cache.maxWeight).toEqual(1);
+    expect(cache.weight).toEqual(1);
+});
+
+test("setting maxWeight to 0 will empty out cache", () => {
+
+    const cache = new Cache();
+
+    cache.set("a", 1);
+    cache.set("b", 2);
+
+    cache.maxWeight = 0;
+
+    expect(cache.size()).toBe(0);
+
+});

package/src/core/cache/CacheElement.d.ts

@@ -30,5 +30,6 @@ export class CacheElement<Key, Value> {
      */
     previous: CacheElement<Key_1, Value_1>;
     unlink(): void;
+    toString(): string;
 }
 //# sourceMappingURL=CacheElement.d.ts.map

package/src/core/cache/CacheElement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CacheElement.d.ts","sourceRoot":"","sources":["../../../../src/core/cache/CacheElement.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH;IAMQ;;;OAGG;IACH,WAAe;IAEf;;;OAGG;IACH,eAAiB;IAEjB;;;OAGG;IACH,QAFU,MAAM,CAED;IAEf;;;OAGG;IACH,mCAAgB;IAEhB;;;OAGG;IACH,uCAAoB;IAGxB,eAWC;CACJ"}
+{"version":3,"file":"CacheElement.d.ts","sourceRoot":"","sources":["../../../../src/core/cache/CacheElement.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH;IAMQ;;;OAGG;IACH,WAAe;IAEf;;;OAGG;IACH,eAAiB;IAEjB;;;OAGG;IACH,QAFU,MAAM,CAED;IAEf;;;OAGG;IACH,mCAAgB;IAEhB;;;OAGG;IACH,uCAAoB;IAGxB,eAWC;IAED,mBAEC;CACJ"}

package/src/core/cache/CacheElement.js

@@ -52,4 +52,8 @@ export 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} }`;
+    }
 }

package/src/core/codegen/LineBuilder.d.ts

@@ -9,16 +9,6 @@ declare class LineBuilder {
      * @returns {LineBuilder}
      */
     static fromText(text: string): LineBuilder;
-    /**
-     *
-     * @type {Line[]}
-     */
-    lines: Line[];
-    /**
-     *
-     * @type {number}
-     */
-    indentation: number;
     /**
      *
      * @type {number}
@@ -62,19 +52,6 @@ declare class LineBuilder {
      * @returns {string}
      */
     build(): string;
-}
-/**
- * Created by Alex on 08/06/2015.
- */
-declare class Line {
-    /**
-     *
-     * @param {string} text
-     * @param {number} indent
-     * @constructor
-     */
-    constructor(text: string, indent: number);
-    text: string;
-    indentation: number;
+    #private;
 }
 //# sourceMappingURL=LineBuilder.d.ts.map

package/src/core/codegen/LineBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LineBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/codegen/LineBuilder.js"],"names":[],"mappings":";AAoBA;;GAEG;AACH;IAkII;;;;OAIG;IACH,sBAHW,MAAM,GACJ,WAAW,CAkBvB;IArJD;;;OAGG;IACH,OAFU,IAAI,EAAE,CAEL;IACX;;;OAGG;IACH,aAFU,MAAM,CAEA;IAChB;;;OAGG;IACH,cAFU,MAAM,CAEqB;IAErC;;;OAGG;IACH,oBAEC;IAED;;;;OAIG;IACH,wBAFW,MAAM,GADL,OAAO,CAiBlB;IAED;;;OAGG;IACH,UAFa,WAAW,CAKvB;IAED;;;OAGG;IACH,UAFa,WAAW,CAKvB;IAED;;;;OAIG;IACH,eAHW,MAAM,GACJ,WAAW,CASvB;IAED;;;OAGG;IACH,gBAFW,WAAW,QAgBrB;IAED,cAGC;IAED;;;OAGG;IACH,SAFa,MAAM,CAsBlB;CAwBJ;AA/KD;;GAEG;AAGH;IACI;;;;;OAKG;IACH,kBAJW,MAAM,UACN,MAAM,EAMhB;IAFG,aAAgB;IAChB,oBAAyB;CAEhC"}
+{"version":3,"file":"LineBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/codegen/LineBuilder.js"],"names":[],"mappings":";AAoBA;;GAEG;AACH;IAoII;;;;OAIG;IACH,sBAHW,MAAM,GACJ,WAAW,CAoBvB;IA7ID;;;OAGG;IACH,cAFU,MAAM,CAEqB;IAErC;;;OAGG;IACH,oBAEC;IAED;;;;OAIG;IACH,wBAFW,MAAM,GADL,OAAO,CAiBlB;IAED;;;OAGG;IACH,UAFa,WAAW,CAKvB;IAED;;;OAGG;IACH,UAFa,WAAW,CAKvB;IAED;;;;OAIG;IACH,eAHW,MAAM,GACJ,WAAW,CASvB;IAED;;;OAGG;IACH,gBAFW,WAAW,QAgBrB;IAED,cAGC;IAED;;;OAGG;IACH,SAFa,MAAM,CAsBlB;;CA0BJ"}

package/src/core/codegen/LineBuilder.js

@@ -27,12 +27,14 @@ class LineBuilder {
      *
      * @type {Line[]}
      */
-    lines = [];
+    #lines = [];
+
     /**
      *
      * @type {number}
      */
-    indentation = 0;
+    #indentation = 0;
+
     /**
      *
      * @type {number}
@@ -44,7 +46,7 @@ class LineBuilder {
      * @return {number}
      */
     get count() {
-        return this.lines.length;
+        return this.#lines.length;
     }
 
     /**
@@ -53,7 +55,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];
@@ -73,7 +75,7 @@ class LineBuilder {
      * @returns {LineBuilder}
      */
     indent() {
-        this.indentation++;
+        this.#indentation++;
         return this;
     }
 
@@ -82,7 +84,7 @@ class LineBuilder {
      * @returns {LineBuilder}
      */
     dedent() {
-        this.indentation--;
+        this.#indentation--;
         return this;
     }
 
@@ -93,9 +95,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;
     }
@@ -106,23 +108,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;
     }
 
     /**
@@ -134,7 +136,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];
@@ -167,7 +169,9 @@ class LineBuilder {
 
         for (let i = 0; i < n; i++) {
 
-            r.add(lines[i]);
+            const line_text = lines[i];
+
+            r.add(line_text);
 
         }
 

package/src/core/collection/map/HashMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HashMap.d.ts","sourceRoot":"","sources":["../../../../../src/core/collection/map/HashMap.js"],"names":[],"mappings":"AAiBA;;;;;;;;;;;;GAYG;AACH,uFAIC;AAsHD;;;;;;;GAOG;AACH;IA2DI;;;;;;OAMG;IACH,4FALuB,MAAM,EAsC5B;IAlBG;;;;;OAKG;IACH,iCAAsC;IACtC;;;;;OAKG;IACH,qCAA8C;IAOlD,mBAEC;IAED;;;OAGG;IACH,kBAFa,MAAM,CAIlB;IA2HD;;;;OAIG;IACH,SAHW,CAAC,SACD,CAAC,QAoEX;IAED;;;;OAIG;IACH,SAHW,CAAC,GACC,CAAC,GAAC,SAAS,CA+BvB;IAED;;;;;;;;OAQG;IACH,kBALW,CAAC,kBACQ,CAAC,KAAE,CAAC,0BAEZ,CAAC,CAcZ;IAED;;;;;OAKG;IACH,cAJW,CAAC,SACD,CAAC,GACA,CAAC,CAYZ;IAuBD;;;;OAIG;IACH,YAHW,CAAC,GACC,OAAO,CA+CnB;IAED;;;;;OAKG;IACH,4CAFa,OAAO,CA+BnB;IAOD;;OAEG;IACH,gBAkDC;IAmBD,2CAwBC;IAED;;;;OAIG;IACH,SAHW,CAAC,GACC,OAAO,CAInB;IAED;;OAEG;IACH,cA6BC;IA+BD;;;OAGG;IACH,UAFa,SAAS,CAAC,CAAC,CAOvB;IAED;;;OAGG;IACH,QAFa,SAAS,CAAC,CAAC,CAMvB;IAhDD,yDA2BC;;CAsBJ"}
+{"version":3,"file":"HashMap.d.ts","sourceRoot":"","sources":["../../../../../src/core/collection/map/HashMap.js"],"names":[],"mappings":"AAiBA;;;;;;;;;;;;GAYG;AACH,uFAIC;AA8FD;;;;;;;GAOG;AACH;IA+DI;;;;;;OAMG;IACH,4FALuB,MAAM,EAsC5B;IAlBG;;;;;OAKG;IACH,iCAAsC;IACtC;;;;;OAKG;IACH,qCAA8C;IAOlD,mBAEC;IAED;;;OAGG;IACH,kBAFa,MAAM,CAIlB;IAkJD;;;;OAIG;IACH,SAHW,CAAC,SACD,CAAC,QAsEX;IAED;;;;OAIG;IACH,SAHW,CAAC,GACC,CAAC,GAAC,SAAS,CA+BvB;IAED;;;;;;;;OAQG;IACH,kBALW,CAAC,kBACQ,CAAC,KAAE,CAAC,0BAEZ,CAAC,CAcZ;IAED;;;;;OAKG;IACH,cAJW,CAAC,SACD,CAAC,GACA,CAAC,CAYZ;IAuBD;;;;OAIG;IACH,YAHW,CAAC,GACC,OAAO,CA+CnB;IAED;;;;;OAKG;IACH,4CAFa,OAAO,CA+BnB;IAOD;;OAEG;IACH,gBAkDC;IAmBD,2CAwBC;IAED;;;;OAIG;IACH,SAHW,CAAC,GACC,OAAO,CAInB;IAED;;OAEG;IACH,cA6BC;IA+BD;;;OAGG;IACH,UAFa,SAAS,CAAC,CAAC,CAOvB;IAED;;;OAGG;IACH,QAFa,SAAS,CAAC,CAAC,CAMvB;IAhDD,yDA2BC;;CAsBJ"}

package/src/core/collection/map/HashMap.js

@@ -124,30 +124,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);
-
-    assert.isBoolean(result, `result(a=${record.key},b=${key})`);
-
-    return result;
-}
-
-
 const EMPTY_BINS = new Uint32Array(0);
 
 /**
@@ -215,6 +191,10 @@ export class HashMap {
      */
     #load_factor = DEFAULT_LOAD_FACTOR;
 
+    /**
+     * Used to track modifications to prevent concurrent changes during iteration
+     * @type {number}
+     */
     #version = 0;
 
     /**
@@ -339,6 +319,29 @@ export 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;
+        }
+
+        assert.equal(record.hash, this.#build_key_hash(record.key), `Key hash has diverged for key ${record.key}, likely key was mutated or hash function is unstable`);
+
+        const result = this.keyEqualityFunction(record.key, key);
+
+        assert.isBoolean(result, `result(a=${record.key},b=${key})`);
+
+        return result;
+    }
+
     /**
      *
      * @param {K} k
@@ -402,6 +405,7 @@ export class HashMap {
 
         const raw_hash = this.#build_key_hash(key);
         let bin_index = this.#compute_bin_index(raw_hash);
+
         assert.isFiniteNumber(bin_index, 'hash');
 
         let first_deleted_bin_index = UNDEFINED_BIN_INDEX;
@@ -415,11 +419,12 @@ export 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
 
@@ -484,7 +489,7 @@ export 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;
                 }
@@ -588,7 +593,7 @@ export 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

package/src/core/model/node-graph/NodeGraph.js

@@ -244,7 +244,7 @@ export class NodeGraph {
      * @return {NodeInstance[]}
      */
     getNodes() {
-        return this.nodes.data.slice();
+        return this.nodes.asArray().slice();
     }
 
     /**
@@ -252,7 +252,7 @@ export class NodeGraph {
      * @return {Connection[]}
      */
     getConnections() {
-        return this.connections.data.slice();
+        return this.connections.asArray().slice();
     }
 
     /**

package/src/engine/graphics/ecs/mesh/Mesh.js

@@ -397,7 +397,7 @@ class Mesh {
                 const matrixWorld = skeletonBone.matrixWorld;
 
 
-                result.threejs_setFromMatrixPosition(matrixWorld);
+                result.setFromMatrixPosition(matrixWorld.elements);
             }
 
         }

package/src/engine/graphics/geometry/buffered/query/GeometrySpatialQueryAccelerator.js

@@ -41,7 +41,7 @@ export class GeometrySpatialQueryAccelerator {
      * @param {number} value in bytes
      */
     set cache_size(value) {
-        this.cache.setMaxWeight(value);
+        this.cache.maxWeight = value;
     }
 
     /**