@woosh/meep-engine 2.105.0 → 2.106.0

package/build/meep.module.js

@@ -249,7 +249,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);
     }
 }
@@ -60139,6 +60141,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);
@@ -60150,7 +60154,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
@@ -60220,6 +60224,7 @@ class HashMap {
 
         if (this.#entries[i] !== undefined) {
             const entry = this.#entries[i];
+
             entry.hash = hash;
             entry.key = k;
             entry.value = v;
@@ -60296,7 +60301,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;
 
@@ -60526,7 +60533,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;
@@ -61080,6 +61091,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;
@@ -61097,25 +61124,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);
 
@@ -61128,9 +61138,14 @@ class Cache {
             // 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;
             }
 

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.105.0",
+  "version": "2.106.0",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/assert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assert.d.ts","sourceRoot":"","sources":["../../../src/core/assert.js"],"names":[],"mappings":"AA6BA,6CAIC;;IAsJD;;;;;OAKG;IACH,kEAQC;;;;;;;;;;;;;;;IAmBD;;;;;;OAMG;IACH,uGAGC;IAGD;;;;OAIG;IACH,0DAMC;IAED;;;;OAIG;IACH,0DAMC;IAED;;;;OAIG;IACH,2DAMC;IAED;;;;OAIG;IACH,4DAMC;IAED;;;;OAIG;IACH,0DAMC;IAED;;;;OAIG;IACH,2DAMC;IAED;;;;OAIG;IACH,sEAMC;IAED;;;;OAIG;IACH,4DAKC;IAED;;;;OAIG;IACH,+EAKC;IAGD;;;;OAIG;IACH,yDAMC;IAED;;;;OAIG;IACH,wDAIC;IAED;;;;OAIG;IACH,yDAMC;IAED;;;;OAIG;IACH,2DAIC;IAED;;;;OAIG;IACH,mEAIC;IAED;;;;;OAKG;IACH,2EAgBC;;AA/ZD,wDAEC;AAED,6CAEC;AAbD,qDAKC;AAUD;;;;;GAKG;AACH,kCAJW,MAAM,KACN,MAAM,MACN,MAAM,QAIhB;AAQD;;;;;GAKG;AACH,gCAJW,MAAM,KACN,MAAM,MACN,MAAM,QAiBhB;AAyBD;;;;;GAKG;AACH,uCAJW,MAAM,KACN,MAAM,MACN,MAAM,QAiBhB;AA5CD;;;;;GAKG;AACH,6BAJW,MAAM,KACN,MAAM,MACN,MAAM,QAiBhB;AAyBD;;;;;GAKG;AACH,oCAJW,MAAM,KACN,MAAM,MACN,MAAM,QAiBhB;AAKD;;;;;GAKG;AACH,0CAHW,MAAM,cACN,MAAM,QAehB;AAED;;;;;GAKG;AACH,iEAFW,MAAM,QAIhB;AAED;;;;;GAKG;AACH,mEAFW,MAAM,QAIhB;AAED;;;;;GAKG;AACH,+IAFW,MAAM,QAMhB"}
+{"version":3,"file":"assert.d.ts","sourceRoot":"","sources":["../../../src/core/assert.js"],"names":[],"mappings":"AA+BA,6CAIC;;IAsJD;;;;;OAKG;IACH,kEAQC;;;;;;;;;;;;;;;IAmBD;;;;;;OAMG;IACH,uGAGC;IAGD;;;;OAIG;IACH,0DAMC;IAED;;;;OAIG;IACH,0DAMC;IAED;;;;OAIG;IACH,2DAMC;IAED;;;;OAIG;IACH,4DAMC;IAED;;;;OAIG;IACH,0DAMC;IAED;;;;OAIG;IACH,2DAMC;IAED;;;;OAIG;IACH,sEAMC;IAED;;;;OAIG;IACH,4DAKC;IAED;;;;OAIG;IACH,+EAKC;IAGD;;;;OAIG;IACH,yDAMC;IAED;;;;OAIG;IACH,wDAIC;IAED;;;;OAIG;IACH,yDAMC;IAED;;;;OAIG;IACH,2DAIC;IAED;;;;OAIG;IACH,mEAIC;IAED;;;;;OAKG;IACH,2EAgBC;;AA/ZD,wDAEC;AAED,6CAEC;AAfD,qDAOC;AAUD;;;;;GAKG;AACH,kCAJW,MAAM,KACN,MAAM,MACN,MAAM,QAIhB;AAQD;;;;;GAKG;AACH,gCAJW,MAAM,KACN,MAAM,MACN,MAAM,QAiBhB;AAyBD;;;;;GAKG;AACH,uCAJW,MAAM,KACN,MAAM,MACN,MAAM,QAiBhB;AA5CD;;;;;GAKG;AACH,6BAJW,MAAM,KACN,MAAM,MACN,MAAM,QAiBhB;AAyBD;;;;;GAKG;AACH,oCAJW,MAAM,KACN,MAAM,MACN,MAAM,QAiBhB;AAKD;;;;;GAKG;AACH,0CAHW,MAAM,cACN,MAAM,QAehB;AAED;;;;;GAKG;AACH,iEAFW,MAAM,QAIhB;AAED;;;;;GAKG;AACH,mEAFW,MAAM,QAIhB;AAED;;;;;GAKG;AACH,+IAFW,MAAM,QAMhB"}

package/src/core/assert.js

@@ -4,7 +4,9 @@ import { InMemoryDescriptor } from "./debug/InMemoryDescriptor.js";
 
 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);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"Cache.d.ts","sourceRoot":"","sources":["../../../../src/core/cache/Cache.js"],"names":[],"mappings":"AASA;;;;;GAKG;AACH;IASI;;;;;;;;OAQG;IACH,sGARW,MAAM,EAuFhB;IAxDG;;;;OAIG;IACH,mBAA4B;IAE5B;;;;OAIG;IACH,qBAAgC;IAEhC;;;;OAIG;IACH,gBAAmB;IACnB;;;;OAIG;IACH,eAAkB;IAGlB;;;;OAIG;IACH,aAIE;IAEF;;;OAGG;IACH,WAFU,OAAO,GAAG,EAAC,KAAK,CAAC,CAEE;IAE7B;;;OAGG;IACH,WAFU,OAAO,GAAG,EAAC,KAAK,CAAC,CAEE;IAE7B;;;OAGG;IACH,OAFU,OAAO,GAAG,EAAC,KAAK,CAAC,CAEF;IAG7B;;;;;OAKG;IACH,kBAyBC;IAED;;;OAGG;IACH,QAFa,MAAM,CAIlB;IAED;;OAEG;IACH,+BAEC;IAUD;;;OAGG;IACH,2BAQC;IAED,wBAEC;IAxBD;;;OAGG;IACH,qBAEC;IAoBD;;;;OAIG;IACH,wBAaC;IAED;;;;;;OAMG;IACH,yBAHW,GAAG,GACD,OAAO,CAgCnB;IAED;;;;;OAKG;IACH,6BAUC;IAED;;;OAGG;IACH,sBAFa,aAAa,GAAG,EAAC,KAAK,CAAC,GAAC,IAAI,CAIxC;IAED;;;OAGG;IACH,YAFa,OAAO,CAkBnB;IAED;;;OAGG;IACH,+BAFW,MAAM,QAWhB;IAED;;;;OAIG;IACH,SAHW,GAAG,SACH,KAAK,QAoEf;IAED;;;;OAIG;IACH,cAHW,GAAG,GACD,OAAO,CAInB;IAED;;;;OAIG;IACH,SAHW,GAAG,GACD,KAAK,GAAC,IAAI,CAYtB;IAGD;;;;;;OAMG;IACH,kBALW,GAAG,kBACM,GAAG,KAAE,KAAK,0BAElB,KAAK,CAchB;IAED;;;;OAIG;IACH,wBAqBC;IAED;;;;OAIG;IACH,YAHW,GAAG,GACD,OAAO,CAgBnB;IAED;;;;;OAKG;IACH,kBAHW,GAAG,GACD,OAAO,CAanB;IAED;;OAEG;IACH,cAcC;IAED;;;OAGG;IACH,aAOC;IAED;;;;;OAKG;IACH,wCAFa,OAAO,CAMnB;IAGL;;;OAGG;IACH,6CAAmB;IAEnB;;;OAGG;IACH,+BA5FiB,OAAO,CA4FF;IAEtB;;;OAGG;IACH,4BA9KiB,OAAO,CA8KL;;CAlBlB;mBA3hBkB,4BAA4B;6BAIlB,mBAAmB"}
+{"version":3,"file":"Cache.d.ts","sourceRoot":"","sources":["../../../../src/core/cache/Cache.js"],"names":[],"mappings":"AASA;;;;;GAKG;AACH;IASI;;;;;;;;OAQG;IACH,sGARW,MAAM,EAuFhB;IAxDG;;;;OAIG;IACH,mBAA4B;IAE5B;;;;OAIG;IACH,qBAAgC;IAEhC;;;;OAIG;IACH,gBAAmB;IACnB;;;;OAIG;IACH,eAAkB;IAGlB;;;;OAIG;IACH,aAIE;IAEF;;;OAGG;IACH,WAFU,OAAO,GAAG,EAAC,KAAK,CAAC,CAEE;IAE7B;;;OAGG;IACH,WAFU,OAAO,GAAG,EAAC,KAAK,CAAC,CAEE;IAE7B;;;OAGG;IACH,OAFU,OAAO,GAAG,EAAC,KAAK,CAAC,CAEF;IAG7B;;;;;OAKG;IACH,kBAyBC;IAED;;;OAGG;IACH,QAFa,MAAM,CAIlB;IAED;;OAEG;IACH,+BAEC;IAUD;;;OAGG;IACH,2BAQC;IAED,wBAEC;IAxBD;;;OAGG;IACH,qBAEC;IAoBD;;;;OAIG;IACH,wBAaC;IAED;;;;;;OAMG;IACH,yBAHW,GAAG,GACD,OAAO,CAgCnB;IAED;;;;;OAKG;IACH,6BAUC;IAED;;;OAGG;IACH,sBAFa,aAAa,GAAG,EAAC,KAAK,CAAC,GAAC,IAAI,CAIxC;IAED;;;OAGG;IACH,YAFa,OAAO,CAkBnB;IAED;;;OAGG;IACH,+BAFW,MAAM,QAWhB;IAED;;;;OAIG;IACH,SAHW,GAAG,SACH,KAAK,QAwEf;IAED;;;;OAIG;IACH,cAHW,GAAG,GACD,OAAO,CAInB;IAED;;;;OAIG;IACH,SAHW,GAAG,GACD,KAAK,GAAC,IAAI,CAYtB;IAGD;;;;;;OAMG;IACH,kBALW,GAAG,kBACM,GAAG,KAAE,KAAK,0BAElB,KAAK,CAchB;IAED;;;;OAIG;IACH,wBAqBC;IAED;;;;OAIG;IACH,YAHW,GAAG,GACD,OAAO,CAgBnB;IAED;;;;;OAKG;IACH,kBAHW,GAAG,GACD,OAAO,CAanB;IAED;;OAEG;IACH,cAcC;IAED;;;OAGG;IACH,aAOC;IAED;;;;;OAKG;IACH,wCAFa,OAAO,CAMnB;IAGL;;;OAGG;IACH,6CAAmB;IAEnB;;;OAGG;IACH,+BA5FiB,OAAO,CA4FF;IAEtB;;;OAGG;IACH,4BA9KiB,OAAO,CA8KL;;CAlBlB;mBA/hBkB,4BAA4B;6BAIlB,mBAAmB"}

package/src/core/cache/Cache.js

@@ -317,6 +317,22 @@ export 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;
@@ -334,25 +350,8 @@ export 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);
 
@@ -367,9 +366,14 @@ export class Cache {
                 // same value, no action required
             } 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;
             }
 

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;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"}
+{"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;IAuJD;;;;OAIG;IACH,SAHW,CAAC,SACD,CAAC,QA0EX;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,gBAsDC;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

@@ -271,6 +271,8 @@ export 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);
@@ -282,7 +284,7 @@ export 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
@@ -357,6 +359,9 @@ export class HashMap {
 
         if (this.#entries[i] !== undefined) {
             const entry = this.#entries[i];
+
+            assert.equal(entry.hash, RESERVED_HASH, 'Entry is occupied');
+
             entry.hash = hash;
             entry.key = k;
             entry.value = v;
@@ -441,7 +446,11 @@ export class HashMap {
                 assert.equal(this.#entries[entry_index].value, value, 'entry.value');
                 assert.equal(this.#entries[entry_index].key, key, 'entry.key');
 
-                this.#bins[bin_index] = entry_index + ENTRY_BASE;
+                const bin_value = entry_index + ENTRY_BASE;
+
+                this.#bins[bin_index] = bin_value;
+
+                assert.equal(bin_value, this.#bins[bin_index], 'Bin value write error');
 
                 break;
 
@@ -675,7 +684,11 @@ export 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;