@daneren2005/shared-memory-ecs 1.5.1 → 1.7.0

package/dist/index.js

@@ -1,17 +1,17 @@
-import { a as e, c as t, d as n, f as r, i, l as a, n as o, o as s, r as c, s as l, t as u, u as d } from "./create-component-worker-BM942gjg.js";
-import f from "@daneren2005/shared-memory-objects/memory-heap";
-import { MAX_BYTE_OFFSET_LENGTH as p } from "@daneren2005/shared-memory-objects/utils/pointer";
+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 m, t as h, u as g, v as _ } from "./create-system-worker-DURlIMia.js";
+import v from "@daneren2005/shared-memory-objects/memory-heap";
+import { MAX_BYTE_OFFSET_LENGTH as y } from "@daneren2005/shared-memory-objects/utils/pointer";
 //#region \0rolldown/runtime.js
-var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescriptor, _ = Object.getOwnPropertyNames, v = Object.getPrototypeOf, y = Object.prototype.hasOwnProperty, b = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t.exports), x = (e, t, n, r) => {
-	if (t && typeof t == "object" || typeof t == "function") for (var i = _(t), a = 0, o = i.length, s; a < o; a++) s = i[a], !y.call(e, s) && s !== n && h(e, s, {
+var b = Object.create, x = Object.defineProperty, S = Object.getOwnPropertyDescriptor, C = Object.getOwnPropertyNames, w = Object.getPrototypeOf, T = Object.prototype.hasOwnProperty, E = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t.exports), D = (e, t, n, r) => {
+	if (t && typeof t == "object" || typeof t == "function") for (var i = C(t), a = 0, o = i.length, s; a < o; a++) s = i[a], !T.call(e, s) && s !== n && x(e, s, {
 		get: ((e) => t[e]).bind(null, s),
-		enumerable: !(r = g(t, s)) || r.enumerable
+		enumerable: !(r = S(t, s)) || r.enumerable
 	});
 	return e;
-}, S = /* @__PURE__ */ ((e, t, n) => (n = e == null ? {} : m(v(e)), x(t || !e || !e.__esModule ? h(n, "default", {
+}, O = /* @__PURE__ */ ((e, t, n) => (n = e == null ? {} : b(w(e)), D(t || !e || !e.__esModule ? x(n, "default", {
 	value: e,
 	enumerable: !0
-}) : n, e)))((/* @__PURE__ */ b(((e, t) => {
+}) : n, e)))((/* @__PURE__ */ E(((e, t) => {
 	var n = Object.prototype.hasOwnProperty, r = "~";
 	function i() {}
 	Object.create && (i.prototype = Object.create(null), new i().__proto__ || (r = !1));
@@ -98,76 +98,7 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 		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), C = class extends S.default {
-	eid;
-	config;
-	world;
-	components = {};
-	constructor(e, t, n) {
-		super(), this.world = e, this.eid = n ?? e.allocateEid(), n === void 0 && (this.loadComponent("entity", t ?? {}, !1), t && this.load(t));
-	}
-	loadComponent(e, t, n = !0) {
-		let r = this.world.registry[e], i = r.memoryComponent, a = i.create(r.toBlock(t, this)), o = r.attach(this, i, a);
-		return o.block ??= i.getBlock(a), this.components[e] = o, n && this.emit("component-added", e, o), o;
-	}
-	attachComponent(e, t) {
-		let n = this.world.registry[e], r = n.attach(this, n.memoryComponent, t);
-		return r.block ??= n.memoryComponent.getBlock(t), this.components[e] = r, r;
-	}
-	removeComponent(e) {
-		let t = this.components[e];
-		if (t) {
-			let n = this.world.registry[e];
-			this.world.deferComponentMemoryFree(n.memoryComponent, t.index, n.free ? () => n.free(t) : void 0), delete this.components[e], this.emit("component-removed", e);
-		}
-	}
-	setComponent(e, t, n) {
-		let r = this.components[e];
-		r && (r[t] = n, this.emit("component-property-updated", e, t, n));
-	}
-	setComponentBulk(e, t) {
-		let n = this.components[e];
-		n && Object.assign(n, t);
-	}
-	deleteComponent(e, t) {
-		let n = this.components[e];
-		n && (delete n[t], this.emit("component-property-deleted", e, t));
-	}
-	deleteAllComponentMemory() {
-		let e = this.world.registry, t = this.components;
-		for (let n of Object.keys(t)) {
-			let r = e[n], i = t[n];
-			i && this.world.deferComponentMemoryFree(r.memoryComponent, i.index, r.free ? () => r.free(i) : void 0);
-		}
-	}
-	load(e) {
-		let t = e, n = this.world.registry;
-		for (let r of Object.keys(n)) {
-			if (r === "entity") continue;
-			let i = n[r];
-			i.loadInFinishLoading || i.loadProperties.some((e) => e in t) && this.loadComponent(r, e, !1);
-		}
-		this.config = e;
-	}
-	save() {
-		let e = {}, t = this.world.registry, n = this.components;
-		for (let r of Object.keys(n)) {
-			let i = t[r], a = n[r];
-			i.save && a && Object.assign(e, i.save(a));
-		}
-		return e;
-	}
-	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") continue;
-			let i = n[r];
-			i.loadInFinishLoading && i.loadProperties.some((e) => e in t) && this.loadComponent(r, e, !1);
-		}
-	}
-}, w = class extends S.default {
+})))(), 1), k = class extends O.default {
 	world;
 	name;
 	currentDelta = 0;
@@ -211,7 +142,7 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 	destroy() {
 		this.removeAllListeners();
 	}
-}, T = class extends w {
+}, A = class extends k {
 	remainingInstancesToRun = [];
 	remainingInstancesStartTime = null;
 	iterationsPerCheck;
@@ -261,7 +192,7 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 	}
 	beforeRunIterables() {}
 	getIterableEntityId(e) {}
-}, E = class extends T {
+}, j = class extends A {
 	entities = /* @__PURE__ */ new Map();
 	options;
 	constructor(e, t = { name: "EntitySystem" }) {
@@ -280,7 +211,7 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 		}), e;
 	}
 	updateIterable(e, t) {
-		e.components.entity.dead || this.updateEntity(e, t);
+		e.components.entity.dead || this.entities.get(e.eid) !== e || this.updateEntity(e, t);
 	}
 	filterEntity(e) {
 		return !e.components.entity.isStatic;
@@ -298,11 +229,11 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 		this.entities.delete(e.eid);
 	}
 	shouldRun() {
-		return this.entities.size > 0;
+		return this.isCurrentlyRunning() || this.entities.size > 0;
 	}
-}, D = class {
+}, M = class {
 	onmessage(e, t = []) {}
-}, O = class extends D {
+}, N = class extends M {
 	updateFunction;
 	entities = [];
 	queryEntities = {};
@@ -310,12 +241,13 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 	world;
 	allocator;
 	createsEntities;
-	constructor(e, t, n = !1) {
-		super(), this.updateFunction = e, this.world = t, this.createsEntities = n;
-		let r = t.registry;
+	addsComponents;
+	constructor(e, t, n = !1, r = !1) {
+		super(), this.updateFunction = e, this.world = t, this.createsEntities = n, this.addsComponents = r;
+		let i = t.registry;
 		this.allocator = {
 			allocateEid: () => t.allocateEid(),
-			allocateComponentBlock: (e, t) => r[e].memoryComponent.create(t)
+			allocateComponentBlock: (e, t) => i[e].memoryComponent.create(t)
 		};
 	}
 	postMessage(e) {
@@ -325,16 +257,20 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 		else if (e.type === "run") {
 			if (this.worldExtension && Object.assign(e.world, this.worldExtension), e.world.getString = (e) => this.world.constantStrings.getString(e) ?? "", e.world.heap = this.world.heap, e.world.allocate = this.allocator, this.createsEntities) {
 				let t = this.world.registry;
-				e.world.buildEntityDescriptor = (e) => a(e, this.world.factory.configs, t, this.allocator);
+				e.world.buildEntityDescriptor = (e) => o(e, this.world.factory.configs, t, this.allocator, this.world.factory.getWorkerClasses());
 			}
-			let t = performance.now(), n = [], r = {}, i = [], o = [];
-			this.entities = d(this.entities, e.entities);
-			let s = {};
+			if (this.addsComponents) {
+				let t = this.world.registry;
+				e.world.buildComponentDescriptor = (e, n) => l(e, n, t, this.allocator);
+			}
+			let t = performance.now(), n = [], r = {}, i = [], s = [], c = [];
+			this.entities = a(this.entities, e.entities);
+			let u = {};
 			Object.entries(e.queries).forEach(([e, t]) => {
-				let n = d(this.queryEntities[e] ?? [], t);
-				this.queryEntities[e] = n, s[e] = n;
+				let n = a(this.queryEntities[e] ?? [], t);
+				this.queryEntities[e] = n, u[e] = n;
 			});
-			let c = {
+			let d = {
 				entityComponentChanged(e, t, r, i) {
 					n.push({
 						entityId: e,
@@ -365,51 +301,66 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 				},
 				createEntity(e) {
 					i.push(e);
+				},
+				addComponent(e, t) {
+					s.push({
+						type: "add",
+						entityId: e,
+						component: t
+					});
+				},
+				removeComponent(e, t) {
+					s.push({
+						type: "remove",
+						entityId: e,
+						componentName: String(t)
+					});
 				}
-			}, l = !1;
+			}, f = !1;
 			if (this.updateFunction.preRun) try {
-				this.updateFunction.preRun(e.world, this.entities, s, c);
+				this.updateFunction.preRun(e.world, this.entities, u, d);
 			} catch (e) {
-				l = !0, o.push({
+				f = !0, c.push({
 					error: e,
 					phase: "preRun"
 				});
 			}
-			if (l || this.entities.forEach((t) => {
+			if (f || this.entities.forEach((t) => {
 				try {
-					this.updateFunction(e.world, t.entityId, t.components, s, c);
+					this.updateFunction(e.world, t.entityId, t.components, u, d);
 				} catch (e) {
-					o.push({
+					c.push({
 						error: e,
 						phase: "update",
 						entityId: t.entityId
 					});
 				}
 			}), this.updateFunction.entityRemoved) for (let t of e.entities.removed) try {
-				this.updateFunction.entityRemoved(e.world, t, c);
+				this.updateFunction.entityRemoved(e.world, t, d);
 			} catch (e) {
-				o.push({
+				c.push({
 					error: e,
 					phase: "entityRemoved",
 					entityId: t
 				});
 			}
-			let u = performance.now() - t;
+			let p = performance.now() - t;
 			this.onMessageTyped({
 				type: "run-complete",
 				generation: e.generation,
-				runTime: u,
+				runTime: p,
 				events: n,
 				systemEvents: r,
 				created: i,
-				errors: o
+				componentChanges: s,
+				errors: c
 			});
 		}
 	}
 	onMessageTyped(e) {
 		this.onmessage({ data: e });
 	}
-}, k = "___main", A = class extends w {
+}, P = "___main", F = class extends k {
 	entities = /* @__PURE__ */ new Map();
 	options;
 	worker;
@@ -436,7 +387,7 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 				type: "grow-buffer",
 				buffer: e
 			});
-		})) : (this.worker = new O(t.updateFunction, e, !!t.createsEntities), this.isWorkerThread = !1), this.initWorker();
+		})) : (this.worker = new N(t.updateFunction, e, !!t.createsEntities, !!t.addsComponents), this.isWorkerThread = !1), this.initWorker();
 	}
 	initWorker() {
 		this.worker.onmessage = (e) => {
@@ -451,6 +402,17 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 						entityId: t,
 						phase: n
 					});
+				}), (t.componentChanges ?? []).forEach((e) => {
+					let t = this.world.getEntityByEid(e.entityId);
+					if (e.type === "add") {
+						let n = this.world.registry[e.component.name];
+						if (!t || !n || e.component.name === "entity") {
+							n?.memoryComponent.delete(e.component.index);
+							return;
+						}
+						let r = e.component.name;
+						t.removeComponent(r), t.attachComponent(r, e.component.index, !0);
+					} else t && e.componentName !== "entity" && t.removeComponent(e.componentName);
 				});
 				for (let e of Object.keys(t.systemEvents)) this.emit(e, t.systemEvents[e]);
 				t.events.forEach((e) => {
@@ -486,7 +448,9 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 			data: this.options.getInitData?.(),
 			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
+			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(n), e;
 	}
@@ -525,7 +489,7 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 			elapsedTime: e
 		};
 		this.addDataToWorld?.(t), this.isRunning = !0;
-		let n = this.buildQueryDelta(k, this.options), r = {};
+		let n = this.buildQueryDelta(P, this.options), r = {};
 		Object.entries(this.options.queries ?? {}).forEach(([e, t]) => {
 			r[e] = this.buildQueryDelta(e, t);
 		});
@@ -587,13 +551,13 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 	}
 	checkAddEntity(e) {
 		let t = this.matchesQuery(e, this.options);
-		return this.updateEntityList(k, this.entities, e, t), Object.entries(this.options.queries ?? {}).forEach(([t, n]) => {
+		return this.updateEntityList(P, 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;
 	}
 	removeEntity(e) {
-		this.updateEntityList(k, this.entities, e, !1), Object.entries(this.queryEntities).forEach(([t, n]) => {
+		this.updateEntityList(P, this.entities, e, !1), Object.entries(this.queryEntities).forEach(([t, n]) => {
 			this.updateEntityList(t, n, e, !1);
 		});
 	}
@@ -608,30 +572,225 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 	destroy() {
 		super.destroy(), "terminate" in this.worker && this.worker.terminate();
 	}
-}, j = class {
+}, I = class extends O.default {
+	eid;
+	config;
+	world;
+	componentMemoryDeletionScheduled = !1;
+	allowedComponents;
+	components = {};
+	constructor(e, t, n, r) {
+		super(), this.world = e, this.eid = n ?? e.allocateEid(), this.allowedComponents = r ?? e.factory.getAllowedComponentsForConfig(t), n === void 0 && (this.loadComponent("entity", t ?? {}, !1), t && this.load(t));
+	}
+	get id() {
+		return this.eid;
+	}
+	get dead() {
+		return this.components.entity.dead;
+	}
+	get type() {
+		return this.components.entity.type;
+	}
+	loadComponent(e, t, n = !0) {
+		this.assertComponentAllowed(e);
+		let r = this.world.registry[e], i = r.memoryComponent, a = i.create(r.toBlock(t, this)), o = r.attach(this, i, a);
+		return o.block ??= i.getBlock(a), this.components[e] = o, n && this.emit("component-added", e, o), o;
+	}
+	attachComponent(e, t, n = !1) {
+		this.assertComponentAllowed(e);
+		let r = this.world.registry[e], i = r.attach(this, r.memoryComponent, t);
+		return i.block ??= r.memoryComponent.getBlock(t), this.components[e] = i, n && this.emit("component-added", e, i), i;
+	}
+	removeComponent(e) {
+		if (this.componentMemoryDeletionScheduled) return;
+		let t = this.components[e];
+		if (t) {
+			let n = this.world.registry[e];
+			this.world.deferComponentMemoryFree(n.memoryComponent, t.index, n.free ? () => n.free(t) : void 0), delete this.components[e], this.emit("component-removed", e);
+		}
+	}
+	setComponent(e, t, n) {
+		this.assertComponentPropertyMutable(e, t);
+		let r = this.components[e];
+		r && (r[t] = n, this.emit("component-property-updated", e, t, n));
+	}
+	setComponentBulk(e, t) {
+		for (let n of Object.keys(t)) this.assertComponentPropertyMutable(e, n);
+		let n = this.components[e];
+		n && Object.assign(n, t);
+	}
+	deleteComponent(e, t) {
+		this.assertComponentPropertyMutable(e, t);
+		let n = this.components[e];
+		n && (delete n[t], this.emit("component-property-deleted", e, t));
+	}
+	deleteAllComponentMemory() {
+		if (this.componentMemoryDeletionScheduled) return;
+		this.componentMemoryDeletionScheduled = !0;
+		let e = this.world.registry, t = this.components;
+		for (let n of Object.keys(t)) {
+			let r = e[n], i = t[n];
+			i && this.world.deferComponentMemoryFree(r.memoryComponent, i.index, r.free ? () => r.free(i) : void 0);
+		}
+	}
+	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);
+		}
+		this.config = e;
+	}
+	save() {
+		let e = {}, t = this.world.registry, n = this.components;
+		for (let r of Object.keys(n)) {
+			let i = t[r], a = n[r];
+			i.save && a && Object.assign(e, i.save(a));
+		}
+		return e;
+	}
+	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);
+		}
+	}
+	isComponentAllowed(e) {
+		return e === "entity" || !this.allowedComponents || this.allowedComponents.has(String(e));
+	}
+	setAllowedComponents(e) {
+		if (this.allowedComponents && this.allowedComponents !== e) throw Error("Entity component allowlist is immutable");
+		this.allowedComponents = e;
+	}
+	assertComponentAllowed(e) {
+		if (!this.isComponentAllowed(e)) throw Error(`Component ${String(e)} is not allowed for entity type ${this.type}`);
+	}
+	assertComponentPropertyMutable(e, t) {
+		if (e === "entity" && (t === "type" || t === "class")) throw Error(`Entity ${t} is immutable`);
+	}
+}, L = class {
 	world;
 	configs;
-	constructor(e = {}) {
-		this.configs = e;
+	classes;
+	allowedComponents = /* @__PURE__ */ new Map();
+	constructor(e = {}, t = {}) {
+		this.configs = e, this.classes = t;
+		for (let e of Object.keys(t)) this.allowedComponents.set(e, new Set(t[e].components));
 	}
 	register(e, t) {
-		this.configs[e] = t;
+		this.world && this.validateTemplate(e, t), this.configs[e] = t;
+	}
+	setWorld(e) {
+		this.world = e;
+		for (let t of Object.keys(this.classes)) {
+			let n = this.classes[t].entity;
+			if (n !== I && !(n.prototype instanceof I)) 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]);
 	}
 	getConfig(e) {
-		let t = e?.type, n = t ? this.configs[t] : void 0;
-		return n ? {
-			...n,
+		let t = e, n = t?.type, r = n ? this.configs[n] : void 0;
+		if (this.hasClasses) {
+			if (!n || !r) throw Error(`Unknown entity type: ${n ?? ""}`);
+			if (Object.prototype.hasOwnProperty.call(t, "class")) throw Error("Entity class comes from its type template and cannot be supplied by an instance config");
+		}
+		let i = r ? {
+			...r,
 			...e
 		} : e;
+		return this.hasClasses && n && this.validateResolvedConfig(n, i), i;
 	}
 	loadEntity(e, t = !0) {
-		let n = this.createEntity(this.getConfig(e));
-		return this.world.addEntity(n, t);
+		let n = e.type, r = this.getConfig(e);
+		this.hasClasses && n && this.validateResolvedConfig(n, r);
+		let i = this.getClassDefinition(r), a = i ? this.constructEntity(i, r) : this.createEntity(r);
+		return this.world.addEntity(a, t);
+	}
+	createAdoptedEntity(e, t, n) {
+		if (!t) {
+			if (this.hasClasses) throw Error(`Entity type ${e} has no class`);
+			return new I(this.world, void 0, n);
+		}
+		let r = this.classes[t];
+		if (!r) throw Error(`Unknown entity class: ${t}`);
+		this.validateTypeClass(e, t);
+		let i = Reflect.construct(r.entity, [
+			this.world,
+			void 0,
+			n,
+			this.allowedComponents.get(t)
+		]);
+		return i.setAllowedComponents(this.allowedComponents.get(t)), i;
+	}
+	isComponentAllowed(e, t) {
+		return !e || !this.hasClasses || this.allowedComponents.get(e)?.has(t) === !0;
+	}
+	getWorkerClasses() {
+		if (!this.hasClasses) return;
+		let e = {};
+		for (let t of Object.keys(this.classes)) e[t] = { components: [...this.classes[t].components] };
+		return e;
+	}
+	getAllowedComponentsForConfig(e) {
+		return e ? this.getAllowedComponents(e) : void 0;
 	}
 	createEntity(e) {
-		return new C(this.world, e);
+		return new I(this.world, e);
+	}
+	get hasClasses() {
+		return this.allowedComponents.size > 0;
+	}
+	getClassDefinition(e) {
+		let t = e.class;
+		return t ? this.classes[t] : void 0;
+	}
+	getAllowedComponents(e) {
+		let t = e.class;
+		return t ? this.allowedComponents.get(t) : void 0;
+	}
+	constructEntity(e, t) {
+		let n = t.class;
+		return Reflect.construct(e.entity, [
+			this.world,
+			t,
+			void 0,
+			this.allowedComponents.get(n ?? "")
+		]);
+	}
+	validateTemplate(e, t) {
+		if (!this.hasClasses) return;
+		let n = t;
+		if (n.type !== e) throw Error(`Entity template ${e} must declare the same type`);
+		if (!n.class || !this.classes[n.class]) throw Error(`Entity template ${e} has unknown class ${n.class ?? ""}`);
+		this.validateComponentTriggers(e, n.class, t);
+	}
+	validateResolvedConfig(e, t) {
+		let n = t;
+		if (n.type !== e) throw Error(`Entity type ${e} is immutable`);
+		if (!n.class || !this.classes[n.class]) throw Error(`Entity type ${e} has unknown class ${n.class ?? ""}`);
+		this.validateTypeClass(e, n.class), this.validateComponentTriggers(e, n.class, t);
+	}
+	validateTypeClass(e, t) {
+		let n = this.configs[e];
+		if (!n || n.class !== t) throw Error(`Entity type ${e} does not belong to class ${t}`);
+	}
+	validateComponentTriggers(e, t, n) {
+		let r = this.allowedComponents.get(t), i = /* @__PURE__ */ new Set();
+		for (let e of r) for (let t of this.world.registry[e].loadProperties) i.add(t);
+		let a = n;
+		for (let n of Object.keys(this.world.registry)) {
+			if (n === "entity" || r.has(n)) continue;
+			let o = this.world.registry[n].loadProperties.find((e) => e in a && !i.has(e));
+			if (o) throw Error(`Entity type ${e} class ${t} cannot load component ${n} from property ${o}`);
+		}
 	}
-}, M = p, N = 1e4, P = class extends S.default {
+}, R = y, z = 1e4, B = class extends O.default {
 	heap;
 	constantStrings;
 	eidCounter;
@@ -655,20 +814,20 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 		waitingSystems: /* @__PURE__ */ new Set(),
 		waitElapsed: 0
 	};
-	constructor(e, t = {}) {
-		super(), this.heap = new f({ bufferSize: t.heapSize ?? M }), this.constantStrings = new n(this.heap), this.eidCounter = this.heap.allocUI32(1), this.heap.addOnGrowBufferHandlers((e) => this.emit("grow-buffer", e));
-		let i = {
-			...e,
-			entity: l
+	constructor(t, n = {}) {
+		super(), this.heap = new v({ bufferSize: n.heapSize ?? R }), this.constantStrings = new e(this.heap), this.eidCounter = this.heap.allocUI32(1), this.heap.addOnGrowBufferHandlers((e) => this.emit("grow-buffer", e));
+		let r = {
+			...t,
+			entity: i
 		}, a = {};
-		for (let e of Object.keys(i)) {
-			let t = i[e];
+		for (let e of Object.keys(r)) {
+			let t = r[e];
 			a[e] = {
 				...t,
-				memoryComponent: new r(this.heap, t.type, t.size)
+				memoryComponent: new _(this.heap, t.type, t.size)
 			};
 		}
-		this.registry = a, this.factory = t.factory ?? new j(), this.factory.world = this;
+		this.registry = a, this.factory = n.factory ?? new L(), this.factory.setWorld(this);
 	}
 	allocateEid() {
 		return Atomics.add(this.eidCounter.data, 0, 1) + 1;
@@ -685,7 +844,7 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 		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 A && e.isWorkerThread && !!e.options.createsEntities);
+		return this.systems.some((e) => e instanceof F && e.isWorkerThread && (!!e.options.createsEntities || !!e.options.addsComponents));
 	}
 	async init() {
 		await Promise.all(this.systems.map((e) => e.init()).filter((e) => e instanceof Promise));
@@ -695,9 +854,9 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 	}
 	addEntity(e, t = !0) {
 		return this.entities.set(e.eid, e), e.world = this, this.pristine = !1, e.on("component-added", (t) => {
-			this.addEntityToComponentSystem(e, t);
+			this.addEntityToEntityWorkerSystem(e, t);
 		}), e.on("component-removed", (t) => {
-			this.removeEntityFromComponentSystem(e, t);
+			this.removeEntityFromEntityWorkerSystem(e, t);
 		}), t && (e.finishLoading(), this.emit("entity-added", e), e.on("death", () => {
 			this.onEntityDied(e);
 		})), e;
@@ -706,13 +865,24 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 		return this.factory.loadEntity(e, t);
 	}
 	adoptEntity(e) {
-		let t = new C(this, void 0, e.eid);
-		t.loadComponent("entity", {
-			type: e.type,
-			isStatic: e.isStatic
-		}, !1);
-		for (let n of Object.keys(e.components)) t.attachComponent(n, e.components[n]);
-		return this.addEntity(t, !0);
+		let t, n = /* @__PURE__ */ new Set();
+		try {
+			for (let t of Object.keys(e.components)) {
+				if (!(t in this.registry)) throw Error(`Worker-created entity contains unknown component ${t}`);
+				if (!this.factory.isComponentAllowed(e.class, t)) throw Error(`Component ${t} is not allowed for entity class ${e.class ?? ""}`);
+			}
+			t = this.factory.createAdoptedEntity(e.type, e.class, e.eid), t.loadComponent("entity", {
+				type: e.type,
+				class: e.class,
+				isStatic: e.isStatic
+			}, !1);
+			for (let r of Object.keys(e.components)) t.attachComponent(r, e.components[r]), n.add(r);
+			return this.addEntity(t, !0);
+		} catch (r) {
+			t?.deleteAllComponentMemory();
+			for (let t of Object.keys(e.components)) !n.has(t) && t in this.registry && this.deferComponentMemoryFree(this.registry[t].memoryComponent, e.components[t]);
+			throw r;
+		}
 	}
 	load(e) {
 		if (!this.pristine) {
@@ -720,6 +890,7 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 			this.systems.forEach((e) => e.clear()), this.consolidateFreeBuffersForReload();
 		}
 		for (let e of Object.keys(this.factory.configs)) this.constantStrings.getOrCreate(e);
+		for (let e of Object.keys(this.factory.classes)) this.constantStrings.getOrCreate(e);
 		let t = e.entities.map((e) => this.loadEntity(e, !1));
 		for (let e of t) e.finishLoading(), this.emit("entity-added", e), e.on("death", () => {
 			this.onEntityDied(e);
@@ -728,15 +899,32 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 	}
 	async clear() {
 		if (!this.pristine) {
+			await Promise.all(this.systems.map((e) => e.waitForRunToComplete()).filter((e) => e instanceof Promise));
 			for (let e of Array.from(this.entities.values())) this.removeEntity(e);
-			this.systems.forEach((e) => e.clear()), await Promise.all(this.systems.map((e) => e.waitForRunToComplete()).filter((e) => e instanceof Promise)), this.freeAllPendingBuffers(), this.pristine = !0;
+			this.systems.forEach((e) => e.clear()), this.freeAllPendingBuffers(), this.pristine = !0;
 		}
 	}
 	removeEntity(e) {
-		this.entities.delete(e.eid) && this.emit("entity-removed", e), e.deleteAllComponentMemory();
+		this.entities.get(e.eid) === e && (this.entities.delete(e.eid), this.emit("entity-removed", e), e.deleteAllComponentMemory());
 	}
 	onEntityDied(e) {
-		this.removeEntity(e);
+		if (this.entities.get(e.eid) !== e) return;
+		let t = this.registry, n = e.components;
+		for (let r of Object.keys(n)) {
+			let i = t[r], a = n[r];
+			if (i?.died && a) try {
+				i.died(a, e, this);
+			} catch (t) {
+				let n = t;
+				console.error(`Error in died hook for component ${String(r)} (entity ${e.eid}): ${n.message}`, n), this.emit("system-error", {
+					system: String(r),
+					error: n,
+					entityId: e.eid,
+					phase: "died"
+				});
+			}
+		}
+		this.emit("entity-died", e), this.removeEntity(e);
 	}
 	getEntityByEid(e) {
 		return this.entities.get(e);
@@ -773,9 +961,9 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 	}
 	checkFreeBufferTimeout(e) {
 		let t = this.activeFreeBuffer;
-		if (t.waitingSystems.size !== 0 && (t.waitElapsed += e, t.waitElapsed >= N)) {
+		if (t.waitingSystems.size !== 0 && (t.waitElapsed += e, t.waitElapsed >= z)) {
 			let e = Array.from(t.waitingSystems).map((e) => e.name).join(", ");
-			console.warn(`shared-memory-ecs: deferred component free waited over ${N}ms on system(s): ${e}; freeing anyway`), t.waitingSystems.clear(), this.processFreeBuffers();
+			console.warn(`shared-memory-ecs: deferred component free waited over ${z}ms on system(s): ${e}; freeing anyway`), t.waitingSystems.clear(), this.processFreeBuffers();
 		}
 	}
 	addSystem(e) {
@@ -827,17 +1015,17 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 	resume() {
 		this.paused = !1;
 	}
-	addEntityToComponentSystem(e, t) {
+	addEntityToEntityWorkerSystem(e, t) {
 		this.systems.forEach((n) => {
-			(n instanceof E && n.options.components?.includes(t) || n instanceof A && this.componentAffectsComponentSystem(n, t)) && n.checkAddEntity(e);
+			(n instanceof j && n.options.components?.includes(t) || n instanceof F && this.componentAffectsEntityWorkerSystem(n, t)) && n.checkAddEntity(e);
 		});
 	}
-	removeEntityFromComponentSystem(e, t) {
+	removeEntityFromEntityWorkerSystem(e, t) {
 		this.systems.forEach((n) => {
-			n instanceof E && n.options.components?.includes(t) ? n.removeEntity(e) : n instanceof A && this.componentAffectsComponentSystem(n, t) && n.checkAddEntity(e);
+			n instanceof j && n.options.components?.includes(t) ? n.removeEntity(e) : n instanceof F && this.componentAffectsEntityWorkerSystem(n, t) && n.checkAddEntity(e);
 		});
 	}
-	componentAffectsComponentSystem(e, t) {
+	componentAffectsEntityWorkerSystem(e, t) {
 		let n = e.options.required.includes(t) || !!e.options.not?.includes(t) || !!e.options.optional?.includes(t), r = Object.values(e.options.queries ?? {}).some((e) => e.required.includes(t) || !!e.not?.includes(t) || !!e.optional?.includes(t));
 		return n || r;
 	}
@@ -848,20 +1036,28 @@ var m = Object.create, h = Object.defineProperty, g = Object.getOwnPropertyDescr
 	}
 };
 //#endregion
+//#region src/entity-class.ts
+function V(e, t) {
+	return t;
+}
+function H(e, t) {
+	return t;
+}
+//#endregion
 //#region src/actions/kill-entity.ts
-function F(e) {
+function U(e) {
 	e.components.entity.dead = !0, e.emit("death");
 }
 //#endregion
 //#region src/performance-timing.ts
-var I = 1e3, L = {
+var W = 1e3, G = {
 	avg: 0,
 	min: 0,
 	max: 0,
 	samples: 0
 };
-function R(e) {
-	if (!e.length) return { ...L };
+function K(e) {
+	if (!e.length) return { ...G };
 	let t = 0, n = Infinity, r = 0;
 	for (let i of e) t += i, i < n && (n = i), i > r && (r = i);
 	return {
@@ -871,13 +1067,13 @@ function R(e) {
 		samples: e.length
 	};
 }
-var z = class extends S.default {
+var q = class extends O.default {
 	world;
 	ticksBetweenUpdates;
 	stats = {
-		update: { ...L },
+		update: { ...G },
 		systems: [],
-		events: { ...L }
+		events: { ...G }
 	};
 	ticks = 0;
 	updateStart = 0;
@@ -894,9 +1090,9 @@ var z = class extends S.default {
 		this.ticks = 0, this.updateTimes = [], this.systemTimings.forEach((e) => {
 			e.run = [], e.events = [], e.eventStart = -1;
 		}), this.stats = {
-			update: { ...L },
+			update: { ...G },
 			systems: [],
-			events: { ...L }
+			events: { ...G }
 		};
 	}
 	destroy() {
@@ -938,22 +1134,39 @@ var z = class extends S.default {
 			let t = this.systemTimings.get(e.name);
 			return {
 				name: e.name,
-				run: R(t?.run ?? []),
-				events: R(t?.events ?? [])
+				run: K(t?.run ?? []),
+				events: K(t?.events ?? [])
 			};
-		}), t = { ...L };
+		}), t = { ...G };
 		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: R(this.updateTimes),
+			update: K(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);
 	}
+}, J = class extends F {
+	constructor(e, t) {
+		super(e, {
+			...t,
+			required: [],
+			updateFunction: u(t.updateFunction)
+		});
+	}
+	checkAddEntity(e) {
+		return 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));
+		}), !1;
+	}
+	shouldRun() {
+		return !0;
+	}
 };
 //#endregion
-export { C as BaseEntity, P as BaseWorld, t as Component, A as ComponentSystem, O as ComponentWebWorker, n as ConstantStringCache, i as DEAD_INDEX, I as DEFAULT_TICKS_BETWEEN_UPDATES, j as EntityFactory, E as EntitySystem, T as IterableSystem, r as MemoryComponent, z as PerformanceTiming, e as STATIC_INDEX, w as System, s as TYPE_INDEX, D as WebWorker, u as createComponentWorker, o as createEntityWorker, l as entityDefinition, F as killEntity, c as killEntityWorker };
+export { I as BaseEntity, B as BaseWorld, n as CLASS_INDEX, f as Component, e as ConstantStringCache, c as DEAD_INDEX, W as DEFAULT_TICKS_BETWEEN_UPDATES, L as EntityFactory, j as EntitySystem, N as EntitySystemWebWorker, F as EntityWorkerSystem, A as IterableSystem, _ as MemoryComponent, q as PerformanceTiming, g as STATIC_INDEX, k as System, r as TYPE_INDEX, M as WebWorker, J as WorkerSystem, t as addComponentWorker, p as createEntitySystemWorker, d as createEntityWorker, h as createSystemWorker, V as defineEntityClasses, H as defineEntityConfigs, i as entityDefinition, U as killEntity, m as killEntityWorker, s as removeComponentWorker };
 
 //# sourceMappingURL=index.js.map