@daneren2005/shared-memory-ecs 1.10.4 → 1.10.5

package/dist/index.js

@@ -1,17 +1,17 @@
-import { _ as e, a as t, c as n, d as r, f as i, g as a, h as o, i as s, l as c, m as l, n as u, o as d, p as f, r as p, s as ee, t as te, u as ne, v as m, y as h } from "./create-system-worker-BU5CnyVh.js";
-import re from "@daneren2005/shared-memory-objects/memory-heap";
-import { MAX_BYTE_OFFSET_LENGTH as ie } from "@daneren2005/shared-memory-objects/utils/pointer";
-//#region \0rolldown/runtime.js
-var ae = Object.create, g = Object.defineProperty, _ = Object.getOwnPropertyDescriptor, oe = Object.getOwnPropertyNames, v = Object.getPrototypeOf, y = Object.prototype.hasOwnProperty, b = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t.exports), se = (e, t, n, r) => {
-	if (t && typeof t == "object" || typeof t == "function") for (var i = oe(t), a = 0, o = i.length, s; a < o; a++) s = i[a], !y.call(e, s) && s !== n && g(e, s, {
+import { _ as e, a as t, b as n, c as r, d as i, f as a, g as o, h as s, i as c, l, m as u, n as d, o as f, p, r as ee, s as te, t as ne, u as re, v as ie, x as m, y as h } from "./create-system-worker-CkPwxmmr.js";
+import ae from "@daneren2005/shared-memory-objects/memory-heap";
+import { MAX_BYTE_OFFSET_LENGTH as g } from "@daneren2005/shared-memory-objects/utils/pointer";
+// \0rolldown/runtime.js
+var oe = Object.create, _ = Object.defineProperty, v = Object.getOwnPropertyDescriptor, y = Object.getOwnPropertyNames, se = Object.getPrototypeOf, ce = Object.prototype.hasOwnProperty, le = (e, t) => () => (t || (e((t = { exports: {} }).exports, t, t.exports), e = null), t.exports), ue = (e, t, n, r) => {
+	if (t && typeof t == "object" || typeof t == "function") for (var i = y(t), a = 0, o = i.length, s; a < o; a++) s = i[a], !ce.call(e, s) && s !== n && _(e, s, {
 		get: ((e) => t[e]).bind(null, s),
-		enumerable: !(r = _(t, s)) || r.enumerable
+		enumerable: !(r = v(t, s)) || r.enumerable
 	});
 	return e;
-}, x = /* @__PURE__ */ ((e, t, n) => (n = e == null ? {} : ae(v(e)), se(t || !e || !e.__esModule || !y.call(e, "default") ? g(n, "default", {
+}, b = /* @__PURE__ */ ((e, t, n) => (n = e == null ? {} : oe(se(e)), ue(_(n, "default", {
 	value: e,
 	enumerable: !0
-}) : n, e)))((/* @__PURE__ */ b(((e, t) => {
+}), e)))((/* @__PURE__ */ le(((e, t) => {
 	var n = Object.prototype.hasOwnProperty, r = "~";
 	function i() {}
 	Object.create && (i.prototype = Object.create(null), new i().__proto__ || (r = !1));
@@ -88,7 +88,7 @@ var ae = Object.create, g = Object.defineProperty, _ = Object.getOwnPropertyDesc
 		if (!this._events[a]) return this;
 		if (!t) return s(this, a), this;
 		var o = this._events[a];
-		if (o.fn) o.fn === t && (!i || o.once) && (!n || o.context === n) && s(this, a);
+		if (o.fn) o.fn !== t || i && !o.once || n && o.context !== n || s(this, a);
 		else {
 			for (var c = 0, l = [], u = o.length; c < u; c++) (o[c].fn !== t || i && !o[c].once || n && o[c].context !== n) && l.push(o[c]);
 			l.length ? this._events[a] = l.length === 1 ? l[0] : l : s(this, a);
@@ -98,7 +98,38 @@ var ae = Object.create, g = Object.defineProperty, _ = Object.getOwnPropertyDesc
 		var t;
 		return e ? (t = r ? r + e : e, this._events[t] && s(this, t)) : (this._events = new i(), this._eventsCount = 0), this;
 	}, c.prototype.off = c.prototype.removeListener, c.prototype.addListener = c.prototype.on, c.prefixed = r, c.EventEmitter = c, t !== void 0 && (t.exports = c);
-})))(), 1), S = class extends x.default {
+})))(), 1), de = [], fe = (e, t) => e.order - t.order, pe = class {
+	immediate = /* @__PURE__ */ new Map();
+	deferred = /* @__PURE__ */ new Map();
+	constructor(e) {
+		Object.keys(e).forEach((t, n) => {
+			if (t === "entity") return;
+			let r = e[t], i = r.loadInFinishLoading ? this.deferred : this.immediate, a = {
+				name: t,
+				order: n
+			};
+			for (let e of r.loadProperties) {
+				let t = i.get(e);
+				t ? t.push(a) : i.set(e, [a]);
+			}
+		});
+	}
+	forLoad(e) {
+		return this.find(this.immediate, e);
+	}
+	forFinishLoading(e) {
+		return this.find(this.deferred, e);
+	}
+	find(e, t) {
+		if (e.size === 0) return de;
+		let n = [];
+		for (let r in t) {
+			let t = e.get(r);
+			if (t) for (let e of t) n.includes(e) || n.push(e);
+		}
+		return n.sort(fe);
+	}
+}, x = class extends b.default {
 	world;
 	name;
 	currentDelta = 0;
@@ -174,13 +205,12 @@ var ae = Object.create, g = Object.defineProperty, _ = Object.getOwnPropertyDesc
 		this.removeAllListeners();
 	}
 };
-function C(e, t, n) {
+function S(e, t, n) {
 	let r = e.groups.map(t);
 	for (let t = 0; t < e.entities.length; t++) r[e.groupIndexes[t]] && n(e.entities[t]);
 }
-//#endregion
-//#region src/systems/iterable-system.ts
-var w = class extends S {
+// src/systems/iterable-system.ts
+var C = class extends x {
 	remainingInstancesToRun = [];
 	remainingInstancesStartTime = null;
 	iterationsPerCheck;
@@ -230,7 +260,7 @@ var w = class extends S {
 	}
 	beforeRunIterables() {}
 	getIterableEntityId(e) {}
-}, T = class e extends w {
+}, w = class e extends C {
 	entities = /* @__PURE__ */ new Map();
 	options;
 	constructor(e, t = { name: "EntitySystem" }) {
@@ -264,13 +294,9 @@ var w = class extends S {
 		this.checkAddEntity(e) && this.options.updateEntityOnAdd && this.updateEntity(e, 0);
 	}
 	addEntities(t) {
-		if (this.checkAddEntity !== e.prototype.checkAddEntity) {
-			t.entities.forEach((e) => this.onEntityAdded(e));
-			return;
-		}
-		C(t, (e) => this.hasComponents(e), (e) => {
+		this.checkAddEntity === e.prototype.checkAddEntity ? S(t, (e) => this.hasComponents(e), (e) => {
 			this.filterEntity(e) && (this.entities.set(e.eid, e), this.options.updateEntityOnAdd && this.updateEntity(e, 0));
-		});
+		}) : t.entities.forEach((e) => this.onEntityAdded(e));
 	}
 	hasComponents(e) {
 		return !this.options.components || this.options.components.every((t) => !!e.components[t]);
@@ -300,12 +326,12 @@ var w = class extends S {
 			...this.reads ?? []
 		] : void 0;
 	}
-}, E = class {
+}, T = class {
 	onmessage(e, t = []) {}
-}, D = class extends E {
+}, E = class extends T {
 	updateFunction;
-	entities = new e();
-	workState = new a();
+	entities = new h();
+	workState = new ie();
 	queryEntities = {};
 	worldExtension;
 	world;
@@ -321,69 +347,69 @@ var w = class extends S {
 		};
 	}
 	getString = (e) => this.world.constantStrings.getString(e) ?? "";
-	postMessage(e) {
-		if (e.type === "init") this.onMessageTyped({ type: "init-complete" });
-		else if (e.type === "load") {
-			this.entities.apply(e.entities);
-			let t = this.applyQueryDeltas(e.queries), n = {
-				gameTime: e.gameTime,
+	postMessage(t) {
+		if (t.type === "init") this.onMessageTyped({ type: "init-complete" });
+		else if (t.type === "load") {
+			this.entities.apply(t.entities);
+			let e = this.applyQueryDeltas(t.queries), n = {
+				gameTime: t.gameTime,
 				getString: this.getString,
 				heap: this.world.heap
 			};
-			this.worldExtension = this.updateFunction.init?.(n, e.data, this.entities.entries, t) ?? void 0, this.onMessageTyped({ type: "loaded" });
-		} else if (e.type === "reset") this.workState.clear(), this.entities.clear(), this.queryEntities = {};
-		else if (e.type === "run") {
-			if (e.world = this.workState.getWorld(e.world, e.workBatch), this.worldExtension && Object.assign(e.world, this.worldExtension), e.world.getString = this.getString, e.world.heap = this.world.heap, e.world.allocate = this.allocator, this.createsEntities) {
-				let t = this.world.registry;
-				e.world.buildEntityDescriptor = (e) => o(e, this.world.factory.configs, t, this.allocator, this.world.factory.getWorkerClasses());
+			this.worldExtension = this.updateFunction.init?.(n, t.data, this.entities.entries, e) ?? void 0, this.onMessageTyped({ type: "loaded" });
+		} else if (t.type === "reset") this.workState.clear(), this.entities.clear(), this.queryEntities = {};
+		else if (t.type === "run") {
+			if (t.world = this.workState.getWorld(t.world, t.workBatch), this.worldExtension && Object.assign(t.world, this.worldExtension), t.world.getString = this.getString, t.world.heap = this.world.heap, t.world.allocate = this.allocator, this.createsEntities) {
+				let n = this.world.registry;
+				t.world.buildEntityDescriptor = (t) => e(t, this.world.factory.configs, n, this.allocator, this.world.factory.getWorkerClasses());
 			}
 			if (this.addsComponents) {
-				let t = this.world.registry;
-				e.world.buildComponentDescriptor = (e, n) => l(e, n, t, this.allocator);
+				let e = this.world.registry;
+				t.world.buildComponentDescriptor = (t, n) => o(t, n, e, this.allocator);
 			}
-			let t = performance.now(), n = [], r = {}, i = [], a = [], s = [];
-			this.entities.apply(e.entities);
-			let c = this.workState.getEntities(this.entities.entries, e.entities, e.workBatch), u = this.applyQueryDeltas(e.queries), d = {
-				entityComponentChanged(e, t, r, i) {
-					n.push({
+			let n = performance.now(), r = [], i = {}, a = [], s = [], c = [];
+			this.entities.apply(t.entities);
+			let l = this.workState.getEntities(this.entities.entries, t.entities, t.workBatch), u = this.applyQueryDeltas(t.queries), d = {
+				entityComponentChanged(e, t, n, i) {
+					r.push({
 						entityId: e,
 						event: "component-property-updated",
 						args: [
 							t,
-							r,
+							n,
 							i
 						]
 					});
 				},
-				emitEntityEvent(e, t, ...r) {
-					n.push({
+				emitEntityEvent(e, t, ...n) {
+					r.push({
 						entityId: e,
 						event: t,
-						args: r
+						args: n
 					});
 				},
 				emitSystemEvent(e, t) {
-					(r[e] ?? (r[e] = [])).push(t);
+					(i[e] ?? (i[e] = [])).push(t);
 				},
 				entityDied(e) {
-					n.push({
+					r.push({
 						entityId: e,
 						event: "death",
 						args: []
 					});
 				},
 				createEntity(e) {
-					i.push(e);
+					a.push(e);
 				},
 				addComponent(e, t) {
-					a.push({
+					s.push({
 						type: "add",
 						entityId: e,
 						component: t
 					});
 				},
 				removeComponent(e, t) {
-					a.push({
+					s.push({
 						type: "remove",
 						entityId: e,
 						componentName: String(t)
@@ -391,77 +417,77 @@ var w = class extends S {
 				}
 			};
 			if (this.updateFunction.queryChanged) {
-				for (let [t, n] of Object.entries(e.queries)) if (n.added.length || n.removed.length) try {
-					this.updateFunction.queryChanged(e.world, t, n, d);
+				for (let [e, n] of Object.entries(t.queries)) if (n.added.length || n.removed.length) try {
+					this.updateFunction.queryChanged(t.world, e, n, d);
 				} catch (e) {
-					s.push({
+					c.push({
 						error: e,
 						phase: "queryChanged"
 					});
 				}
 			}
 			let f = !1;
-			if (this.updateFunction.preRun && (!e.workBatch || e.workBatch.first)) try {
-				this.updateFunction.preRun(e.world, this.entities.entries, u, d);
+			if (this.updateFunction.preRun && (!t.workBatch || t.workBatch.first)) try {
+				this.updateFunction.preRun(t.world, this.entities.entries, u, d);
 			} catch (e) {
-				f = !0, s.push({
+				f = !0, c.push({
 					error: e,
 					phase: "preRun"
 				});
 			}
 			if (!f && this.updateFunction.preBatch) try {
-				this.updateFunction.preBatch(e.world, c, u, d);
+				this.updateFunction.preBatch(t.world, l, u, d);
 			} catch (e) {
-				f = !0, s.push({
+				f = !0, c.push({
 					error: e,
 					phase: "preBatch"
 				});
 			}
-			if (f || c.forEach((t) => {
+			if (f || l.forEach((e) => {
 				try {
-					this.updateFunction(e.world, t.entityId, t.components, u, d);
-				} catch (e) {
-					s.push({
-						error: e,
+					this.updateFunction(t.world, e.entityId, e.components, u, d);
+				} catch (t) {
+					c.push({
+						error: t,
 						phase: "update",
-						entityId: t.entityId
+						entityId: e.entityId
 					});
 				}
-			}), this.updateFunction.entityRemoved) for (let t of e.entities.removed) try {
-				this.updateFunction.entityRemoved(e.world, t, d);
-			} catch (e) {
-				s.push({
-					error: e,
+			}), this.updateFunction.entityRemoved) for (let e of t.entities.removed) try {
+				this.updateFunction.entityRemoved(t.world, e, d);
+			} catch (t) {
+				c.push({
+					error: t,
 					phase: "entityRemoved",
-					entityId: t
+					entityId: e
 				});
 			}
-			let p = performance.now() - t;
-			this.workState.finish(e.workBatch, f), this.onMessageTyped({
+			let p = performance.now() - n;
+			this.workState.finish(t.workBatch, f), this.onMessageTyped({
 				type: "run-complete",
-				generation: e.generation,
+				generation: t.generation,
 				runTime: p,
-				events: n,
-				systemEvents: r,
-				created: i,
-				componentChanges: a,
-				errors: s,
+				events: r,
+				systemEvents: i,
+				created: a,
+				componentChanges: s,
+				errors: c,
 				workFailed: f
 			});
 		}
 	}
-	applyQueryDeltas(t) {
-		let n = {};
-		for (let [r, i] of Object.entries(t)) {
-			let t = this.queryEntities[r] ??= new e();
-			t.apply(i), n[r] = t.entries;
+	applyQueryDeltas(e) {
+		let t = {};
+		for (let [n, r] of Object.entries(e)) {
+			let e = this.queryEntities[n] ??= new h();
+			e.apply(r), t[n] = e.entries;
 		}
-		return n;
+		return t;
 	}
 	onMessageTyped(e) {
 		this.onmessage({ data: e });
 	}
-}, O = "___main", k = class e extends S {
+}, D = "___main", O = class e extends x {
 	entities = /* @__PURE__ */ new Map();
 	options;
 	worker;
@@ -479,6 +505,7 @@ var w = class extends S {
 	generation = 0;
 	queryEntities = {};
 	queryDeltas = {};
+	bulkMembershipPending = !1;
 	constructor(e, t) {
 		if (super(e, t), t.workBatchSize !== void 0 && (!Number.isSafeInteger(t.workBatchSize) || t.workBatchSize <= 0)) throw Error("workBatchSize must be a positive safe integer");
 		this.options = t, Object.keys(this.options.queries ?? {}).forEach((e) => {
@@ -494,13 +521,13 @@ var w = class extends S {
 				type: "grow-buffer",
 				buffer: e
 			});
-		})) : (this.worker = new D(t.updateFunction, e, !!t.createsEntities, !!t.addsComponents), this.isWorkerThread = !1), this.initWorker();
+		})) : (this.worker = new E(t.updateFunction, e, !!t.createsEntities, !!t.addsComponents), this.isWorkerThread = !1), this.initWorker();
 	}
 	initWorker() {
 		let e = (e) => {
 			console.error(e, e.cause), this.initialized || (this.initError = e, this.initPromise?.reject(e));
 		};
-		if (!(this.worker instanceof D)) {
+		if (!(this.worker instanceof E)) {
 			let t = (t) => {
 				e(Error(`Worker ${this.name} failed to load`, { cause: t }));
 			};
@@ -531,17 +558,16 @@ var w = class extends S {
 				}, a = {
 					apply: () => {
 						if (!r) {
-							if (t !== this.generation) {
-								a.discard();
-								return;
-							}
-							r = !0, this.pendingEffects = void 0;
-							try {
-								this.applyWorkerEffects(n, !1, e);
-							} catch (e) {
-								this.onError(e, { phase: "run" }), this.world.notifySystemRunCompleted(this);
-							} finally {
-								i();
+							if (t !== this.generation) a.discard();
+							else {
+								r = !0, this.pendingEffects = void 0;
+								try {
+									this.applyWorkerEffects(n, !1, e);
+								} catch (e) {
+									this.onError(e, { phase: "run" }), this.world.notifySystemRunCompleted(this);
+								} finally {
+									i();
+								}
 							}
 						}
 					},
@@ -574,11 +600,7 @@ var w = class extends S {
 		for (let t of Object.keys(e.systemEvents)) this.emit(t, e.systemEvents[t]);
 		e.events.forEach((e) => {
 			let t = this.world.getEntityByEid(e.entityId);
-			if (!t) {
-				console.warn(`${this.name}-event ${e.event}: Could not find entity with id ${e.entityId}`);
-				return;
-			}
-			t.emit(e.event, ...e.args);
+			t ? t.emit(e.event, ...e.args) : console.warn(`${this.name}-event ${e.event}: Could not find entity with id ${e.entityId}`);
 		}), e.created.forEach((e) => {
 			this.world.adoptEntity(e);
 		}), this.world.emit(`system-${this.name}-worker-events-finished`, e.runTime, n), this.world.notifySystemRunCompleted(this), this.runCompletePromise &&= (this.runCompletePromise.resolve(), null);
@@ -597,23 +619,25 @@ var w = class extends S {
 			promise: e,
 			resolve: t
 		};
-		let n = {};
+		let n = [], r = {};
 		Object.entries(this.options.queries ?? {}).forEach(([e, t]) => {
-			n[e] = this.buildQueryDelta(e, t);
+			r[e] = this.buildLoadDelta(e, t, this.queryEntities[e], n);
 		});
-		let r = {
+		let i = this.buildLoadDelta(D, this.options, this.entities, n);
+		this.bulkMembershipPending = !1;
+		let a = {
 			type: "load",
 			data: this.options.getInitData?.(),
 			gameTime: this.gameTime,
-			entities: this.buildQueryDelta(O, this.options),
-			queries: n,
+			entities: i,
+			queries: r,
 			heap: this.isWorkerThread ? this.world.heap.getSharedMemory() : void 0,
 			sharedMemory: this.isWorkerThread ? this.world.getSharedComponentMemory() : void 0,
 			factoryConfigs: this.isWorkerThread && this.options.createsEntities ? this.world.factory.configs : void 0,
 			factoryClasses: this.isWorkerThread && this.options.createsEntities ? this.world.factory.getWorkerClasses() : void 0,
 			addsComponents: !!this.options.addsComponents
 		};
-		return this.worker.postMessage(r), e;
+		return this.worker instanceof E ? this.worker.postMessage(a) : this.worker.postMessage(a, n), e;
 	}
 	clear() {
 		if (super.clear(), this.pendingEffects?.discard(), this.isRunning && !this.runCompletePromise) {
@@ -623,7 +647,7 @@ var w = class extends S {
 				resolve: t
 			};
 		}
-		this.isRunning = !1, this.generation++, this.entities.clear(), Object.values(this.queryEntities).forEach((e) => e.clear()), this.queryDeltas = {}, this.workPass = void 0, this.timingBatch = void 0, this.worker.postMessage({ type: "reset" });
+		this.isRunning = !1, this.generation++, this.entities.clear(), Object.values(this.queryEntities).forEach((e) => e.clear()), this.queryDeltas = {}, this.bulkMembershipPending = !1, this.workPass = void 0, this.timingBatch = void 0, this.worker.postMessage({ type: "reset" });
 	}
 	update(e) {
 		return this.isRunning ? (this.currentDelta += e, !1) : this.workPass ? (this.currentDelta += e, this.run(this.workPass.elapsedTime), !0) : super.update(e);
@@ -705,7 +729,7 @@ var w = class extends S {
 			first: t.first,
 			last: t.last
 		}, this.isRunning = !0, this.completeEffects = this.world.scheduler.prepareEffects?.(this.world, this);
-		let i = this.buildQueryDelta(O, this.options), a = {};
+		let i = this.buildQueryDelta(D, this.options), a = {};
 		Object.entries(this.options.queries ?? {}).forEach(([e, t]) => {
 			a[e] = this.buildQueryDelta(e, t);
 		});
@@ -719,21 +743,28 @@ var w = class extends S {
 		};
 		this.worker.postMessage(o);
 	}
-	buildQueryDelta(e, t) {
-		let n = this.getQueryDelta(e), r = [];
-		n.added.forEach((e) => {
-			r.push({
-				entityId: e.eid,
-				components: this.buildComponents(e, t)
-			});
+	buildQueryDelta(e, t, n) {
+		let r = this.getQueryDelta(e), i = [];
+		for (let e of (n ?? r.added).values()) i.push({
+			entityId: e.eid,
+			components: this.buildComponents(e, t)
 		});
-		let i = Array.from(n.removed);
+		let a = Array.from(r.removed);
 		return this.queryDeltas[e] = {
 			added: /* @__PURE__ */ new Set(),
 			removed: /* @__PURE__ */ new Set()
 		}, {
-			added: r,
-			removed: i
+			added: i,
+			removed: a
+		};
+	}
+	buildLoadDelta(e, t, n, r) {
+		let i = this.bulkMembershipPending ? n : this.getQueryDelta(e).added;
+		if (!this.isWorkerThread) return this.buildQueryDelta(e, t, i);
+		let a = s(i, [...t.required, ...t.optional ?? []]);
+		return r.push(...u(a)), {
+			...this.buildQueryDelta(e, t, /* @__PURE__ */ new Set()),
+			packedAdded: a
 		};
 	}
 	buildComponents(e, t) {
@@ -774,29 +805,24 @@ var w = class extends S {
 	}
 	checkAddEntity(e) {
 		let t = this.tracksMainQuery && this.matchesQuery(e, this.options);
-		return this.updateEntityList(O, this.entities, e, t), Object.entries(this.options.queries ?? {}).forEach(([t, n]) => {
+		return this.updateEntityList(D, this.entities, e, t), Object.entries(this.options.queries ?? {}).forEach(([t, n]) => {
 			let r = this.queryEntities[t] ?? (this.queryEntities[t] = /* @__PURE__ */ new Map());
 			this.updateEntityList(t, r, e, this.matchesQuery(e, n));
 		}), t;
 	}
 	addEntities(t) {
-		if (this.checkAddEntity !== e.prototype.checkAddEntity || this.matchesQuery !== e.prototype.matchesQuery) {
-			t.entities.forEach((e) => this.checkAddEntity(e));
-			return;
-		}
-		this.tracksMainQuery && this.addBatchToQuery(O, this.entities, this.options, t), Object.entries(this.options.queries ?? {}).forEach(([e, n]) => {
+		this.checkAddEntity !== e.prototype.checkAddEntity || this.matchesQuery !== e.prototype.matchesQuery ? t.entities.forEach((e) => this.checkAddEntity(e)) : (this.bulkMembershipPending = !0, this.tracksMainQuery && this.addBatchToQuery(this.entities, this.options, t), Object.entries(this.options.queries ?? {}).forEach(([e, n]) => {
 			let r = this.queryEntities[e] ?? (this.queryEntities[e] = /* @__PURE__ */ new Map());
-			this.addBatchToQuery(e, r, n, t);
-		});
+			this.addBatchToQuery(r, n, t);
+		}));
 	}
-	addBatchToQuery(e, t, n, r) {
-		let i = this.getQueryDelta(e);
-		C(r, (e) => this.matchesComponents(e, n), (e) => {
-			e.components.entity.dead || n.filter && !n.filter(e) || (t.set(e.eid, e), this.markAdded(i, e));
+	addBatchToQuery(e, t, n) {
+		S(n, (e) => this.matchesComponents(e, t), (n) => {
+			n.components.entity.dead || t.filter && !t.filter(n) || e.set(n.eid, n);
 		});
 	}
 	removeEntity(e) {
-		this.updateEntityList(O, this.entities, e, !1), Object.entries(this.queryEntities).forEach(([t, n]) => {
+		this.updateEntityList(D, this.entities, e, !1), Object.entries(this.queryEntities).forEach(([t, n]) => {
 			this.updateEntityList(t, n, e, !1);
 		});
 	}
@@ -811,7 +837,7 @@ var w = class extends S {
 	destroy() {
 		super.destroy(), this.pendingEffects?.discard(), "terminate" in this.worker && this.worker.terminate();
 	}
-}, A = class extends x.default {
+}, k = class extends b.default {
 	eid;
 	config;
 	world;
@@ -873,12 +899,7 @@ var w = class extends S {
 		}
 	}
 	load(e) {
-		let t = e, n = this.world.registry;
-		for (let r of Object.keys(n)) {
-			if (r === "entity" || !this.isComponentAllowed(r)) continue;
-			let i = n[r];
-			i.loadInFinishLoading || i.loadProperties.some((e) => e in t) && this.loadComponent(r, e, !1);
-		}
+		for (let { name: t } of this.world.componentTriggers.forLoad(e)) this.isComponentAllowed(t) && this.loadComponent(t, e, !1);
 		this.config = e;
 	}
 	save() {
@@ -891,13 +912,7 @@ var w = class extends S {
 	}
 	finishLoading() {
 		let e = this.config;
-		if (!e) return;
-		let t = e, n = this.world.registry;
-		for (let r of Object.keys(n)) {
-			if (r === "entity" || !this.isComponentAllowed(r)) continue;
-			let i = n[r];
-			i.loadInFinishLoading && i.loadProperties.some((e) => e in t) && this.loadComponent(r, e, !1);
-		}
+		if (e) for (let { name: t } of this.world.componentTriggers.forFinishLoading(e)) this.isComponentAllowed(t) && this.loadComponent(t, e, !1);
 	}
 	isComponentAllowed(e) {
 		return e === "entity" || !this.allowedComponents || this.allowedComponents.has(String(e));
@@ -912,7 +927,7 @@ var w = class extends S {
 	assertComponentPropertyMutable(e, t) {
 		if (e === "entity" && (t === "type" || t === "class")) throw Error(`Entity ${t} is immutable`);
 	}
-}, j = class e {
+}, A = class e {
 	world;
 	configs;
 	classes;
@@ -929,7 +944,7 @@ var w = class extends S {
 		this.world = e, this.forbiddenProperties.clear();
 		for (let t of Object.keys(this.classes)) {
 			let n = this.classes[t].entity;
-			if (n !== A && !(n.prototype instanceof A)) throw Error(`Entity class ${t} must extend BaseEntity`);
+			if (n !== k && !(n.prototype instanceof k)) throw Error(`Entity class ${t} must extend BaseEntity`);
 			for (let n of this.classes[t].components) if (n === "entity" || !(n in e.registry)) throw Error(`Entity class ${t} contains unknown or reserved component ${n}`);
 		}
 		for (let e of Object.keys(this.configs)) this.validateTemplate(e, this.configs[e]);
@@ -955,7 +970,7 @@ var w = class extends S {
 	createAdoptedEntity(e, t, n) {
 		if (!t) {
 			if (this.hasClasses) throw Error(`Entity type ${e} has no class`);
-			return new A(this.world, void 0, n);
+			return new k(this.world, void 0, n);
 		}
 		let r = this.classes[t];
 		if (!r) throw Error(`Unknown entity class: ${t}`);
@@ -981,7 +996,7 @@ var w = class extends S {
 		return e ? this.getAllowedComponents(e) : void 0;
 	}
 	createEntity(e) {
-		return new A(this.world, e);
+		return new k(this.world, e);
 	}
 	get hasClasses() {
 		return this.allowedComponents.size > 0;
@@ -1046,42 +1061,42 @@ var w = class extends S {
 		}
 		throw Error(`Entity type ${e} class ${t} loads a component outside its class`);
 	}
-}, M = 45, N = "!", P = "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNO", F = "PQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}", I = (/* @__PURE__ */ new Int8Array(128)).fill(-1);
-for (let e = 0; e < M; e++) I[P.charCodeAt(e)] = e, I[F.charCodeAt(e)] = e + M;
-function L(e) {
+}, j = 45, M = "!", N = "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNO", P = "PQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}", F = (/* @__PURE__ */ new Int8Array(128)).fill(-1);
+for (let e = 0; e < j; e++) F[N.charCodeAt(e)] = e, F[P.charCodeAt(e)] = e + j;
+function I(e) {
 	let t = "";
-	for (; e >= M;) t += F[e % M], e = Math.floor(e / M);
-	return t + P[e];
+	for (; e >= j;) t += P[e % j], e = Math.floor(e / j);
+	return t + N[e];
 }
-var R = /* @__PURE__ */ new Float32Array(1), z = new Uint32Array(R.buffer);
-function ce(e, t) {
+var L = /* @__PURE__ */ new Float32Array(1), R = new Uint32Array(L.buffer);
+function z(e, t) {
 	switch (e.type) {
-		case "boolean": return typeof t == "boolean" ? P[Number(t)] : void 0;
-		case "string": return t === null ? P[0] : typeof t == "string" && t.length ? L(t.length) + t : void 0;
-		case "float32": return typeof t != "number" || !Number.isFinite(t) || Math.fround(t) !== t ? void 0 : (R[0] = t, L(z[0]));
+		case "boolean": return typeof t == "boolean" ? N[Number(t)] : void 0;
+		case "string": return t === null ? N[0] : typeof t == "string" && t.length ? I(t.length) + t : void 0;
+		case "float32": return typeof t != "number" || !Number.isFinite(t) || Math.fround(t) !== t ? void 0 : (L[0] = t, I(R[0]));
 		default: {
-			let n = le(e, t);
-			return n === void 0 ? void 0 : L(n);
+			let n = B(e, t);
+			return n === void 0 ? void 0 : I(n);
 		}
 	}
 }
-function le(e, t) {
+function B(e, t) {
 	if (typeof t != "number") return;
 	let n = Math.round((t - (e.offset ?? 0)) * 10 ** (e.decimals ?? 0) / (e.step ?? 1));
-	if (!Number.isSafeInteger(n) || B(e, n) !== t) return;
+	if (!Number.isSafeInteger(n) || V(e, n) !== t) return;
 	if (e.type === "uint") return n >= 0 ? n : void 0;
 	let r = n >= 0 ? n * 2 : -n * 2 - 1;
 	return Number.isSafeInteger(r) ? r : void 0;
 }
-function B(e, t) {
+function V(e, t) {
 	return t * (e.step ?? 1) / 10 ** (e.decimals ?? 0) + (e.offset ?? 0);
 }
-function V(e, t) {
+function me(e, t) {
 	switch (e.type) {
 		case "boolean": return t !== 0;
-		case "float32": return z[0] = t, R[0];
-		case "uint": return B(e, t);
-		default: return B(e, t % 2 == 0 ? t / 2 : -(t + 1) / 2);
+		case "float32": return R[0] = t, L[0];
+		case "uint": return V(e, t);
+		default: return V(e, t % 2 == 0 ? t / 2 : -(t + 1) / 2);
 	}
 }
 function H(e) {
@@ -1101,7 +1116,7 @@ var U = class {
 			for (let r of H(n)) {
 				if (this.encoders.has(r)) throw Error(`Duplicate compressed entity definition for ${r}`);
 				this.encoders.set(r, {
-					prefix: L(t++),
+					prefix: I(t++),
 					group: e
 				});
 			}
@@ -1129,20 +1144,20 @@ var U = class {
 			if (r === "type" || i === void 0) continue;
 			let t = e.group.indices.get(r);
 			if (t === void 0) return;
-			let a = ce(e.group.definition.properties[t], i);
+			let a = z(e.group.definition.properties[t], i);
 			if (a === void 0) return;
 			n[t] = a;
 		}
 		let r = e.prefix;
-		for (let e = 0; e < n.length; e++) r += n[e] ?? N;
+		for (let e = 0; e < n.length; e++) r += n[e] ?? M;
 		return r;
 	}
 };
-function ue(e, t) {
+function he(e, t) {
 	return new U(t).compressAll(e);
 }
 var W = /* @__PURE__ */ new WeakMap();
-function de(e) {
+function ge(e) {
 	let t = W.get(e);
 	if (t) return t;
 	t = /* @__PURE__ */ new Map();
@@ -1160,19 +1175,19 @@ function de(e) {
 }
 function G(e, t) {
 	let n = 0, r = () => {
-		if (e[n] === N) {
+		if (e[n] === M) {
 			n++;
 			return;
 		}
 		let t = 0, r = 1;
 		for (; n < e.length;) {
-			let i = e.charCodeAt(n++), a = i < 128 ? I[i] : -1;
+			let i = e.charCodeAt(n++), a = i < 128 ? F[i] : -1;
 			if (a < 0) throw Error(`Invalid compressed entity ${e}`);
-			if (a < M) return t + a * r;
-			t += (a - M) * r, r *= M;
+			if (a < j) return t + a * r;
+			t += (a - j) * r, r *= j;
 		}
 		throw Error(`Truncated compressed entity ${e}`);
-	}, i = r(), a = i === void 0 ? void 0 : de(t).get(i);
+	}, i = r(), a = i === void 0 ? void 0 : ge(t).get(i);
 	if (!a) throw Error(`No compressed entity definition for ${e}`);
 	let o = { type: a.type };
 	for (let t = 0; n < e.length; t++) {
@@ -1180,7 +1195,7 @@ function G(e, t) {
 		if (!i) throw Error(`Compressed entity ${e} has more values than ${a.type} defines`);
 		let s = r();
 		if (s !== void 0) {
-			if (i.type !== "string") o[i.name] = V(i, s);
+			if (i.type !== "string") o[i.name] = me(i, s);
 			else if (s === 0) o[i.name] = null;
 			else {
 				if (n + s > e.length) throw Error(`Truncated compressed entity ${e}`);
@@ -1190,7 +1205,7 @@ function G(e, t) {
 	}
 	return o;
 }
-function fe(e, t) {
+function _e(e, t) {
 	return e.map((e) => K(e, t));
 }
 function K(e, t) {
@@ -1198,8 +1213,7 @@ function K(e, t) {
 	if (!t) throw Error("Compressed entities need entityDefinitions to load");
 	return G(e, t);
 }
-//#endregion
-//#region src/scheduling/default-scheduler.ts
+// src/scheduling/default-scheduler.ts
 var q = class {
 	update(e, t) {
 		let n = null;
@@ -1223,7 +1237,7 @@ var q = class {
 			});
 		}), { lastSystemError: n };
 	}
-}, pe = ie, J = 1e4, me = {
+}, ve = g, J = 1e4, ye = {
 	entities: {
 		start: 0,
 		weight: .6
@@ -1240,11 +1254,12 @@ var q = class {
 		start: .8,
 		weight: .2
 	}
-}, Y = 256, he = class extends x.default {
+}, Y = 256, be = class extends b.default {
 	heap;
 	constantStrings;
 	eidCounter;
 	registry;
+	componentTriggers;
 	factory;
 	entities = /* @__PURE__ */ new Map();
 	systems = [];
@@ -1270,19 +1285,19 @@ var q = class {
 	};
 	clearing = !1;
 	constructor(e, t = {}) {
-		super(), this.scheduler = t.scheduler ?? new q(), this.heap = new re({ bufferSize: t.heapSize ?? pe }), this.constantStrings = new m(this.heap), this.eidCounter = this.heap.allocUI32(1), this.heap.addOnGrowBufferHandlers((e) => this.emit("grow-buffer", e));
-		let n = {
+		super(), this.scheduler = t.scheduler ?? new q(), this.heap = new ae({ bufferSize: t.heapSize ?? ve }), this.constantStrings = new n(this.heap), this.eidCounter = this.heap.allocUI32(1), this.heap.addOnGrowBufferHandlers((e) => this.emit("grow-buffer", e));
+		let r = {
 			...e,
-			entity: i
-		}, r = {};
-		for (let e of Object.keys(n)) {
-			let t = n[e];
-			r[e] = {
+			entity: a
+		}, i = {};
+		for (let e of Object.keys(r)) {
+			let t = r[e];
+			i[e] = {
 				...t,
-				memoryComponent: new h(this.heap, t.type, t.size)
+				memoryComponent: new m(this.heap, t.type, t.size)
 			};
 		}
-		this.registry = r, this.factory = t.factory ?? new j(), this.factory.setWorld(this);
+		this.registry = i, this.componentTriggers = new pe(this.registry), this.factory = t.factory ?? new A(), this.factory.setWorld(this);
 	}
 	allocateEid() {
 		return Atomics.add(this.eidCounter.data, 0, 1) + 1;
@@ -1299,7 +1314,7 @@ var q = class {
 		this.heap.buffers[e.bufferPosition] === void 0 && this.heap.addSharedBuffer(e), this.emit("grow-buffer", e);
 	}
 	get needsSpareBuffer() {
-		return this.systems.some((e) => e instanceof k && e.isWorkerThread && (!!e.options.createsEntities || !!e.options.addsComponents));
+		return this.systems.some((e) => e instanceof O && e.isWorkerThread && (!!e.options.createsEntities || !!e.options.addsComponents));
 	}
 	async init() {
 		await Promise.all(this.systems.map((e) => e.init()).filter((e) => e instanceof Promise));
@@ -1361,7 +1376,7 @@ var q = class {
 		return this.loadSliced(n, t.sliceMs, r, i, t);
 	}
 	async loadSliced(e, t, n, r, i) {
-		let a = i.yieldTo ?? Z;
+		let a = i.yieldTo ?? xe;
 		try {
 			r.throwIfAborted();
 			let n = performance.now(), o = e.next();
@@ -1388,7 +1403,7 @@ var q = class {
 		} finally {
 			this.isBulkLoading = !1;
 		}
-		let i = _e(this.entities.values()), a = this.systems.slice(), o = a.length * 2;
+		let i = Ce(this.entities.values()), a = this.systems.slice(), o = a.length * 2;
 		for (let e = 0; e < a.length; e++) a[e].addEntities(i), yield X("systems", e + 1, o);
 		this.gameTime = e.gameTime ?? 0, this.playerTime = e.playerTime ?? 0, this.timeScale = e.timeScale ?? 1;
 		let s = [];
@@ -1404,7 +1419,7 @@ var q = class {
 		let i = Promise.all(e.map(async (n) => {
 			await n, t?.(X("workers", ++r, e.length));
 		}));
-		n ? await Promise.race([i, ge(n)]) : await i;
+		n ? await Promise.race([i, Se(n)]) : await i;
 	}
 	abortActiveLoad() {
 		this.activeLoad && (this.activeLoad.abort(), this.activeLoad = void 0, this.isBulkLoading = !1, this.isLoading = !1);
@@ -1533,12 +1548,12 @@ var q = class {
 	}
 	addEntityToEntityWorkerSystem(e, t) {
 		this.isBulkLoading || this.systems.forEach((n) => {
-			(n instanceof T && n.options.components?.includes(t) || n instanceof k && this.queriesReferenceComponent(n.options, t)) && n.checkAddEntity(e);
+			(n instanceof w && n.options.components?.includes(t) || n instanceof O && this.queriesReferenceComponent(n.options, t)) && n.checkAddEntity(e);
 		});
 	}
 	removeEntityFromEntityWorkerSystem(e, t) {
 		this.isBulkLoading || this.systems.forEach((n) => {
-			n instanceof T && n.options.components?.includes(t) ? n.removeEntity(e) : n instanceof k && this.queriesReferenceComponent(n.options, t) && n.checkAddEntity(e);
+			n instanceof w && n.options.components?.includes(t) ? n.removeEntity(e) : n instanceof O && this.queriesReferenceComponent(n.options, t) && n.checkAddEntity(e);
 		});
 	}
 	queriesReferenceComponent(e, t) {
@@ -1552,7 +1567,7 @@ var q = class {
 	}
 };
 function X(e, t, n) {
-	let { start: r, weight: i } = me[e];
+	let { start: r, weight: i } = ye[e];
 	return {
 		phase: e,
 		done: t,
@@ -1560,16 +1575,16 @@ function X(e, t, n) {
 		fraction: r + i * (n === 0 ? 1 : t / n)
 	};
 }
-function Z() {
+function xe() {
 	let e = globalThis.scheduler;
 	return e?.yield ? e.yield() : new Promise((e) => setTimeout(e, 0));
 }
-function ge(e) {
+function Se(e) {
 	return new Promise((t, n) => {
 		e.aborted ? n(e.reason) : e.addEventListener("abort", () => n(e.reason), { once: !0 });
 	});
 }
-function _e(e) {
+function Ce(e) {
 	let t = {
 		entities: [],
 		groupIndexes: [],
@@ -1581,9 +1596,8 @@ function _e(e) {
 	}
 	return t;
 }
-//#endregion
-//#region src/scheduling/conflict-scheduler.ts
-var ve = class {
+// src/scheduling/conflict-scheduler.ts
+var we = class {
 	compiled = Object.freeze({
 		order: Object.freeze([]),
 		batches: Object.freeze([])
@@ -1666,7 +1680,7 @@ var ve = class {
 		}, 0);
 	}
 	isSliced(e) {
-		return e.system instanceof w && e.system.remainingInstancesToRun.length > 0;
+		return e.system instanceof C && e.system.remainingInstancesToRun.length > 0;
 	}
 	reset() {
 		this.continuationTimer !== void 0 && (clearTimeout(this.continuationTimer), this.continuationTimer = void 0);
@@ -1679,15 +1693,7 @@ var ve = class {
 	prepareEffects(e, t) {
 		let n = this.running.get(t), r = this.generation;
 		return (e) => {
-			if (r !== this.generation || n && !this.nodes.has(n)) {
-				e.discard();
-				return;
-			}
-			if (!n) {
-				e.apply();
-				return;
-			}
-			n.effects = e, this.publications.add(n), n.publicationDependencies === 0 && this.publicationReady.push(n), this.publish();
+			r !== this.generation || n && !this.nodes.has(n) ? e.discard() : n ? (n.effects = e, this.publications.add(n), n.publicationDependencies === 0 && this.publicationReady.push(n), this.publish()) : e.apply();
 		};
 	}
 	publish() {
@@ -1836,29 +1842,26 @@ var ve = class {
 		return e.creates.size > 0 && this.observesCreation(e, t);
 	}
 };
-//#endregion
-//#region src/entity-class.ts
-function ye(e, t) {
+// src/entity-class.ts
+function Te(e, t) {
 	return t;
 }
-function be(e, t) {
+function Ee(e, t) {
 	return t;
 }
-//#endregion
-//#region src/actions/kill-entity.ts
-function xe(e) {
+// src/actions/kill-entity.ts
+function De(e) {
 	e.components.entity.dead = !0, e.emit("death");
 }
-//#endregion
-//#region src/performance-timing.ts
-var Se = 1e3, Q = {
+// src/performance-timing.ts
+var Oe = 1e3, Z = {
 	avg: 0,
 	min: 0,
 	max: 0,
 	samples: 0
 };
-function $(e) {
-	if (!e.length) return { ...Q };
+function Q(e) {
+	if (!e.length) return { ...Z };
 	let t = 0, n = Infinity, r = 0;
 	for (let i of e) t += i, i < n && (n = i), i > r && (r = i);
 	return {
@@ -1868,13 +1871,13 @@ function $(e) {
 		samples: e.length
 	};
 }
-var Ce = class extends x.default {
+var ke = class extends b.default {
 	world;
 	ticksBetweenUpdates;
 	stats = {
-		update: { ...Q },
+		update: { ...Z },
 		systems: [],
-		events: { ...Q }
+		events: { ...Z }
 	};
 	autoUpdate;
 	ticks = 0;
@@ -1892,9 +1895,9 @@ var Ce = class extends x.default {
 		this.ticks = 0, this.updateTimes = [], this.systemTimings.forEach((e) => {
 			e.run = [], e.events = [], e.eventStart = -1, e.pendingRun = 0, e.pendingEvents = 0;
 		}), this.stats = {
-			update: { ...Q },
+			update: { ...Z },
 			systems: [],
-			events: { ...Q }
+			events: { ...Z }
 		};
 	}
 	destroy() {
@@ -1939,26 +1942,26 @@ var Ce = class extends x.default {
 			let t = this.systemTimings.get(e.name);
 			return {
 				name: e.name,
-				run: $(t?.run ?? []),
-				events: $(t?.events ?? [])
+				run: Q(t?.run ?? []),
+				events: Q(t?.events ?? [])
 			};
-		}), t = { ...Q };
+		}), t = { ...Z };
 		return e.forEach((e) => {
 			t.avg += e.events.avg, t.min += e.events.min, t.max += e.events.max, t.samples += e.events.samples;
 		}), this.stats = {
-			update: $(this.updateTimes),
+			update: Q(this.updateTimes),
 			systems: e,
 			events: t
 		}, this.ticks = 0, this.updateTimes = [], this.systemTimings.forEach((e) => {
 			e.run = [], e.events = [];
 		}), this.emit("stats-updated", this.stats), this.stats;
 	}
-}, we = class extends k {
+}, $ = class extends O {
 	constructor(e, t) {
 		super(e, {
 			...t,
 			required: [],
-			updateFunction: u(t.updateFunction)
+			updateFunction: d(t.updateFunction)
 		});
 	}
 	get tracksMainQuery() {
@@ -1968,7 +1971,6 @@ var Ce = class extends x.default {
 		return !0;
 	}
 };
-//#endregion
-export { A as BaseEntity, he as BaseWorld, n as CLASS_INDEX, f as Component, ve as ConflictScheduler, m as ConstantStringCache, c as DEAD_INDEX, Se as DEFAULT_TICKS_BETWEEN_UPDATES, q as DefaultScheduler, U as EntityCompressor, j as EntityFactory, T as EntitySystem, D as EntitySystemWebWorker, k as EntityWorkerSystem, w as IterableSystem, h as MemoryComponent, Ce as PerformanceTiming, ne as STATIC_INDEX, S as System, r as TYPE_INDEX, E as WebWorker, we as WorkerSystem, t as addComponentWorker, ue as compressEntities, p as createEntitySystemWorker, d as createEntityWorker, te as createSystemWorker, fe as decompressEntities, G as decompressEntity, ye as defineEntityClasses, be as defineEntityConfigs, i as entityDefinition, xe as killEntity, ee as killEntityWorker, s as removeComponentWorker };
+export { k as BaseEntity, be as BaseWorld, r as CLASS_INDEX, p as Component, we as ConflictScheduler, n as ConstantStringCache, l as DEAD_INDEX, Oe as DEFAULT_TICKS_BETWEEN_UPDATES, q as DefaultScheduler, U as EntityCompressor, A as EntityFactory, w as EntitySystem, E as EntitySystemWebWorker, O as EntityWorkerSystem, C as IterableSystem, m as MemoryComponent, ke as PerformanceTiming, re as STATIC_INDEX, x as System, i as TYPE_INDEX, T as WebWorker, $ as WorkerSystem, t as addComponentWorker, he as compressEntities, ee as createEntitySystemWorker, f as createEntityWorker, ne as createSystemWorker, _e as decompressEntities, G as decompressEntity, Te as defineEntityClasses, Ee as defineEntityConfigs, a as entityDefinition, De as killEntity, te as killEntityWorker, c as removeComponentWorker };
 
 //# sourceMappingURL=index.js.map