@woosh/meep-engine 2.92.3 → 2.92.5

package/build/meep.module.js

@@ -85076,7 +85076,7 @@ class AssetManager {
      * @template T
      * @param {String} path
      * @param {String} type
-     * @param {function(asset:Asset<T>)} callback
+     * @param {function(asset:Asset<T>)} [callback]
      * @param {function(*)} [failure]
      * @param {function(loaded:number, total:number)} [progress]
      * @param {boolean} [skip_queue]
@@ -85085,7 +85085,7 @@ class AssetManager {
     get({
             path,
             type,
-            callback,
+            callback = noop,
             failure = console.error,
             progress = noop,
             skip_queue = false,
@@ -101296,6 +101296,11 @@ function easeInOutQuad(t) {
  * @returns {boolean}
  */
 function objectDeepEquals(a, b) {
+    if (a === b) {
+        // identity shortcut
+        return true;
+    }
+
     const tA = typeof a;
     const tB = typeof b;
 
@@ -101303,7 +101308,16 @@ function objectDeepEquals(a, b) {
         return false;
     }
 
-    if (tA === "object") {
+    if (tA !== "object") {
+        // primitive types, identity equality already checked
+        return false;
+    } else {
+
+        if (a === null || b === null) {
+            // we know that A and B are not the same, so if one of them is a null - there is no possible equality
+            return false;
+        }
+
         if (Array.isArray(a)) {
             // special fast path for arrays
             if (!Array.isArray(b)) {
@@ -101333,8 +101347,6 @@ function objectDeepEquals(a, b) {
 
         return true;
 
-    } else {
-        return a === b;
     }
 }
 

package/package.json

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

package/src/core/model/object/objectDeepEquals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"objectDeepEquals.d.ts","sourceRoot":"","sources":["../../../../../src/core/model/object/objectDeepEquals.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,oDAFa,OAAO,CA2CnB"}
+{"version":3,"file":"objectDeepEquals.d.ts","sourceRoot":"","sources":["../../../../../src/core/model/object/objectDeepEquals.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,oDAFa,OAAO,CAuDnB"}

package/src/core/model/object/objectDeepEquals.js

@@ -1,5 +1,5 @@
-import { isArraysEqualWithComparator } from "../../collection/array/isArraysEqualWithComparator.js";
 import { isArrayEqualStrict } from "../../collection/array/isArrayEqualStrict.js";
+import { isArraysEqualWithComparator } from "../../collection/array/isArraysEqualWithComparator.js";
 
 /**
  * @template A,B
@@ -8,6 +8,11 @@ import { isArrayEqualStrict } from "../../collection/array/isArrayEqualStrict.js
  * @returns {boolean}
  */
 export function objectDeepEquals(a, b) {
+    if (a === b) {
+        // identity shortcut
+        return true;
+    }
+
     const tA = typeof a;
     const tB = typeof b;
 
@@ -15,7 +20,16 @@ export function objectDeepEquals(a, b) {
         return false;
     }
 
-    if (tA === "object") {
+    if (tA !== "object") {
+        // primitive types, identity equality already checked
+        return false;
+    } else {
+
+        if (a === null || b === null) {
+            // we know that A and B are not the same, so if one of them is a null - there is no possible equality
+            return false;
+        }
+
         if (Array.isArray(a)) {
             // special fast path for arrays
             if (!Array.isArray(b)) {
@@ -45,7 +59,5 @@ export function objectDeepEquals(a, b) {
 
         return true;
 
-    } else {
-        return a === b;
     }
 }

package/src/core/model/object/objectDeepEquals.spec.js

@@ -12,3 +12,43 @@ test('objectDeepEquals', () => {
 
     expect(objectDeepEquals({ a: 1 }, { a: 1, b: "cat" })).toBe(false);
 });
+
+test("null values", () => {
+    expect(objectDeepEquals(null, null)).toBe(true);
+    expect(objectDeepEquals(null, {})).toBe(false);
+    expect(objectDeepEquals({}, null)).toBe(false);
+});
+
+test("same-type primitives", () => {
+    expect(objectDeepEquals(1, 1)).toBe(true);
+    expect(objectDeepEquals(-1, 1)).toBe(false);
+    expect(objectDeepEquals(-1, -1)).toBe(true);
+    expect(objectDeepEquals(-1, -3)).toBe(false);
+
+    expect(objectDeepEquals("cat", "cat")).toBe(true);
+    expect(objectDeepEquals("cat", "")).toBe(false);
+    expect(objectDeepEquals("", "cat")).toBe(false);
+    expect(objectDeepEquals("sat", "cat")).toBe(false);
+    expect(objectDeepEquals("cat", "sat")).toBe(false);
+
+    expect(objectDeepEquals(true, false)).toBe(false);
+    expect(objectDeepEquals(false, true)).toBe(false);
+    expect(objectDeepEquals(true, true)).toBe(true);
+    expect(objectDeepEquals(false, false)).toBe(true);
+
+    expect(objectDeepEquals(undefined, undefined)).toBe(true);
+});
+
+test("mixed primitives", () => {
+    expect(objectDeepEquals(1, undefined)).toBe(false);
+    expect(objectDeepEquals(undefined, 1)).toBe(false);
+
+    expect(objectDeepEquals("cat", 1)).toBe(false);
+    expect(objectDeepEquals(1, "cat")).toBe(false);
+
+    expect(objectDeepEquals(1, true)).toBe(false);
+    expect(objectDeepEquals(true, 1)).toBe(false);
+
+    expect(objectDeepEquals("cat", undefined)).toBe(false);
+    expect(objectDeepEquals(undefined, "cat")).toBe(false);
+});

package/src/engine/asset/AssetManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AssetManager.d.ts","sourceRoot":"","sources":["../../../../src/engine/asset/AssetManager.js"],"names":[],"mappings":"AAiDA;;;;GAIG;AACH;IAgII;;;;;OAKG;IACH,oCAJW,GAAG,EAYb;IA7ID;;;;OAIG;IACH,eAEG;IAEH;;;OAGG;IACH,iBAA6C;IAe7C;;;;;;OAMG;IACH,kBAFU,MAAM,CAEY;IAyB5B;;;;OAIG;IACH,iBAAc;IAEd;;;OAGG;IACH,mBAFU,iBAAiB,CAEiB;IAwE5C,gBAQC;IAED;;;;OAIG;IACH,qBAHW,MAAM,GACL,QAAQ,IAAI,CAAC,CAexB;IAED;;;;;OAKG;IACH,oCAFa,OAAO,CAOnB;IAED;;OAEG;IACH,cAEC;IAED,8BAEC;IAED;;;;;;OAMG;IACH,4DAJW,iBAAiB,GAEf,cAAc,CAY1B;IAED;;;;;;;;;OASG;IACH,qFAkCC;IAED;;;;;OAKG;IACH,aAJW,MAAM,QACN,MAAM,sBAehB;IAsQD;;;;;OAKG;IACH,sBA2BC;IAGD;;;;OAIG;IACH,uBAHW,MAAM,GACL,OAAO,CAIlB;IAED;;;;OAIG;IACH,sBAHW,MAAM,GACJ,wBAAY,SAAS,CAMjC;IAaD;;;;OAIG;IACH,+BAHW,MAAM,4CAqBhB;IAED;;;;OAIG;IACH,iCAHW,MAAM,+CAyBhB;IAED;;;;;OAKG;IACH,0BAJW,MAAM,iEAwChB;IAED;;;OAGG;IACH,uBAFW,MAAM,iBAkBhB;IAED;;;;;;OAMG;IACH,yCAFa,aAAS,IAAI,CAYzB;IAED;;;;;OAKG;IACH,eAJW,MAAM,QACN,MAAM,GACJ,OAAO,CAMnB;IAED;;;;OAIG;IACH,2BAHW,MAAM,GACL,mBAAiB,CAa5B;IAED;;;;OAIG;IACH,oBAHW,MAAM,GACL,gBAAgB,GAAC,SAAS,CAQrC;IAED;;;;;OAKG;IACH,mBAJW,MAAM,QACN,MAAM,QACN,MAAM,QAUhB;IAGL;;;OAGG;IACH,yBAFU,OAAO,CAEoB;;CANpC;kCAx0BiC,6BAA6B;kCAD7B,wBAAwB;4BAE9B,0BAA0B;iCALrB,uBAAuB"}
+{"version":3,"file":"AssetManager.d.ts","sourceRoot":"","sources":["../../../../src/engine/asset/AssetManager.js"],"names":[],"mappings":"AAiDA;;;;GAIG;AACH;IAgII;;;;;OAKG;IACH,oCAJW,GAAG,EAYb;IA7ID;;;;OAIG;IACH,eAEG;IAEH;;;OAGG;IACH,iBAA6C;IAe7C;;;;;;OAMG;IACH,kBAFU,MAAM,CAEY;IAyB5B;;;;OAIG;IACH,iBAAc;IAEd;;;OAGG;IACH,mBAFU,iBAAiB,CAEiB;IAwE5C,gBAQC;IAED;;;;OAIG;IACH,qBAHW,MAAM,GACL,QAAQ,IAAI,CAAC,CAexB;IAED;;;;;OAKG;IACH,oCAFa,OAAO,CAOnB;IAED;;OAEG;IACH,cAEC;IAED,8BAEC;IAED;;;;;;OAMG;IACH,4DAJW,iBAAiB,GAEf,cAAc,CAY1B;IAED;;;;;;;;;OASG;IACH,qFAsCC;IAED;;;;;OAKG;IACH,aAJW,MAAM,QACN,MAAM,sBAehB;IAsQD;;;;;OAKG;IACH,sBA2BC;IAGD;;;;OAIG;IACH,uBAHW,MAAM,GACL,OAAO,CAIlB;IAED;;;;OAIG;IACH,sBAHW,MAAM,GACJ,wBAAY,SAAS,CAMjC;IAaD;;;;OAIG;IACH,+BAHW,MAAM,4CAqBhB;IAED;;;;OAIG;IACH,iCAHW,MAAM,+CAyBhB;IAED;;;;;OAKG;IACH,0BAJW,MAAM,iEAwChB;IAED;;;OAGG;IACH,uBAFW,MAAM,iBAkBhB;IAED;;;;;;OAMG;IACH,yCAFa,aAAS,IAAI,CAYzB;IAED;;;;;OAKG;IACH,eAJW,MAAM,QACN,MAAM,GACJ,OAAO,CAMnB;IAED;;;;OAIG;IACH,2BAHW,MAAM,GACL,mBAAiB,CAa5B;IAED;;;;OAIG;IACH,oBAHW,MAAM,GACL,gBAAgB,GAAC,SAAS,CAQrC;IAED;;;;;OAKG;IACH,mBAJW,MAAM,QACN,MAAM,QACN,MAAM,QAUhB;IAGL;;;OAGG;IACH,yBAFU,OAAO,CAEoB;;CANpC;kCA50BiC,6BAA6B;kCAD7B,wBAAwB;4BAE9B,0BAA0B;iCALrB,uBAAuB"}

package/src/engine/asset/AssetManager.js

@@ -273,7 +273,7 @@ export class AssetManager {
      * @template T
      * @param {String} path
      * @param {String} type
-     * @param {function(asset:Asset<T>)} callback
+     * @param {function(asset:Asset<T>)} [callback]
      * @param {function(*)} [failure]
      * @param {function(loaded:number, total:number)} [progress]
      * @param {boolean} [skip_queue]
@@ -282,7 +282,7 @@ export class AssetManager {
     get({
             path,
             type,
-            callback,
+            callback = noop,
             failure = console.error,
             progress = noop,
             skip_queue = false,
@@ -297,6 +297,10 @@ export class AssetManager {
             throw new TypeError(`type must be a string, instead was '${typeof type}'`);
         }
 
+        assert.isFunction(callback, 'success');
+        assert.isFunction(failure, 'failure');
+        assert.isFunction(progress, 'progress');
+
         const assetDescription = new AssetDescription(path, type);
 
         const asset = this.assets.get(assetDescription);