archetype-ecs-lib 0.6.0 → 0.6.1

package/README.md

@@ -55,7 +55,7 @@ world.addSystem((w) => {
 world.update(1 / 60);
 ```
 
-> Note: `SystemFn` is typed as `(world: WorldApi, dt) => void`..
+> Note: `SystemFn` is typed as `(world: WorldApi, dt) => void`.
 
 ---
 

package/lib/ecs/Schedule.js

@@ -183,61 +183,65 @@ var Schedule = /** @class */ (function () {
         }
         var frameStart = worldInstance._profBeginFrame(dt);
         try {
-            for (var phases_1 = __values(phases), phases_1_1 = phases_1.next(); !phases_1_1.done; phases_1_1 = phases_1.next()) {
-                var phase = phases_1_1.value;
-                var phaseStart = performance.now();
-                var list = world._scheduleSystems.get(phase);
-                // Run systems only if they exist for this phase
-                if (list) {
-                    try {
-                        for (var list_1 = (e_2 = void 0, __values(list)), list_1_1 = list_1.next(); !list_1_1.done; list_1_1 = list_1.next()) {
-                            var fn = list_1_1.value;
-                            var sysStart = performance.now();
-                            try {
-                                fn(world, dt);
-                            }
-                            catch (error) {
-                                var sysName = fn.name && fn.name.length > 0 ? fn.name : "<anonymous>";
-                                var msg = error.message !== undefined && typeof error.message === 'string' ?
-                                    error.message : JSON.stringify(error);
-                                var e = new Error("[phase=".concat(phase, " system=").concat(sysName, "] ").concat(msg));
-                                e.cause = error;
-                                throw e;
+            try {
+                for (var phases_1 = __values(phases), phases_1_1 = phases_1.next(); !phases_1_1.done; phases_1_1 = phases_1.next()) {
+                    var phase = phases_1_1.value;
+                    var phaseStart = performance.now();
+                    var list = world._scheduleSystems.get(phase);
+                    // Run systems only if they exist for this phase
+                    if (list) {
+                        try {
+                            for (var list_1 = (e_2 = void 0, __values(list)), list_1_1 = list_1.next(); !list_1_1.done; list_1_1 = list_1.next()) {
+                                var fn = list_1_1.value;
+                                var sysStart = performance.now();
+                                try {
+                                    fn(world, dt);
+                                }
+                                catch (error) {
+                                    var sysName = fn.name && fn.name.length > 0 ? fn.name : "<anonymous>";
+                                    var msg = error.message !== undefined && typeof error.message === 'string' ?
+                                        error.message : JSON.stringify(error);
+                                    var e = new Error("[phase=".concat(phase, " system=").concat(sysName, "] ").concat(msg));
+                                    e.cause = error;
+                                    throw e;
+                                }
+                                finally {
+                                    var sysName = fn.name && fn.name.length > 0 ? fn.name : "<anonymous>";
+                                    worldInstance._profAddSystem("".concat(phase, ":").concat(sysName), performance.now() - sysStart);
+                                }
                             }
-                            finally {
-                                var sysName = fn.name && fn.name.length > 0 ? fn.name : "<anonymous>";
-                                worldInstance._profAddSystem("".concat(phase, ":").concat(sysName), performance.now() - sysStart);
+                        }
+                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                        finally {
+                            try {
+                                if (list_1_1 && !list_1_1.done && (_b = list_1.return)) _b.call(list_1);
                             }
+                            finally { if (e_2) throw e_2.error; }
                         }
                     }
-                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                    finally {
-                        try {
-                            if (list_1_1 && !list_1_1.done && (_b = list_1.return)) _b.call(list_1);
+                    if (this.boundaryMode !== "manual") {
+                        // apply deferred commands between phases
+                        if (world.cmd().hasPending()) {
+                            world.flush();
                         }
-                        finally { if (e_2) throw e_2.error; }
+                        // deliver events emitted in this phase to the next phase
+                        world.swapEvents();
                     }
+                    worldInstance._profAddPhase(phase, performance.now() - phaseStart);
                 }
-                if (this.boundaryMode !== "manual") {
-                    // apply deferred commands between phases
-                    if (world.cmd().hasPending()) {
-                        world.flush();
-                    }
-                    // deliver events emitted in this phase to the next phase
-                    world.swapEvents();
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (phases_1_1 && !phases_1_1.done && (_a = phases_1.return)) _a.call(phases_1);
                 }
-                worldInstance._profAddPhase(phase, performance.now() - phaseStart);
+                finally { if (e_1) throw e_1.error; }
             }
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
-            try {
-                if (phases_1_1 && !phases_1_1.done && (_a = phases_1.return)) _a.call(phases_1);
-            }
-            finally { if (e_1) throw e_1.error; }
+            worldInstance._profEndFrame(frameStart);
+            worldInstance.updateOverlay(worldInstance.stats(), worldInstance.statsHistory());
         }
-        worldInstance._profEndFrame(frameStart);
-        worldInstance.updateOverlay(worldInstance.stats(), worldInstance.statsHistory());
     };
     /**
      * Record a phase ordering constraint `before -> after`.

package/lib/ecs/World.js

@@ -271,6 +271,7 @@ var World = /** @class */ (function (_super) {
         }
         var frameStart = this._profBeginFrame(dt);
         this._iterateDepth++;
+        var caughtError;
         try {
             try {
                 for (var _b = __values(this.systems), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -294,13 +295,25 @@ var World = /** @class */ (function (_super) {
                 finally { if (e_7) throw e_7.error; }
             }
         }
+        catch (e) {
+            caughtError = e;
+        }
         finally {
             this._iterateDepth--;
-            this.flush();
+            try {
+                this.flush();
+            }
+            catch (e) {
+                // System error takes priority; flush error only surfaced when no system threw.
+                if (caughtError === undefined)
+                    caughtError = e;
+            }
             this.swapEvents();
             this._profAddPhase("update", this._profilingEnabled ? (performance.now() - frameStart) : 0);
             this._profEndFrame(frameStart);
         }
+        if (caughtError !== undefined)
+            throw caughtError;
         this.updateOverlay(this.stats(), this.statsHistory());
     };
     World.prototype.flush = function () {
@@ -668,11 +681,12 @@ var World = /** @class */ (function (_super) {
         });
     };
     World.prototype.query = function () {
+        var _a;
         var ctors = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             ctors[_i] = arguments[_i];
         }
-        var _a = World._buildQueryTypeIds(ctors), requested = _a.requested, needSorted = _a.needSorted;
+        var _b = World._buildQueryTypeIds(ctors), requested = _b.requested, needSorted = _b.needSorted;
         function gen(world) {
             var _a, _b, a, cols, i, row, e, out, i, e_16_1;
             var e_16, _c;
@@ -735,14 +749,17 @@ var World = /** @class */ (function (_super) {
                 }
             });
         }
-        return gen(this);
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        var self = this;
+        return _a = {}, _a[Symbol.iterator] = function () { return gen(self); }, _a;
     };
     World.prototype.queryTables = function () {
+        var _a;
         var ctors = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             ctors[_i] = arguments[_i];
         }
-        var _a = World._buildQueryTypeIds(ctors), requested = _a.requested, needSorted = _a.needSorted;
+        var _b = World._buildQueryTypeIds(ctors), requested = _b.requested, needSorted = _b.needSorted;
         function gen(world) {
             var _a, _b, a, out, i, e_17_1;
             var e_17, _c;
@@ -795,7 +812,9 @@ var World = /** @class */ (function (_super) {
                 }
             });
         }
-        return gen(this);
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        var self = this;
+        return _a = {}, _a[Symbol.iterator] = function () { return gen(self); }, _a;
     };
     World.prototype.queryEach = function () {
         var e_18, _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "archetype-ecs-lib",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "An Archetype Entity Component System (AECS)",
   "main": "./lib/index.js",
   "scripts": {