@oasys/oecs 0.5.0 → 0.5.2

package/dist/index.js

@@ -1,5 +1,5 @@
-import { v as dt, S as O, o as it, p as ot, q as ht, s as Jt, t as te, u as Ot, w as T, E as v, x as b, N as P, y as ee, z as w, U as R, A as pe, C as _e, F as ge, G as ye, I as me, j as X, J as Lt, R as Et, K as se, L as we, O as Ee, P as ve, Q as at, T as ne, V as kt, W as re, X as ie, Y as vt, Z as be, _ as Ce, $ as nt, a0 as Se, a1 as Ie, a2 as J, a3 as Re, a4 as Ae, a5 as Oe, a6 as ke, a7 as Nt, a8 as Te, a9 as Bt, aa as De, ab as ft, ac as xe, ad as Me, ae as M, af as Le, ag as Ft, ah as z, k as $t, n as Ne, ai as V, aj as tt, ak as Be, al as Fe, am as pt, an as $e, ao as Ge, ap as Pe, c as ct, r as Ue, aq as He, ar as Ve, as as qe, at as je, au as ze } from "./host_commands-i4cAeyL5.js";
-import { aC as bn, aA as Cn, av as Sn, az as In, ax as Rn, aD as An, aB as On, aw as kn, ay as Tn } from "./host_commands-i4cAeyL5.js";
+import { v as dt, S as O, o as ht, p as at, q as ct, s as Jt, t as te, u as Ot, w as T, E as v, x as b, N as P, y as ee, z as w, U as I, A as pe, C as _e, F as ge, G as ye, I as me, j as J, J as Lt, R as Et, K as se, L as we, O as Ee, P as ve, Q as lt, T as ne, V as kt, W as re, X as ie, Y as vt, Z as be, _ as Ce, $ as it, a0 as Se, a1 as Re, a2 as et, a3 as Ie, a4 as Ae, a5 as Oe, a6 as ke, a7 as Nt, a8 as Te, a9 as Bt, aa as De, ab as ft, ac as xe, ad as Me, ae as M, af as Le, ag as Ft, ah as Y, k as $t, n as Ne, ai as V, aj as st, ak as Be, al as Fe, am as pt, an as $e, ao as Ge, ap as Pe, c as ut, r as Ue, aq as He, ar as Ve, as as qe, at as je, au as ze } from "./host_commands-BI8pEmjH.js";
+import { aC as bn, aA as Cn, av as Sn, az as Rn, ax as In, aD as An, aB as On, aw as kn, ay as Tn } from "./host_commands-BI8pEmjH.js";
 import { h as We, B as $, i as Ye, j as Qe } from "./typed_arrays-BcXcnzB4.js";
 import { D as Ke, S as Gt, g as Xe } from "./shared-BU1Cd40h.js";
 import { a as xn } from "./shared-BU1Cd40h.js";
@@ -16,13 +16,13 @@ function he(a) {
 function Js(a, ...t) {
   return { def: a, values: t[0] ?? Tt };
 }
-function lt(a) {
+function j(a) {
   return typeof a == "function" ? a : a.def;
 }
-function ut(a) {
+function z(a) {
   return typeof a == "function" ? Tt : a.values;
 }
-class W extends Error {
+class Q extends Error {
   constructor(t) {
     super(t), this.name = "StoreRestoreError";
   }
@@ -33,25 +33,25 @@ function Ze(a) {
 }
 function Je(a, t = Ke) {
   const e = new DataView(a.buffer, a.byteOffset, a.byteLength);
-  if (a.byteLength < it)
-    throw new W(
-      `snapshot too small: ${a.byteLength} bytes (header alone needs ${it})`
+  if (a.byteLength < ht)
+    throw new Q(
+      `snapshot too small: ${a.byteLength} bytes (header alone needs ${ht})`
     );
   const s = e.getUint32(O.magic, !0);
-  if (s !== ot)
-    throw new W(
-      `bad magic: 0x${s.toString(16).padStart(8, "0")} (expected 0x${ot.toString(16).padStart(8, "0")})`
+  if (s !== at)
+    throw new Q(
+      `bad magic: 0x${s.toString(16).padStart(8, "0")} (expected 0x${at.toString(16).padStart(8, "0")})`
     );
   const n = e.getUint32(O.sim_abi_version, !0);
-  if (n !== ht)
-    throw new W(
-      `incompatible sim_abi_version: snapshot=${n}, build=${ht}`
+  if (n !== ct)
+    throw new Q(
+      `incompatible sim_abi_version: snapshot=${n}, build=${ct}`
     );
   const r = t(a.byteLength);
   new Uint8Array(r).set(a);
   const i = new DataView(r), o = Jt(i);
   if (o.layoutDescriptorOff < 0 || o.layoutDescriptorOff > r.byteLength)
-    throw new W(
+    throw new Q(
       `layout_descriptor_off ${o.layoutDescriptorOff} is outside the snapshot (${r.byteLength} bytes)`
     );
   try {
@@ -62,7 +62,7 @@ function Je(a, t = Ke) {
     ), c = Ot(r, h);
     return { buffer: r, view: i, header: o, archetypes: c };
   } catch (h) {
-    throw h instanceof RangeError ? new W(
+    throw h instanceof RangeError ? new Q(
       `snapshot layout is corrupt or truncated: a descriptor offset or column extent reads past the ${r.byteLength}-byte buffer (${h.message})`
     ) : h;
   }
@@ -228,7 +228,7 @@ class ns {
     return this.map.has(t);
   }
 }
-class et extends Error {
+class nt extends Error {
   capacity;
   requested;
   constructor(t, e) {
@@ -256,7 +256,7 @@ class rs {
    * the next read/write. */
   refreshView(t) {
     if (t.length < this._len)
-      throw new et(t.length, this._len);
+      throw new nt(t.length, this._len);
     this._buf = t, this._capacity = t.length;
   }
   get length() {
@@ -267,7 +267,7 @@ class rs {
   }
   push(t) {
     if (this._len >= this._capacity)
-      throw new et(this._capacity, this._len + 1);
+      throw new nt(this._capacity, this._len + 1);
     this._buf[this._len++] = t;
   }
   pop() {
@@ -296,7 +296,7 @@ class rs {
    * a fixed SAB view here — the mount already adopted the restored capacity). */
   setLength(t) {
     if (t > this._capacity)
-      throw new et(this._capacity, t);
+      throw new nt(this._capacity, t);
     this._len = t;
   }
   /** Raw backing view. Stable for the lifetime of the SAB; views over a
@@ -325,7 +325,7 @@ class rs {
    * across every archetype, which is the §6.1.4 invariant. */
   ensureCapacity(t) {
     if (t > this._capacity)
-      throw new et(this._capacity, t);
+      throw new nt(this._capacity, t);
   }
   /** Append `count` elements from `src[srcOffset..srcOffset+count]`.
    * Throws on overrun. */
@@ -973,7 +973,7 @@ class Dt {
   moveEntityFrom(t, e, s, n, r, i) {
     const o = e >= t.enabledCount;
     if (!this.materializesRows) {
-      t.removeRow(e, i), x[0] = R, x[1] = P;
+      t.removeRow(e, i), x[0] = I, x[1] = P;
       return;
     }
     const h = this._flatColumns;
@@ -1000,7 +1000,7 @@ class Dt {
   moveEntityFromTag(t, e, s, n) {
     const r = e >= t.enabledCount;
     if (!this.materializesRows) {
-      t.removeRow(e, n), x[0] = R, x[1] = P;
+      t.removeRow(e, n), x[0] = I, x[1] = P;
       return;
     }
     const i = this.length;
@@ -1114,14 +1114,14 @@ function Ct(a, t) {
 }
 const ae = (a) => dt(
   a
-), Y = Object.freeze([]);
+), K = Object.freeze([]);
 function Ut(a) {
   return typeof a == "object" && !Array.isArray(a);
 }
 function is(a) {
-  let t = Y;
+  let t = K;
   a.spawns !== void 0 && a.spawns.length > 0 && (t = a.spawns.map((s) => Ut(s) ? s.defs : s));
-  let e = Y;
+  let e = K;
   if (a.despawns !== void 0 && a.despawns.length > 0) {
     const s = [];
     for (const n of a.despawns)
@@ -1133,9 +1133,9 @@ function is(a) {
     writes: a.writes,
     spawns: t,
     despawns: e,
-    transitions: a.transitions ?? Y,
-    resourceReads: a.resourceReads ?? Y,
-    resourceWrites: a.resourceWrites ?? Y,
+    transitions: a.transitions ?? K,
+    resourceReads: a.resourceReads ?? K,
+    resourceWrites: a.resourceWrites ?? K,
     sparseReads: a.sparseReads,
     sparseWrites: a.sparseWrites,
     relationReads: a.relationReads,
@@ -1359,7 +1359,7 @@ class us {
   /** Radix-sort `eids` by entity index (canonical within-observer order), then
    * fire `fn` per entity under the observer's access scope. */
   _fireEach(t, e, s, n) {
-    rt(s, this._radixOut, this._radixC0, this._radixC1);
+    ot(s, this._radixOut, this._radixC0, this._radixC1);
     try {
       const r = L ? this.store._trace : null;
       for (let i = 0; i < s.length; i++)
@@ -1398,7 +1398,7 @@ class us {
   }
   _dispatchSetEntity(t, e) {
     let s = e.get(t.cid);
-    if (s === void 0 && (s = this.store._takeDirty(t.cid), rt(s, this._radixOut, this._radixC0, this._radixC1), e.set(t.cid, s)), s.length === 0) return;
+    if (s === void 0 && (s = this.store._takeDirty(t.cid), ot(s, this._radixOut, this._radixC0, this._radixC1), e.set(t.cid, s)), s.length === 0) return;
     const n = t.def, r = t.onSetEntity;
     try {
       for (let i = 0; i < s.length; i++) {
@@ -1424,7 +1424,7 @@ class us {
   _yieldExisting(t) {
     const e = t.onAdd, s = this.store._collectEntitiesWithComponent(t.cid);
     if (s.length !== 0) {
-      rt(s, this._radixOut, this._radixC0, this._radixC1);
+      ot(s, this._radixOut, this._radixC0, this._radixC1);
       try {
         for (let n = 0; n < s.length; n++) e(T(s[n]), this.ctx);
       } finally {
@@ -1432,7 +1432,7 @@ class us {
     }
   }
 }
-function rt(a, t, e, s) {
+function ot(a, t, e, s) {
   const n = a.length;
   if (!(n < 2)) {
     t.length < n && (t.length = n), e.fill(0), s.fill(0);
@@ -1575,7 +1575,7 @@ class ds {
   pairsOf(t) {
     const e = this.relationOf(t), s = [], n = this.host.entityGenerations();
     return e.forEachCanonicalPair(
-      (r) => X(r, n[r]),
+      (r) => J(r, n[r]),
       (r, i) => s.push([r, i])
     ), s;
   }
@@ -1636,25 +1636,25 @@ class ds {
     const u = Array.from(l).sort((y, p) => y - p), d = this.host.sparseStores(), f = this.host.entityArchetype(), g = this.host.entityRow(), _ = this.host.archetypes();
     for (let y = 0; y < u.length; y++) {
       const p = T(u[y]), m = w(p), C = f[m];
-      if (C === R) continue;
+      if (C === I) continue;
       const A = _[C], S = A.mask;
       if (!S.contains(e) || s !== null && S.overlaps(s) || n !== null && !S.overlaps(n)) continue;
-      let I = !0;
+      let R = !0;
       for (let E = 0; E < r.length; E++)
         if (!d[r[E]].has(m)) {
-          I = !1;
+          R = !1;
           break;
         }
-      if (I) {
+      if (R) {
         for (let E = 0; E < i.length; E++)
           if (d[i[E]].has(m)) {
-            I = !1;
+            R = !1;
             break;
           }
-        if (I) {
+        if (R) {
           if (!o) {
             const E = g[m];
-            if (E !== R && E >= A.enabledCount) continue;
+            if (E !== I && E >= A.enabledCount) continue;
           }
           h(p);
         }
@@ -1842,7 +1842,7 @@ class ds {
       (p) => d.push(p),
       c
     ), d.length === 0) return;
-    rt(
+    ot(
       d,
       this._hierarchyRadixOut,
       this._hierarchyRadixC0,
@@ -1958,7 +1958,7 @@ class fs {
         );
       t = this._highWater++, this._generations[t] = Lt, e = Lt, this._lengthView[0] = this._highWater;
     }
-    return this._aliveCount++, this.lastIndex = t, X(t, e);
+    return this._aliveCount++, this.lastIndex = t, J(t, e);
   }
   /** Pre-check that `count` fresh slots fit, so a bulk-spawn commits
    * all-or-nothing (#775): `alloc`'s own per-call guard would otherwise
@@ -2127,8 +2127,8 @@ function le(a, t) {
 }
 function _s(a) {
   const t = {};
-  for (let n = 0; n < at.length; n++) {
-    const r = at[n], i = a.view.getUint32(O[r.headerOff], !0);
+  for (let n = 0; n < lt.length; n++) {
+    const r = lt[n], i = a.view.getUint32(O[r.headerOff], !0);
     i !== 0 && r.readOptions(a.view, i, t);
   }
   const e = ne(a.view);
@@ -2150,8 +2150,8 @@ function _s(a) {
 }
 function gs(a) {
   const t = /* @__PURE__ */ new Map();
-  for (let n = 0; n < at.length; n++) {
-    const r = at[n], i = a.view.getUint32(O[r.headerOff], !0);
+  for (let n = 0; n < lt.length; n++) {
+    const r = lt[n], i = a.view.getUint32(O[r.headerOff], !0);
     if (i === 0) continue;
     const o = r.regionBytes(a.view, i);
     t.set(r.headerOff, new Uint8Array(a.buffer, i, o).slice());
@@ -2229,8 +2229,8 @@ function Es(a, t, e) {
   for (let p = 0; p < t.length; p++) {
     const m = t[p], C = a.archetypes.get(m.archetypeId), A = i.get(m.archetypeId);
     for (let S = 0; S < C.columnsInOrder.length; S++) {
-      const I = C.columnsInOrder[S], E = m.rowCount * I.stride;
-      E > 0 && c.copyWithin(A.columns[S].byteOff, I.byteOff, I.byteOff + E);
+      const R = C.columnsInOrder[S], E = m.rowCount * R.stride;
+      E > 0 && c.copyWithin(A.columns[S].byteOff, R.byteOff, R.byteOff + E);
     }
   }
   let l = e;
@@ -2444,18 +2444,18 @@ function Cs(a, t, e, s) {
     _reservedDescriptorBytes: a._reservedDescriptorBytes
   }, oldViewStamp: l, newViewStamp: d, viewsPreserved: !0 };
 }
-const It = 810766935, Rt = 1;
+const Rt = 810766935, It = 1;
 class k extends Error {
   constructor(t) {
     super(t), this.name = "ECSRestoreError";
   }
 }
-const j = 4;
+const W = 4;
 function Ss(a) {
-  const t = a.freeIndices.length, e = a.archetypeRows.length, s = j * (4 + t + 1 + e * 3), n = new Uint8Array(s), r = new DataView(n.buffer);
+  const t = a.freeIndices.length, e = a.archetypeRows.length, s = W * (4 + t + 1 + e * 3), n = new Uint8Array(s), r = new DataView(n.buffer);
   let i = 0;
   const o = (h) => {
-    r.setUint32(i, h, !0), i += j;
+    r.setUint32(i, h, !0), i += W;
   };
   o(a.tick), o(a.entityHighWater), o(a.entityAliveCount), o(t);
   for (let h = 0; h < t; h++) o(a.freeIndices[h]);
@@ -2466,7 +2466,7 @@ function Ss(a) {
   }
   return n;
 }
-function Is(a) {
+function Rs(a) {
   const t = new DataView(a.buffer, a.byteOffset, a.byteLength), e = a.byteLength;
   let s = 0;
   const n = (f) => {
@@ -2475,9 +2475,9 @@ function Is(a) {
         `host-state truncated: need ${f} more bytes at offset ${s}, have ${e - s}`
       );
   }, r = () => {
-    n(j);
+    n(W);
     const f = t.getUint32(s, !0);
-    return s += j, f;
+    return s += W, f;
   }, i = r(), o = r(), h = r(), c = r(), l = new Array(c);
   for (let f = 0; f < c; f++) l[f] = r();
   const u = r(), d = new Array(u);
@@ -2491,25 +2491,25 @@ function Is(a) {
     );
   return { tick: i, entityHighWater: o, entityAliveCount: h, freeIndices: l, archetypeRows: d };
 }
-function Rs(a, t, e) {
-  const s = j * 5, n = new Uint8Array(s + a.length + t.length + e.length), r = new DataView(n.buffer);
-  return r.setUint32(0, It, !0), r.setUint32(4, Rt, !0), r.setUint32(8, a.length, !0), r.setUint32(12, t.length, !0), r.setUint32(16, e.length, !0), n.set(a, s), n.set(t, s + a.length), n.set(e, s + a.length + t.length), n;
+function Is(a, t, e) {
+  const s = W * 5, n = new Uint8Array(s + a.length + t.length + e.length), r = new DataView(n.buffer);
+  return r.setUint32(0, Rt, !0), r.setUint32(4, It, !0), r.setUint32(8, a.length, !0), r.setUint32(12, t.length, !0), r.setUint32(16, e.length, !0), n.set(a, s), n.set(t, s + a.length), n.set(e, s + a.length + t.length), n;
 }
 function As(a) {
-  const t = j * 5;
+  const t = W * 5;
   if (a.byteLength < t)
     throw new k(
       `world snapshot too small: ${a.byteLength} bytes (frame header needs ${t})`
     );
   const e = new DataView(a.buffer, a.byteOffset, a.byteLength), s = e.getUint32(0, !0);
-  if (s !== It)
+  if (s !== Rt)
     throw new k(
-      `bad world-snapshot magic: 0x${s.toString(16).padStart(8, "0")} (expected 0x${It.toString(16).padStart(8, "0")}). A bare dense (SAB) snapshot is not a combined world snapshot — pass the bytes from ECS.snapshot(), not snapshotColumnStore().`
+      `bad world-snapshot magic: 0x${s.toString(16).padStart(8, "0")} (expected 0x${Rt.toString(16).padStart(8, "0")}). A bare dense (SAB) snapshot is not a combined world snapshot — pass the bytes from ECS.snapshot(), not snapshotColumnStore().`
     );
   const n = e.getUint32(4, !0);
-  if (n !== Rt)
+  if (n !== It)
     throw new k(
-      `incompatible world-snapshot version: snapshot=${n}, build=${Rt}`
+      `incompatible world-snapshot version: snapshot=${n}, build=${It}`
     );
   const r = e.getUint32(8, !0), i = e.getUint32(12, !0), o = e.getUint32(16, !0);
   if (t + r + i + o !== a.byteLength)
@@ -2524,19 +2524,19 @@ function As(a) {
   };
 }
 function Os(a, t, e) {
-  if (a.byteLength < it)
+  if (a.byteLength < ht)
     throw new k(
-      `dense section too small: ${a.byteLength} bytes (SAB header needs ${it})`
+      `dense section too small: ${a.byteLength} bytes (SAB header needs ${ht})`
     );
   const s = new DataView(a.buffer, a.byteOffset, a.byteLength), n = s.getUint32(O.magic, !0);
-  if (n !== ot)
+  if (n !== at)
     throw new k(
-      `dense section bad magic: 0x${n.toString(16).padStart(8, "0")} (expected SAB magic 0x${ot.toString(16).padStart(8, "0")})`
+      `dense section bad magic: 0x${n.toString(16).padStart(8, "0")} (expected SAB magic 0x${at.toString(16).padStart(8, "0")})`
     );
   const r = s.getUint32(O.sim_abi_version, !0);
-  if (r !== ht)
+  if (r !== ct)
     throw new k(
-      `dense section incompatible sim_abi_version: snapshot=${r}, build=${ht}`
+      `dense section incompatible sim_abi_version: snapshot=${r}, build=${ct}`
     );
   const i = Jt(s);
   if (i.layoutDescriptorOff < 0 || i.layoutDescriptorOff > a.byteLength)
@@ -2548,7 +2548,7 @@ function Os(a, t, e) {
     throw new k(
       `dense entityIndexOff ${o} is outside the section (${a.byteLength} bytes)`
     );
-  const h = s.getUint32(o + nt.capacity, !0);
+  const h = s.getUint32(o + it.capacity, !0);
   if (h !== e)
     throw new k(
       `entity-index capacity mismatch: live=${e}, snapshot=${h}`
@@ -2614,7 +2614,7 @@ class Ts {
    * different orders snapshot byte-for-byte the same (#470). The reverse index
    * is derived and never serialized — `restoreSparse` rebuilds it. */
   snapshotSparse() {
-    const t = Se(this.host.sparseStores()), e = Ie(this.host.relationStores()), s = new Uint8Array(8 + t.length + e.length), n = new DataView(s.buffer);
+    const t = Se(this.host.sparseStores()), e = Re(this.host.relationStores()), s = new Uint8Array(8 + t.length + e.length), n = new DataView(s.buffer);
     return n.setUint32(0, t.length, !0), n.setUint32(4, e.length, !0), s.set(t, 8), s.set(e, 8 + t.length), s;
   }
   /** Repopulate the sparse stores from `snapshotSparse` bytes, replacing all
@@ -2629,15 +2629,15 @@ class Ts {
   restoreSparse(t) {
     const e = new DataView(t.buffer, t.byteOffset, t.byteLength);
     if (t.byteLength < 8)
-      throw new J(
+      throw new et(
         `sparse snapshot truncated: need 8 header bytes, have ${t.byteLength}`
       );
     const s = e.getUint32(0, !0), n = e.getUint32(4, !0);
     if (8 + s + n !== t.byteLength)
-      throw new J(
+      throw new et(
         `sparse snapshot frame mismatch: header declares 8+${s}+${n}=${8 + s + n} bytes, buffer is ${t.byteLength}`
       );
-    Re(this.host.sparseStores(), t.subarray(8, 8 + s)), this.rebuildRelationIndices(t.subarray(8 + s, 8 + s + n));
+    Ie(this.host.sparseStores(), t.subarray(8, 8 + s)), this.rebuildRelationIndices(t.subarray(8 + s, 8 + s + n));
   }
   /** Rebuild every relation's derived side indices after the sparse stores have
    * been restored. `restoreRelations` resets all relations, rebuilds the multi
@@ -2646,7 +2646,7 @@ class Ts {
    * so it's rebuilt here from the backing sparse store: every member row holds
    * `(source index → target EntityID)`, which is exactly one reverse edge. */
   rebuildRelationIndices(t) {
-    const e = this.host.generations(), s = (r) => X(r, e[r]), n = this.host.relationStores();
+    const e = this.host.generations(), s = (r) => J(r, e[r]), n = this.host.relationStores();
     Ae(n, t, s);
     for (let r = 0; r < n.length; r++) n[r].rebuildReverseFromForward(s);
   }
@@ -2657,7 +2657,7 @@ class Ts {
   snapshot() {
     this.host.publishRowCounts();
     const t = new Uint8Array(Ze(this.host.columnStore())), e = this.snapshotSparse(), s = Ss(this.collectHostState());
-    return Rs(t, e, s);
+    return Is(t, e, s);
   }
   /** Gather the host-side state a snapshot carries alongside the dense + sparse
    * bytes — see `snapshot()`. The free-list is copied (it's a live mutable). */
@@ -2683,7 +2683,7 @@ class Ts {
    * ticking. Fails closed on a malformed frame or a registration mismatch
    * BEFORE any live state is touched. */
   restoreInto(t) {
-    const e = As(t), s = Is(e.host);
+    const e = As(t), s = Rs(e.host);
     Os(
       e.dense,
       this.host.columnStore().archetypes,
@@ -2703,12 +2703,12 @@ class Ts {
   assertSparseSectionMatches(t) {
     const e = new DataView(t.buffer, t.byteOffset, t.byteLength);
     if (t.byteLength < 8)
-      throw new J(
+      throw new et(
         `sparse snapshot truncated: need 8 header bytes, have ${t.byteLength}`
       );
     const s = e.getUint32(0, !0), n = e.getUint32(4, !0);
     if (8 + s + n !== t.byteLength)
-      throw new J(
+      throw new et(
         `sparse snapshot frame mismatch: header declares 8+${s}+${n}=${8 + s + n} bytes, buffer is ${t.byteLength}`
       );
     Oe(this.host.sparseStores(), t.subarray(8, 8 + s));
@@ -3252,7 +3252,7 @@ class Ls {
       s.generations,
       new Uint32Array(
         this._columnStore.buffer,
-        this._columnStore.header.entityIndexOff + nt.length,
+        this._columnStore.header.entityIndexOff + it.length,
         1
       )
     ), this._snapshots = new Ts(
@@ -3352,7 +3352,7 @@ class Ls {
     const t = this._columnStore.view.getUint32(O.entity_index_off, !0), e = Bt(this._columnStore.buffer, t, this._entityIndexCapacity);
     this.entityArchetype = e.archetypes, this.entityRow = e.rows, this.entityAllocator.replantViews(
       e.generations,
-      new Uint32Array(this._columnStore.buffer, t + nt.length, 1)
+      new Uint32Array(this._columnStore.buffer, t + it.length, 1)
     );
   }
   /** Centralised "SAB was just reallocated" handler. Refreshes the
@@ -3638,7 +3638,7 @@ class Ls {
   // =======================================================
   createEntity() {
     const t = this.entityAllocator.alloc(), e = this.entityAllocator.lastIndex;
-    return this.entityArchetype[e] = this.emptyArchetypeId, this.entityRow[e] = R, t;
+    return this.entityArchetype[e] = this.emptyArchetypeId, this.entityRow[e] = I, t;
   }
   // =======================================================
   // Template / direct-spawn (#462)
@@ -3691,7 +3691,7 @@ class Ls {
           b.COMPONENT_NOT_REGISTERED,
           `template: component ${c} is not registered`
         );
-      const u = t[h].values ?? z, d = n._colOffset[c];
+      const u = t[h].values ?? Y, d = n._colOffset[c];
       for (let f = 0; f < l.fieldNames.length; f++) {
         const g = l.fieldNames[f];
         r[d + f] = u[g] ?? 0, i.set(g, i.has(g) ? jt : d + f);
@@ -3734,7 +3734,7 @@ class Ls {
     s.materializesRows && s.ensureRowCapacity(1);
     const n = this._allocEntity(), r = this.entityAllocator.lastIndex;
     if (!s.materializesRows)
-      return this.entityArchetype[r] = t.archetypeId, this.entityRow[r] = R, n;
+      return this.entityArchetype[r] = t.archetypeId, this.entityRow[r] = I, n;
     const i = s.length, o = s.enabledCount, h = s.addEntityWithValues(n, t.flatValues, this._tick, this.entityRow);
     return e !== void 0 && this._applyOverrides(s, h, t, e), this.entityArchetype[r] = t.archetypeId, this.entityRow[r] = h, this._onArchGrow(s, i, o), n;
   }
@@ -3755,7 +3755,7 @@ class Ls {
     if (!n.materializesRows) {
       for (let d = 0; d < e; d++) {
         const f = w(r[d]);
-        o[f] = t.archetypeId, h[f] = R;
+        o[f] = t.archetypeId, h[f] = I;
       }
       return r;
     }
@@ -3809,11 +3809,11 @@ class Ls {
    * must have already confirmed `id` is alive. */
   _destroyOne(t, e) {
     const s = w(t), n = this.entityRow[s];
-    if (n !== R) {
+    if (n !== I) {
       const r = this.archGet(this.entityArchetype[s]), i = r.length;
       r.removeRow(n, this.entityRow), this._onArchLenChange(r, i);
     }
-    this.entityArchetype[s] = R, this.entityRow[s] = R, this.relationService.count > 0 && (this.relationService.purgeSource(t), e !== null && this.relationService.cleanupTarget(t, e)), this.sparseStores.length > 0 && this._purgeSparse(s), this._anyDirtyTracked && this._clearDirtyForIndex(s), this.entityAllocator.recycle(s, $t(t));
+    this.entityArchetype[s] = I, this.entityRow[s] = I, this.relationService.count > 0 && (this.relationService.purgeSource(t), e !== null && this.relationService.cleanupTarget(t, e)), this.sparseStores.length > 0 && this._purgeSparse(s), this._anyDirtyTracked && this._clearDirtyForIndex(s), this.entityAllocator.recycle(s, $t(t));
   }
   /**
    * Liveness check, **fail-closed** against forged / retired / out-of-bounds
@@ -3923,7 +3923,7 @@ class Ls {
     if (!this.isAlive(t))
       return;
     const e = w(t), s = this.entityRow[e];
-    if (s === R)
+    if (s === I)
       return;
     const n = this.archGet(this.entityArchetype[e]);
     if (s >= n.enabledCount) return;
@@ -3935,7 +3935,7 @@ class Ls {
     if (!this.isAlive(t))
       return;
     const e = w(t), s = this.entityRow[e];
-    if (s === R) return;
+    if (s === I) return;
     const n = this.archGet(this.entityArchetype[e]);
     if (s < n.enabledCount) return;
     const r = n.enabledCount;
@@ -3947,7 +3947,7 @@ class Ls {
     if (!this.isAlive(t))
       return !1;
     const e = w(t), s = this.entityRow[e];
-    if (s === R) return !1;
+    if (s === I) return !1;
     const n = this.archGet(this.entityArchetype[e]);
     return s >= n.enabledCount;
   }
@@ -4039,7 +4039,7 @@ class Ls {
    * nothing and is skipped. */
   _collectToggle(t, e) {
     const s = w(t);
-    if (this.entityRow[s] === R) return;
+    if (this.entityRow[s] === I) return;
     const n = this.archGet(this.entityArchetype[s]);
     this._collectToggleEid = t, n.mask.forEach(e ? this._collectDisableBit : this._collectEnableBit);
   }
@@ -4076,11 +4076,11 @@ class Ls {
       const y = t[_], p = y & V, m = y >> pt;
       if (p >= o || r[p] !== m) continue;
       const C = n[p];
-      if (C !== R) {
+      if (C !== I) {
         const A = i[s[p]];
         g && (this._collectDestroyEid = y, A.mask.forEach(this._collectDestroyRemoveBit)), A.removeRow(C, n), h = !0, A.length === 0 && (c = !0);
       }
-      u && this.relationService.purgeSource(y), d && this.relationService.cleanupTarget(y, t), l && this._purgeSparse(p), f && this._clearDirtyForIndex(p), s[p] = R, n[p] = R, e.recycle(p, m);
+      u && this.relationService.purgeSource(y), d && this.relationService.cleanupTarget(y, t), l && this._purgeSparse(p), f && this._clearDirtyForIndex(p), s[p] = I, n[p] = I, e.recycle(p, m);
     }
     t.length = 0, h && (this._rowCountsDirty = !0, c && this._queryDirtyEpoch++);
   }
@@ -4088,7 +4088,7 @@ class Ls {
     return this._deferred.destroyCount;
   }
   addComponentDeferred(t, e, s) {
-    this._deferred.queueAdd(t, e, s ?? z);
+    this._deferred.queueAdd(t, e, s ?? Y);
   }
   removeComponentDeferred(t, e) {
     this._deferred.queueRemove(t, e);
@@ -4107,25 +4107,25 @@ class Ls {
     for (let y = 0; y < n; y++) {
       const p = t[y], m = p & V, C = p >> pt;
       if (m >= l || o[m] !== C) continue;
-      const A = r[m], S = e[y].id, I = h[A], E = c[S];
-      if (I.mask.has(S)) {
-        E.fieldNames.length > 0 && I.writeFields(i[m], S, s[y], u);
+      const A = r[m], S = e[y].id, R = h[A], E = c[S];
+      if (R.mask.has(S)) {
+        E.fieldNames.length > 0 && R.writeFields(i[m], S, s[y], u);
         continue;
       }
-      const N = this.archResolveAdd(A, S), D = h[N], H = i[m], Mt = !D.hasColumns && !I.hasColumns;
-      H !== R && I._flushSeenEpoch !== d && (I._flushSeenEpoch = d, I._flushPreLen = I.length, I._flushPreEnabled = I.enabledCount, f.push(I)), D._flushSeenEpoch !== d && (D._flushSeenEpoch = d, D._flushPreLen = D.length, D._flushPreEnabled = D.enabledCount, f.push(D));
-      let Z;
-      if (H !== R) {
+      const N = this.archResolveAdd(A, S), D = h[N], H = i[m], Mt = !D.hasColumns && !R.hasColumns;
+      H !== I && R._flushSeenEpoch !== d && (R._flushSeenEpoch = d, R._flushPreLen = R.length, R._flushPreEnabled = R.enabledCount, f.push(R)), D._flushSeenEpoch !== d && (D._flushSeenEpoch = d, D._flushPreLen = D.length, D._flushPreEnabled = D.enabledCount, f.push(D));
+      let tt;
+      if (H !== I) {
         if (Mt)
-          D.moveEntityFromTag(I, H, p, i);
+          D.moveEntityFromTag(R, H, p, i);
         else {
-          const fe = I.getEdge(S);
-          D.moveEntityFrom(I, H, p, fe.addMap, u, i);
+          const fe = R.getEdge(S);
+          D.moveEntityFrom(R, H, p, fe.addMap, u, i);
         }
-        Z = x[0];
+        tt = x[0];
       } else
-        Z = Mt ? D.addEntityTag(p, i) : D.addEntity(p, i);
-      E.fieldNames.length > 0 && D.writeFields(Z, S, s[y], u), r[m] = N, i[m] = Z, g && E.obsAdd && (_.addComp[_.addLen] = S, _.addEid[_.addLen] = p, _.addLen++);
+        tt = Mt ? D.addEntityTag(p, i) : D.addEntity(p, i);
+      E.fieldNames.length > 0 && D.writeFields(tt, S, s[y], u), r[m] = N, i[m] = tt, g && E.obsAdd && (_.addComp[_.addLen] = S, _.addEid[_.addLen] = p, _.addLen++);
     }
     t.length = 0, e.length = 0, s.length = 0, this._settleFlushDirty();
   }
@@ -4137,14 +4137,14 @@ class Ls {
       if (p >= h || i[p] !== m) continue;
       const C = n[p], A = e[_].id, S = o[C];
       if (!S.mask.has(A)) continue;
-      const I = this.archResolveRemove(C, A), E = o[I], N = r[p], D = !E.hasColumns && !S.hasColumns;
+      const R = this.archResolveRemove(C, A), E = o[R], N = r[p], D = !E.hasColumns && !S.hasColumns;
       if (S._flushSeenEpoch !== l && (S._flushSeenEpoch = l, S._flushPreLen = S.length, S._flushPreEnabled = S.enabledCount, u.push(S)), E._flushSeenEpoch !== l && (E._flushSeenEpoch = l, E._flushPreLen = E.length, E._flushPreEnabled = E.enabledCount, u.push(E)), D)
         E.moveEntityFromTag(S, N, y, r);
       else {
         const H = S.getEdge(A);
         E.moveEntityFrom(S, N, y, H.removeMap, c, r);
       }
-      n[p] = I, r[p] = x[0], f && d[A].obsRem && (g.remComp[g.remLen] = A, g.remEid[g.remLen] = y, g.remLen++);
+      n[p] = R, r[p] = x[0], f && d[A].obsRem && (g.remComp[g.remLen] = A, g.remEid[g.remLen] = y, g.remLen++);
     }
     t.length = 0, e.length = 0, this._settleFlushDirty();
   }
@@ -4263,11 +4263,11 @@ class Ls {
   // Component registration
   // =======================================================
   registerComponent(t, e) {
-    if (this.componentCount >= tt)
+    if (this.componentCount >= st)
       throw new v(
         b.COMPONENT_LIMIT_EXCEEDED,
-        `Cannot register more than ${tt} components: the SAB archetype descriptor mask is ${tt} bits wide. Widen the descriptor mask (descriptor.ts + abi.zig, a SIM_ABI_VERSION bump) to raise it.`,
-        { componentCount: this.componentCount, limit: tt }
+        `Cannot register more than ${st} components: the SAB archetype descriptor mask is ${st} bits wide. Widen the descriptor mask (descriptor.ts + abi.zig, a SIM_ABI_VERSION bump) to raise it.`,
+        { componentCount: this.componentCount, limit: st }
       );
     const s = Object.keys(t), n = new Array(s.length), r = /* @__PURE__ */ Object.create(null);
     for (let h = 0; h < s.length; h++)
@@ -4352,7 +4352,7 @@ class Ls {
   /** Add (or overwrite) a sparse component on an entity. No archetype
    * transition, no row copy — the entity's `archetype_id` is unchanged. */
   addSparse(t, e, s) {
-    this.isAlive(t) && this.sparseStoreOf(e).setRow(w(t), s ?? z);
+    this.isAlive(t) && this.sparseStoreOf(e).setRow(w(t), s ?? Y);
   }
   /** Remove a sparse component from an entity. No-op if absent. */
   removeSparse(t, e) {
@@ -4466,7 +4466,7 @@ class Ls {
       e[s].isBufferBacked && e[s].refreshViews(this._columnStore);
     this.entityAllocator.setHighWater(
       t.view.getUint32(
-        t.header.entityIndexOff + nt.length,
+        t.header.entityIndexOff + it.length,
         !0
       )
     ), this._handleBufferResized();
@@ -4481,11 +4481,11 @@ class Ls {
     const e = this.entityAllocator.highWater, s = this.entityArchetype, n = this.entityRow, r = this.entityAllocator.generations, i = /* @__PURE__ */ new Map();
     for (let o = 0; o < e; o++) {
       const h = s[o];
-      if (h === R) continue;
+      if (h === I) continue;
       const c = n[o];
-      if (c === R) continue;
+      if (c === I) continue;
       let l = i.get(h);
-      l === void 0 && (l = [], i.set(h, l)), l[c] = X(o, r[o]);
+      l === void 0 && (l = [], i.set(h, l)), l[c] = J(o, r[o]);
     }
     for (let o = 0; o < t.archetypeRows.length; o++) {
       const h = t.archetypeRows[o], c = this.archGet(h.archetypeId), l = i.get(h.archetypeId) ?? [];
@@ -4604,14 +4604,14 @@ class Ls {
           }
         if (!C) continue;
         const A = g[m];
-        if (A === R) continue;
-        const S = y[A], I = S.mask;
-        if (I.contains(t) && !(e !== null && I.overlaps(e)) && !(s !== null && !I.overlaps(s))) {
+        if (A === I) continue;
+        const S = y[A], R = S.mask;
+        if (R.contains(t) && !(e !== null && R.overlaps(e)) && !(s !== null && !R.overlaps(s))) {
           if (!h) {
             const E = _[m];
-            if (E !== R && E >= S.enabledCount) continue;
+            if (E !== I && E >= S.enabledCount) continue;
           }
-          o(X(m, f[m]));
+          o(J(m, f[m]));
         }
       }
       return;
@@ -4666,7 +4666,7 @@ class Ls {
     }
     const o = this.archResolveAdd(r, e.id), h = this.archGet(o), c = this.entityRow[n];
     let l;
-    if (c !== R) {
+    if (c !== I) {
       const u = i.length, d = h.length, f = h.enabledCount, g = i.getEdge(e.id);
       !h.hasColumns && !i.hasColumns ? h.moveEntityFromTag(i, c, t, this.entityRow) : h.moveEntityFrom(
         i,
@@ -4687,6 +4687,28 @@ class Ls {
       this._tick
     ), this.entityArchetype[n] = o, this.entityRow[n] = l;
   }
+  /** Add multiple components in one transition (resolves final archetype, then moves once).
+   *
+   * Final-mask resolve, not graph walk. The previous implementation called
+   * `archResolveAdd` once per entry, which threaded through every
+   * intermediate archetype on the path — and each unseen intermediate
+   * triggered a fresh `extendColumnStore` even though no entity ever lived
+   * there. Computing the union mask up front and resolving once via
+   * `archGetOrCreateFromMask` collapses N-1 intermediate-archetype
+   * creations into zero for the batched case (#211 follow-up). The lazy
+   * single-mask path remains the same; this just avoids feeding it
+   * archetypes the entity never visits.
+   *
+   * #659 — composite-add edge cache. The final-mask resolve, unlike the
+   * single-add `edges[]` walk, re-pays a per-call `mask.hash()`, `ArchetypeGraph.lookup`
+   * (the Map-of-buckets + `equals` scan), and `getBatchTransitionMap` on
+   * every call — a ~2× gap vs a cached edge walk that the decomposition probe
+   * pinned on the two `Map.get`s, not the hash. So a repeated (source, added-
+   * set) add now resolves through `currentArch`'s composite-add cache: one
+   * `Map.get` on an exact packed key yields the target + transition map, and we
+   * skip the union-mask build entirely. First call per key still resolves via
+   * the final-mask path below (no intermediate planting) and plants the edge.
+   * See docs/reports/bench/regressions/add-components-composite-edge.md. */
   addComponents(t, e) {
     if (!this.isAlive(t))
       return;
@@ -4726,7 +4748,7 @@ class Ls {
         r.writeFields(
           d,
           e[f].def.id,
-          e[f].values ?? z,
+          e[f].values ?? Y,
           this._tick
         );
       return;
@@ -4751,7 +4773,7 @@ class Ls {
   _addComponentsInto(t, e, s, n, r, i, o) {
     const h = this.entityRow[e];
     let c;
-    if (h !== R) {
+    if (h !== I) {
       const l = s.length, u = n.length, d = n.enabledCount;
       n.moveEntityFrom(
         s,
@@ -4769,7 +4791,7 @@ class Ls {
       n.writeFields(
         c,
         o[l].def.id,
-        o[l].values ?? z,
+        o[l].values ?? Y,
         this._tick
       );
     this.entityArchetype[e] = r, this.entityRow[e] = c;
@@ -4869,7 +4891,7 @@ class Ls {
       const _ = s.entityIds;
       for (let y = 0; y < h; y++) {
         const p = w(_[y]);
-        l[p] = r, u[p] = R;
+        l[p] = r, u[p] = I;
       }
       s.clearRows(), this._onArchLenChange(s, c);
       return;
@@ -5140,7 +5162,7 @@ class Fs {
    * @example
    * const GameTime = resourceKey<{ elapsed: number }>("GameTime");
    * ecs.resources.register(GameTime, { elapsed: 0 });
-   * ecs.resources.get(GameTime).elapsed; // or ctx.resource(GameTime) inside a system
+   * ecs.resources.get(GameTime).elapsed; // or ctx.getResource(GameTime) inside a system
    */
   register(t, e) {
     this.store.registerResource(t, e);
@@ -5280,10 +5302,10 @@ class Gs {
   }
 }
 const Yt = Object.freeze([]), Ps = Object.freeze([]), Qt = Object.freeze([]), Kt = Number.POSITIVE_INFINITY;
-function Q(a, t) {
+function X(a, t) {
   return (a << 16 | t) >>> 0;
 }
-function st(a, t) {
+function rt(a, t) {
   for (let e = 0; e < a.length; e++)
     if (a[e] === t) return a;
   return [...a, t];
@@ -5401,7 +5423,7 @@ class F {
       );
   }
   /** Whether this query carries only dense terms — the precondition for the
-   * archetype-walk fast paths (`count`, `firstEntity`, `singleEntity`). */
+   * archetype-walk fast paths (`entityCount`, `firstEntity`, `singleEntity`). */
   _isDenseOnly() {
     return this._sparseInclude.length === 0 && this._sparseExclude.length === 0 && this._relationIncludes.length === 0 && this._relationExcludes.length === 0 && this._hierarchy === null;
   }
@@ -5545,10 +5567,10 @@ class F {
    * the resolver's shared single-term map. Both the single- and multi-arg public
    * forms fold over this, so all sparse-require composition is deduplicated. */
   _withSparseOne(t) {
-    const e = Q(this._id, t), s = this._resolver._caches.withSparseSingle, n = s.get(e);
+    const e = X(this._id, t), s = this._resolver._caches.withSparseSingle, n = s.get(e);
     if (n !== void 0) return n;
     const r = this._deriveSparse(
-      st(this._sparseInclude, t),
+      rt(this._sparseInclude, t),
       this._sparseExclude
     );
     return s.set(e, r), r;
@@ -5564,11 +5586,11 @@ class F {
   /** One-id `withoutSparse` composition, cached on `(parent_id, sparseId)`. The
    * multi-arg form folds over this (#497) — mirrors `_withSparseOne`. */
   _withoutSparseOne(t) {
-    const e = Q(this._id, t), s = this._resolver._caches.withoutSparseSingle, n = s.get(e);
+    const e = X(this._id, t), s = this._resolver._caches.withoutSparseSingle, n = s.get(e);
     if (n !== void 0) return n;
     const r = this._deriveSparse(
       this._sparseInclude,
-      st(this._sparseExclude, t)
+      rt(this._sparseExclude, t)
     );
     return s.set(e, r), r;
   }
@@ -5613,10 +5635,10 @@ class F {
     return e;
   }
   _withRelationOne(t) {
-    const e = Q(this._id, t), s = this._resolver._caches.withRelationSingle, n = s.get(e);
+    const e = X(this._id, t), s = this._resolver._caches.withRelationSingle, n = s.get(e);
     if (n !== void 0) return n;
     const r = this._resolver._relationBackingSparseId(t), i = this._deriveRelation(
-      st(this._sparseInclude, r),
+      rt(this._sparseInclude, r),
       this._sparseExclude,
       Xt(this._relationIncludes, t),
       this._relationExcludes
@@ -5633,11 +5655,11 @@ class F {
     return e;
   }
   _withoutRelationOne(t) {
-    const e = Q(this._id, t), s = this._resolver._caches.withoutRelationSingle, n = s.get(e);
+    const e = X(this._id, t), s = this._resolver._caches.withoutRelationSingle, n = s.get(e);
     if (n !== void 0) return n;
     const r = this._resolver._relationBackingSparseId(t), i = this._deriveRelation(
       this._sparseInclude,
-      st(this._sparseExclude, r),
+      rt(this._sparseExclude, r),
       this._relationIncludes,
       Xt(this._relationExcludes, t)
     );
@@ -5687,7 +5709,7 @@ class F {
    * `not` / `anyOf`). Returns a new query; the unbounded form is cached. */
   hierarchy(t, e = Kt) {
     if (e === Kt) {
-      const s = Q(this._id, t), n = this._resolver._caches.hierarchySingle, r = n.get(s);
+      const s = X(this._id, t), n = this._resolver._caches.hierarchySingle, r = n.get(s);
       if (r !== void 0) return r;
       const i = this._deriveHierarchy({ relation: t, maxDepth: e });
       return n.set(s, i), i;
@@ -5722,9 +5744,9 @@ class F {
    * outside a system `checkRelationRead` is a no-op. */
   _checkRelationAccess() {
     for (let t = 0; t < this._relationIncludes.length; t++)
-      ct.checkRelationRead(this._relationIncludes[t]);
+      ut.checkRelationRead(this._relationIncludes[t]);
     for (let t = 0; t < this._relationExcludes.length; t++)
-      ct.checkRelationRead(this._relationExcludes[t]);
+      ut.checkRelationRead(this._relationExcludes[t]);
   }
   /** Iterate every source related to `target` under **any** relation — the
    * `(*, T)` wildcard (#579) — intersected with this query's dense + sparse +
@@ -6092,8 +6114,8 @@ class qs {
   spawn(...t) {
     const e = this.store.createEntity();
     for (let s = 0; s < t.length; s++) {
-      const n = lt(t[s]);
-      this.store.addComponentDeferred(e, n, ut(t[s]));
+      const n = j(t[s]);
+      this.store.addComponentDeferred(e, n, z(t[s]));
     }
     return e;
   }
@@ -6103,8 +6125,8 @@ class qs {
       return this.store.addComponentDeferred(t, s, e[1]), this;
     }
     for (let s = 0; s < e.length; s++) {
-      const n = e[s], r = lt(n);
-      this.store.addComponentDeferred(t, r, ut(n));
+      const n = e[s], r = j(n);
+      this.store.addComponentDeferred(t, r, z(n));
     }
     return this;
   }
@@ -6330,7 +6352,12 @@ class js {
   // =======================================================
   // Resources
   // =======================================================
-  resource(t) {
+  /** Read a resource (declared in `resourceReads`). The flat `ctx` surface verbs
+   * its accessors — `getResource`/`setResource`/`removeResource`/`hasResource`,
+   * matching `getField`/`setField`/`hasComponent`. The grouped `ecs.resources`
+   * facade drops the noun (`get`/`set`/`remove`/`has`) because its receiver
+   * already names it. */
+  getResource(t) {
     return T(this.store.getResource(t));
   }
   setResource(t, e) {
@@ -6647,36 +6674,56 @@ class sn {
   }
   /**
    * Spawn an entity from varargs bundles (§bundles) — the immediate
-   * host-side analog of `ctx.commands.spawn`. `ecs.spawnBundle(bundle(Pos,{x,y}),
-   * bundle(Vel,{vx:1}), IsEnemy)` collapses the five attach shapes into one. Each
-   * bundle is applied immediately; a single combined-archetype insertion (one
-   * transition instead of one-per-component) is a later optimization — for the
-   * prototype this mirrors the existing per-component `addComponent` path.
+   * host-side analog of `ctx.commands.spawn`, and the same callable-bundle
+   * grammar as `addComponents` / `template`. `ecs.spawnBundle(Pos({x,y}),
+   * Vel({vx:1}), IsEnemy)` collapses the attach shapes into one; each item is
+   * checked against its own def's schema (`StrictBundles`). Bundles are applied
+   * immediately; a single combined-archetype insertion (one transition instead
+   * of one-per-component) is a later optimization — for now this mirrors the
+   * per-component `addComponent` path (unlike `addComponents`, which batches).
+   *
+   * Immediate — inside a system use the deferred `ctx.commands.spawn(...)`
+   * (calling this from a system body throws in DEV). Note the redirect trades
+   * timing: `commands.spawn` returns the id now but defers the attaches to the
+   * phase flush, so the entity sits in its empty/partial archetype until then —
+   * unlike `spawnBundle`'s immediate, fully-populated archetype.
    */
   spawnBundle(...t) {
     const e = this.store.createEntity();
     for (let s = 0; s < t.length; s++) {
-      const n = lt(t[s]);
-      this.store.addComponent(e, n, ut(t[s]));
+      const n = t[s], r = j(n);
+      this.store.addComponent(e, r, z(n));
     }
     return e;
   }
+  /** Bulk-spawn `count` entities from `template`, optionally applying one
+   * shared `overrides` object to every spawned row (same typed keys as
+   * `spawn`). Field writes are O(columns) (one `TypedArray.fill` per
+   * column), not O(count×columns). Returns the new ids in spawn order.
+   * Immediate — inside a system use `ctx.commands.spawn` per entity (calling
+   * this from a system body throws in DEV). */
+  spawnMany(t, e, s) {
+    return this.store.spawnMany(t, e, s);
+  }
   /** DEV-only: throw when an *immediate* host structural mutator is called
    * from inside one of THIS world's system bodies (or an observer / onAdded
    * hook — they run in the same access spans). One rule for every host
-   * mutator, not just despawn: an immediate structural op mid-schedule can
-   * move or swap rows a running query is walking, and it is invisible to
-   * observers. The archetype-level `_iterDepth` guard only catches mutations
-   * touching the archetype currently being iterated — an op landing elsewhere
-   * would silently skip observers, so the receiver rule ("inside a system,
-   * use ctx.commands") is enforced wholesale here.
+   * structural mutator — despawn, add/remove(Components), batchAdd/Remove,
+   * disable/enable, AND the spawn family (spawn/spawnBundle/spawnMany): an
+   * immediate structural op mid-schedule can move or swap rows a running query
+   * is walking — or, for a spawn-append into that archetype, trip a column
+   * realloc under it — and it is invisible to observers. The archetype-level
+   * `_iterDepth` guard only catches mutations touching the archetype currently
+   * being iterated (and the append paths skip even that), so an op landing
+   * elsewhere would silently skip observers; the receiver rule ("inside a
+   * system, use ctx.commands") is enforced wholesale here.
    *
    * `_updating` scopes the guard to THIS world: the accessCheck slot is
    * process-global, so without it a system of world A mutating world B (a
    * supported #785 pattern — B is not mid-iteration) would false-throw. */
   _assertHostMutationOutsideSystem(t, e) {
-    if (this._updating && ct.current() !== null) {
-      const s = ct.current(), n = s.name ?? `system_${s.id}`;
+    if (this._updating && ut.current() !== null) {
+      const s = ut.current(), n = s.name ?? `system_${s.id}`;
       throw new v(
         b.ACCESS_UNDECLARED,
         `ecs.${t} called from inside system '${n}' — host ${t} is immediate and unsafe mid-iteration (and invisible to observers); use ${e} instead`,
@@ -6691,7 +6738,7 @@ class sn {
    *  a system body throws in DEV, since an immediate destroy mid-iteration
    *  can invalidate rows the running query is walking. */
   despawn(t) {
-    this.store.destroyEntity(t);
+    return this.store.destroyEntity(t), this;
   }
   // --- Entity enable/disable (#577) ---
   // A disabled entity keeps its components, relations, sparse data, and stable
@@ -6703,29 +6750,37 @@ class sn {
   // in-flight `forEach` over that archetype). A disabled entity must hold at
   // least one component (a component-less entity has no archetype row to
   // partition).
-  /** Disable `id` (idempotent). Excluded from default queries until re-enabled. */
+  /** Disable `entityId` (idempotent). Excluded from default queries until re-enabled. */
   disable(t) {
     return this.store.disableEntity(t), this;
   }
-  /** Re-enable a disabled `id` (idempotent). */
+  /** Re-enable a disabled `entityId` (idempotent). */
   enable(t) {
     return this.store.enableEntity(t), this;
   }
   addComponent(t, e, s) {
-    const n = lt(e);
-    return this.store.addComponent(t, n, s ?? ut(e)), this;
-  }
-  /** Batch-attach several components in one archetype transition. Each
-   * entry's `values` is checked against its own def's schema (a misspelled
-   * field is a compile error; tags refuse `values`) — same typing as
-   * `ECS.template` entries. Omitted fields zero-fill. */
-  addComponents(t, e) {
-    return this.store.addComponents(t, e), this;
+    const n = j(e);
+    return this.store.addComponent(t, n, s ?? z(e)), this;
+  }
+  /** Batch-attach several components in one archetype transition. Takes the
+   * same callable-bundle varargs as `spawnBundle` — `world.addComponents(e,
+   * Pos({ x, y }), Vel({ vx }), Frozen)` — each item checked against its own
+   * def's schema (a misspelled or cross-component field is a compile error;
+   * tags refuse values). Omitted fields zero-fill. */
+  addComponents(t, ...e) {
+    const s = [];
+    for (let n = 0; n < e.length; n++) {
+      const r = e[n];
+      s.push({ def: j(r), values: z(r) });
+    }
+    return this.store.addComponents(t, s), this;
   }
   removeComponent(t, e) {
     return this.store.removeComponent(t, e), this;
   }
-  removeComponents(t, e) {
+  /** Detach several components in one archetype transition — the varargs
+   * mirror of `addComponents` (bare defs; removing needs no values). */
+  removeComponents(t, ...e) {
     return this.store.removeComponents(t, e), this;
   }
   batchAddComponent(t, e, s) {
@@ -6848,7 +6903,7 @@ class sn {
     return this.systems.add(r), r;
   }
   removeSystem(t) {
-    this.schedule.removeSystem(t), t.onRemoved?.(), this.systems.delete(t);
+    return this.schedule.removeSystem(t), t.onRemoved?.(), this.systems.delete(t), this;
   }
   get systemCount() {
     return this.systems.size;
@@ -6926,6 +6981,30 @@ class sn {
       t.dispose?.(), t.onRemoved?.();
     this.systems.clear(), this.schedule.clear();
   }
+  /** Register an archetype template (#462). Resolves the component set +
+   * default field values to a target archetype once (creating it if absent —
+   * fits the prewarm model), so later `spawn` / `spawnMany` calls land
+   * entities directly in that archetype with **zero archetype transitions**.
+   *
+   *   const Bullet = ecs.template(Position({ x: 0, y: 0 }), Velocity({ vx: 0, vy: 0 }));
+   *
+   * Takes the same callable-bundle varargs as `spawnBundle` / `addComponents`
+   * (each item schema-checked against its own def); the resulting
+   * `Template<[Position, Velocity]>` keeps the typed key set that `spawn`'s
+   * `overrides` map over. Not a pass-through — it normalizes bundles to the
+   * store's entry shape, so it lives here with the other real logic, not in the
+   * delegation band. The big win is multi-component entities and bulk spawns; a
+   * single-component spawn is no faster than `spawn` + `addComponent`, which
+   * already bump-allocates a fresh entity into the target archetype. See
+   * ADR-0010. */
+  template(...t) {
+    const e = [];
+    for (let s = 0; s < t.length; s++) {
+      const n = t[s];
+      e.push({ def: j(n), values: z(n) });
+    }
+    return this.store.resolveTemplate(e);
+  }
   // ============================================================================
   // === BEGIN STORE PASS-THROUGH BAND ===
   //
@@ -6994,30 +7073,6 @@ class sn {
   registerSparseTag() {
     return this.store.registerSparseComponent({});
   }
-  /** Register an archetype template (#462). Resolves the component set +
-   * default field values to a target archetype once (creating it if absent —
-   * fits the prewarm model), so later `spawn` / `spawnMany` calls land
-   * entities directly in that archetype with **zero archetype transitions**.
-   *
-   *   const Bullet = ecs.template([
-   *     { def: Position, values: { x: 0, y: 0 } },
-   *     { def: Velocity, values: { vx: 0, vy: 0 } },
-   *   ]);
-   *
-   * The big win is multi-component entities and bulk spawns; a single-
-   * component spawn is no faster than `spawn` + `addComponent`, which
-   * already bump-allocates a fresh entity into the target archetype. See
-   * ADR-0010. */
-  template(t) {
-    return this.store.resolveTemplate(t);
-  }
-  /** Bulk-spawn `count` entities from `template`, optionally applying one
-   * shared `overrides` object to every spawned row (same typed keys as
-   * `spawn`). Field writes are O(columns) (one `TypedArray.fill` per
-   * column), not O(count×columns). Returns the new ids in spawn order. */
-  spawnMany(t, e, s) {
-    return this.store.spawnMany(t, e, s);
-  }
   isAlive(t) {
     return this.store.isAlive(t);
   }
@@ -7027,7 +7082,7 @@ class sn {
   hasComponent(t, e) {
     return this.store.hasComponent(t, e);
   }
-  /** Whether `id` is currently disabled. Toggle via `disable` / `enable`
+  /** Whether `entityId` is currently disabled. Toggle via `disable` / `enable`
    * (immediate, above the band — they carry the in-system dev guard). */
   isDisabled(t) {
     return this.store.isDisabled(t);
@@ -7189,7 +7244,7 @@ function nn(a, t) {
   return {
     name: `runIfResourceEq(${a.description ?? "?"})`,
     resourceReads: [a],
-    evaluate: (e) => e.resource(a) === t
+    evaluate: (e) => e.getResource(a) === t
   };
 }
 function rn(a, t = 0) {
@@ -7278,21 +7333,21 @@ class ln {
     };
   }
 }
-const K = "__component_def";
+const Z = "__component_def";
 function un(a) {
   return JSON.stringify(a, (t, e) => {
     if (typeof e == "function" && "id" in e)
-      return { [K]: e.id };
-    if (e !== null && typeof e == "object" && K in e)
+      return { [Z]: e.id };
+    if (e !== null && typeof e == "object" && Z in e)
       throw new v(
         b.COMMAND_LOG_TAG_COLLISION,
-        `Cannot serialize the command log: a value object owns a field named "${K}", the reserved tag the serializer uses for component defs. Rename that component field so the log can round-trip losslessly.`
+        `Cannot serialize the command log: a value object owns a field named "${Z}", the reserved tag the serializer uses for component defs. Rename that component field so the log can round-trip losslessly.`
       );
     return e;
   });
 }
 function dn(a) {
-  return JSON.parse(a, (t, e) => e !== null && typeof e == "object" && K in e ? he(oe(e[K])) : e);
+  return JSON.parse(a, (t, e) => e !== null && typeof e == "object" && Z in e ? he(oe(e[Z])) : e);
 }
 function fn(a, t, e, s) {
   for (const i of e.startup) t.push(i);
@@ -7464,7 +7519,7 @@ function yn(a, t) {
 function mn(a) {
   return T(Symbol(a));
 }
-const wn = "0.5.0";
+const wn = "0.5.2";
 export {
   bn as ANY_RELATION,
   U as ChangedQuery,
@@ -7474,7 +7529,7 @@ export {
   v as ECSError,
   k as ECSRestoreError,
   b as ECS_ERROR,
-  Rt as ECS_SNAPSHOT_VERSION,
+  It as ECS_SNAPSHOT_VERSION,
   _n as FrameStepper,
   pn as FrameTraceRecorder,
   Kt as HIERARCHY_UNBOUNDED,
@@ -7484,18 +7539,18 @@ export {
   Vs as QueryBuilder,
   Sn as SCHEDULE,
   xn as SabUnavailableError,
-  J as SparseRestoreError,
-  W as StoreRestoreError,
+  et as SparseRestoreError,
+  Q as StoreRestoreError,
   js as SystemContext,
   wn as VERSION,
   an as allOf,
   cn as anyOf,
-  In as applyHostCommand,
+  Rn as applyHostCommand,
   Js as bundle,
   dn as deserializeCommandLog,
   tn as eventKey,
   w as getEntityIndex,
-  Rn as installHostCommandSeam,
+  In as installHostCommandSeam,
   An as isEcsError,
   hn as not,
   yn as registerChildOf,