@oasys/oecs 0.3.0 → 0.3.1

package/dist/index.js

@@ -1,10 +1,10 @@
-class J extends Error {
+class Z extends Error {
   constructor(t, e, s) {
     super(t), this.is_operational = e, this.context = s, this.name = this.constructor.name, Error.captureStackTrace(this, this.constructor);
   }
 }
 var D = /* @__PURE__ */ ((a) => (a.EID_MAX_INDEX_OVERFLOW = "EID_MAX_INDEX_OVERFLOW", a.EID_MAX_GEN_OVERFLOW = "EID_MAX_GEN_OVERFLOW", a.COMPONENT_NOT_REGISTERED = "COMPONENT_NOT_REGISTERED", a.ENTITY_NOT_ALIVE = "ENTITY_NOT_ALIVE", a.CIRCULAR_SYSTEM_DEPENDENCY = "CIRCULAR_SYSTEM_DEPENDENCY", a.DUPLICATE_SYSTEM = "DUPLICATE_SYSTEM", a.ARCHETYPE_NOT_FOUND = "ARCHETYPE_NOT_FOUND", a.RESOURCE_NOT_REGISTERED = "RESOURCE_NOT_REGISTERED", a.RESOURCE_ALREADY_REGISTERED = "RESOURCE_ALREADY_REGISTERED", a.EVENT_ALREADY_REGISTERED = "EVENT_ALREADY_REGISTERED", a.EVENT_NOT_REGISTERED = "EVENT_NOT_REGISTERED", a))(D || {});
-class O extends J {
+class O extends Z {
   constructor(t, e, s) {
     super(e ?? t, !0, s), this.category = t;
   }
@@ -12,11 +12,11 @@ class O extends J {
 function F(a, t, e) {
   return a;
 }
-const I = 5, S = 31, Z = 2166136261, tt = 16777619, et = 4;
-class k {
+const I = 5, S = 31, tt = 2166136261, et = 16777619, st = 4;
+class p {
   _words;
   constructor(t) {
-    this._words = t ?? new Array(et).fill(0);
+    this._words = t ?? new Array(st).fill(0);
   }
   has(t) {
     const e = t >>> I;
@@ -33,48 +33,48 @@ class k {
   /** True if any bit is set in both this and other (non-empty intersection). */
   overlaps(t) {
     const e = this._words, s = t._words, n = e.length < s.length ? e.length : s.length;
-    for (let r = 0; r < n; r++)
-      if ((e[r] & s[r]) !== 0) return !0;
+    for (let i = 0; i < n; i++)
+      if ((e[i] & s[i]) !== 0) return !0;
     return !1;
   }
   /** True if this is a superset of other (all bits in other are set in this). */
   contains(t) {
     const e = t._words, s = this._words, n = s.length;
-    for (let r = 0; r < e.length; r++) {
-      const i = e[r];
-      if (i !== 0 && (r >= n || (s[r] & i) !== i))
+    for (let i = 0; i < e.length; i++) {
+      const r = e[i];
+      if (r !== 0 && (i >= n || (s[i] & r) !== r))
         return !1;
     }
     return !0;
   }
   equals(t) {
     const e = this._words, s = t._words, n = e.length > s.length ? e.length : s.length;
-    for (let r = 0; r < n; r++) {
-      const i = r < e.length ? e[r] : 0, c = r < s.length ? s[r] : 0;
-      if (i !== c) return !1;
+    for (let i = 0; i < n; i++) {
+      const r = i < e.length ? e[i] : 0, c = i < s.length ? s[i] : 0;
+      if (r !== c) return !1;
     }
     return !0;
   }
   copy() {
-    return new k(this._words.slice());
+    return new p(this._words.slice());
   }
   copy_with_set(t) {
-    const e = t >>> I, s = e + 1, n = this._words.length > s ? this._words.length : s, r = new Array(n).fill(0);
-    for (let i = 0; i < this._words.length; i++) r[i] = this._words[i];
-    return r[e] |= 1 << (t & S), new k(r);
+    const e = t >>> I, s = e + 1, n = this._words.length > s ? this._words.length : s, i = new Array(n).fill(0);
+    for (let r = 0; r < this._words.length; r++) i[r] = this._words[r];
+    return i[e] |= 1 << (t & S), new p(i);
   }
   copy_with_clear(t) {
     const e = this._words.slice(), s = t >>> I;
-    return s < e.length && (e[s] &= ~(1 << (t & S))), new k(e);
+    return s < e.length && (e[s] &= ~(1 << (t & S))), new p(e);
   }
   /** FNV-1a hash. Skips trailing zero words so differently-sized arrays with the same bits hash equally. */
   hash() {
-    let t = Z;
+    let t = tt;
     const e = this._words;
     let s = e.length - 1;
     for (; s >= 0 && e[s] === 0; ) s--;
     for (let n = 0; n <= s; n++)
-      t ^= e[n], t = Math.imul(t, tt);
+      t ^= e[n], t = Math.imul(t, et);
     return t;
   }
   /** Iterate all set bits via lowest-set-bit extraction. */
@@ -83,10 +83,10 @@ class k {
     for (let s = 0; s < e.length; s++) {
       let n = e[s];
       if (n === 0) continue;
-      const r = s << I;
+      const i = s << I;
       for (; n !== 0; ) {
-        const i = n & -n >>> 0, c = S - Math.clz32(i);
-        t(r + c), n ^= i;
+        const r = n & -n >>> 0, c = S - Math.clz32(r);
+        t(i + c), n ^= r;
       }
     }
   }
@@ -179,12 +179,12 @@ class A {
     t.set(this._buf), this._buf = t;
   }
 }
-class st extends A {
+class nt extends A {
   constructor(t = b) {
     super(Float32Array, t);
   }
 }
-class nt extends A {
+class it extends A {
   constructor(t = b) {
     super(Float64Array, t);
   }
@@ -194,42 +194,42 @@ class rt extends A {
     super(Int8Array, t);
   }
 }
-class it extends A {
+class _t extends A {
   constructor(t = b) {
     super(Int16Array, t);
   }
 }
-class _t extends A {
+class ot extends A {
   constructor(t = b) {
     super(Int32Array, t);
   }
 }
-class ot extends A {
+class ct extends A {
   constructor(t = b) {
     super(Uint8Array, t);
   }
 }
-class ct extends A {
+class ht extends A {
   constructor(t = b) {
     super(Uint16Array, t);
   }
 }
-class $ extends A {
+class H extends A {
   constructor(t = b) {
     super(Uint32Array, t);
   }
 }
-const ht = {
-  f32: st,
-  f64: nt,
+const at = {
+  f32: nt,
+  f64: it,
   i8: rt,
-  i16: it,
-  i32: _t,
-  u8: ot,
-  u16: ct,
-  u32: $
+  i16: _t,
+  i32: ot,
+  u8: ct,
+  u16: ht,
+  u32: H
 };
-class at {
+class lt {
   _compare;
   _data = [];
   constructor(t) {
@@ -261,52 +261,52 @@ class at {
   _sift_up(t) {
     const e = this._data, s = this._compare, n = e[t];
     for (; t > 0; ) {
-      const r = t - 1 >> 1;
-      if (s(n, e[r]) >= 0) break;
-      e[t] = e[r], t = r;
+      const i = t - 1 >> 1;
+      if (s(n, e[i]) >= 0) break;
+      e[t] = e[i], t = i;
     }
     e[t] = n;
   }
   /** Moves a node down away from the root until heap order is restored. */
   _sift_down(t) {
-    const e = this._data, s = this._compare, n = e.length, r = n >> 1, i = e[t];
-    for (; t < r; ) {
+    const e = this._data, s = this._compare, n = e.length, i = n >> 1, r = e[t];
+    for (; t < i; ) {
       let c = (t << 1) + 1;
       const o = c + 1;
-      if (o < n && s(e[o], e[c]) < 0 && (c = o), s(e[c], i) >= 0) break;
+      if (o < n && s(e[o], e[c]) < 0 && (c = o), s(e[c], r) >= 0) break;
       e[t] = e[c], t = c;
     }
-    e[t] = i;
+    e[t] = r;
   }
 }
-function lt(a, t, e, s) {
-  const n = s ?? ((o) => String(o)), r = /* @__PURE__ */ new Map();
+function dt(a, t, e, s) {
+  const n = s ?? ((o) => String(o)), i = /* @__PURE__ */ new Map();
   for (let o = 0; o < a.length; o++)
-    r.set(a[o], 0);
+    i.set(a[o], 0);
   for (const [, o] of t)
     for (let _ = 0; _ < o.length; _++) {
       const h = o[_];
-      r.has(h) && r.set(h, r.get(h) + 1);
+      i.has(h) && i.set(h, i.get(h) + 1);
     }
-  const i = new at(e);
+  const r = new lt(e);
   for (let o = 0; o < a.length; o++)
-    r.get(a[o]) === 0 && i.push(a[o]);
+    i.get(a[o]) === 0 && r.push(a[o]);
   const c = [];
-  for (; i.size > 0; ) {
-    const o = i.pop();
+  for (; r.size > 0; ) {
+    const o = r.pop();
     c.push(o);
     const _ = t.get(o);
     if (_ !== void 0)
       for (let h = 0; h < _.length; h++) {
         const l = _[h];
-        if (!r.has(l)) continue;
-        const d = r.get(l) - 1;
-        r.set(l, d), d === 0 && i.push(l);
+        if (!i.has(l)) continue;
+        const d = i.get(l) - 1;
+        i.set(l, d), d === 0 && r.push(l);
       }
   }
   if (c.length !== a.length) {
     const o = [];
-    for (const [_, h] of r)
+    for (const [_, h] of i)
       h > 0 && o.push(n(_));
     throw new globalThis.TypeError(
       `Cycle detected in topological sort. Nodes still pending: ${o.join(", ")}`
@@ -314,12 +314,12 @@ function lt(a, t, e, s) {
   }
   return c;
 }
-const E = -1, m = -1, U = Object.freeze(/* @__PURE__ */ Object.create(null)), dt = 2654435769, ut = 1367130551, H = 1024, j = 0, ft = 31, gt = 1 / 60, yt = 4, mt = 0, R = 20, G = (1 << R) - 1, pt = ft - R, V = (1 << pt) - 1, wt = (a, t) => t << R | a, y = (a) => a & G, z = (a) => a >> R, vt = (a) => F(
+const k = -1, m = -1, q = Object.freeze(/* @__PURE__ */ Object.create(null)), ut = 2654435769, ft = 1367130551, K = 1024, j = 0, gt = 31, yt = 1 / 60, mt = 4, pt = 0, R = 20, M = (1 << R) - 1, wt = gt - R, V = (1 << wt) - 1, vt = (a, t) => t << R | a, y = (a) => a & M, z = (a) => a >> R, Et = (a) => F(
   a
-), Et = (a) => F(
+), kt = (a) => F(
   a
 );
-class kt {
+class Tt {
   field_names;
   columns;
   // any: type-erased storage — channel is stored in Map<number, EventChannel>, F is lost
@@ -353,19 +353,23 @@ class kt {
 function Ot(a) {
   return Symbol(a);
 }
-function Ut(a) {
+function qt(a) {
   return Symbol(a);
 }
-const Tt = (a) => F(
+const bt = (a) => F(
   a
 );
-class bt {
+class At {
   id;
   mask;
   has_columns;
   _entity_ids;
   length = 0;
   edges = [];
+  // Cache for multi-component transition maps (from this archetype to another).
+  // Covers add_components / remove_components where the (src, dst) pair is not
+  // a single-component edge and therefore not covered by `edges[].add_map/remove_map`.
+  batch_transition_maps = /* @__PURE__ */ new Map();
   // --- Flat column storage ---
   // Dense array of ALL columns across all components in this archetype.
   _flat_columns = [];
@@ -383,15 +387,15 @@ class bt {
   _column_ids = [];
   // Sparse by ComponentID → last tick that modified this component's columns.
   _changed_tick = [];
-  constructor(t, e, s, n = H) {
-    if (this.id = t, this.mask = e, this._entity_ids = new $(n), s) {
-      let r = 0;
-      for (let i = 0; i < s.length; i++) {
-        const c = s[i], o = c.component_id, _ = new Array(c.field_names.length);
-        this._col_offset[o] = r, this._field_count[o] = c.field_names.length, this._field_index[o] = c.field_index, this._field_names[o] = c.field_names;
+  constructor(t, e, s, n = K) {
+    if (this.id = t, this.mask = e, this._entity_ids = new H(n), s) {
+      let i = 0;
+      for (let r = 0; r < s.length; r++) {
+        const c = s[r], o = c.component_id, _ = new Array(c.field_names.length);
+        this._col_offset[o] = i, this._field_count[o] = c.field_names.length, this._field_index[o] = c.field_index, this._field_names[o] = c.field_names;
         for (let h = 0; h < c.field_names.length; h++) {
-          const l = new ht[c.field_types[h]](n);
-          _[h] = l, this._flat_columns[r++] = l;
+          const l = new at[c.field_types[h]](n);
+          _[h] = l, this._flat_columns[i++] = l;
         }
         this.column_groups[o] = { layout: c, columns: _ }, this._column_ids.push(o), this._changed_tick[o] = 0;
       }
@@ -423,42 +427,42 @@ class bt {
   get_column_mut(t, e, s) {
     const n = t;
     this._changed_tick[n] = s;
-    const r = this._field_index[n][e];
-    return this._flat_columns[this._col_offset[n] + r].buf;
+    const i = this._field_index[n][e];
+    return this._flat_columns[this._col_offset[n] + i].buf;
   }
   write_fields(t, e, s, n) {
-    const r = e, i = this._col_offset[r];
-    if (i === void 0) return;
-    this._changed_tick[r] = n;
-    const c = this._field_names[r], o = this._flat_columns;
+    const i = e, r = this._col_offset[i];
+    if (r === void 0) return;
+    this._changed_tick[i] = n;
+    const c = this._field_names[i], o = this._flat_columns;
     for (let _ = 0; _ < c.length; _++)
-      o[i + _].buf[t] = s[c[_]];
+      o[r + _].buf[t] = s[c[_]];
   }
   /** Fast positional write: values[i] → field[i] in declaration order. No string lookup. */
   write_fields_positional(t, e, s, n) {
-    const r = e, i = this._col_offset[r];
-    if (i === void 0) return;
-    this._changed_tick[r] = n;
+    const i = e, r = this._col_offset[i];
+    if (r === void 0) return;
+    this._changed_tick[i] = n;
     const c = this._flat_columns;
     for (let o = 0; o < s.length; o++)
-      c[i + o].buf[t] = s[o];
+      c[r + o].buf[t] = s[o];
   }
   read_field(t, e, s) {
-    const n = e, r = this._col_offset[n];
-    if (r === void 0) return NaN;
-    const i = this._field_index[n][s];
-    return i === void 0 ? NaN : this._flat_columns[r + i].buf[t];
+    const n = e, i = this._col_offset[n];
+    if (i === void 0) return NaN;
+    const r = this._field_index[n][s];
+    return r === void 0 ? NaN : this._flat_columns[i + r].buf[t];
   }
   /** Copy all shared component columns from source archetype at src_row into dst_row. */
   copy_shared_from(t, e, s, n) {
-    const r = t._col_offset, i = t._field_count, c = t._flat_columns, o = this._flat_columns, _ = this._column_ids;
+    const i = t._col_offset, r = t._field_count, c = t._flat_columns, o = this._flat_columns, _ = this._column_ids;
     for (let h = 0; h < _.length; h++) {
-      const l = _[h], d = r[l];
+      const l = _[h], d = i[l];
       if (d === void 0) continue;
       this._changed_tick[l] = n;
-      const u = this._col_offset[l], g = i[l];
-      for (let p = 0; p < g; p++)
-        o[u + p].buf[s] = c[d + p].buf[e];
+      const u = this._col_offset[l], g = r[l];
+      for (let w = 0; w < g; w++)
+        o[u + w].buf[s] = c[d + w].buf[e];
     }
   }
   /**
@@ -481,14 +485,14 @@ class bt {
   remove_entity(t) {
     const e = this.length - 1;
     let s = m;
-    const n = this._flat_columns, r = this._entity_ids.buf;
+    const n = this._flat_columns, i = this._entity_ids.buf;
     if (t !== e) {
-      r[t] = r[e], s = y(r[t]);
-      for (let i = 0; i < n.length; i++)
-        n[i].swap_remove(t);
+      i[t] = i[e], s = y(i[t]);
+      for (let r = 0; r < n.length; r++)
+        n[r].swap_remove(t);
     } else
-      for (let i = 0; i < n.length; i++)
-        n[i].pop();
+      for (let r = 0; r < n.length; r++)
+        n[r].pop();
     return this._entity_ids.pop(), this.length--, s;
   }
   /** Tag-optimized add: skip column push entirely (no data to store). */
@@ -509,8 +513,8 @@ class bt {
    * Uses a pre-computed transition map for branchless column copy.
    * Writes dst_row to _move_result[0], swapped entity index to _move_result[1].
    */
-  move_entity_from(t, e, s, n, r) {
-    const i = this.length;
+  move_entity_from(t, e, s, n, i) {
+    const r = this.length;
     this._entity_ids.push(s);
     const c = this._flat_columns, o = t._flat_columns;
     for (let l = 0; l < c.length; l++) {
@@ -519,10 +523,10 @@ class bt {
     }
     const _ = this._column_ids;
     for (let l = 0; l < _.length; l++)
-      this._changed_tick[_[l]] = r;
+      this._changed_tick[_[l]] = i;
     this.length++;
     const h = t.has_columns ? t.remove_entity(e) : t.remove_entity_tag(e);
-    f[0] = i, f[1] = h;
+    f[0] = r, f[1] = h;
   }
   /**
    * Move an entity from src into this archetype (tag-only: no columns to copy).
@@ -531,8 +535,8 @@ class bt {
   move_entity_from_tag(t, e, s) {
     const n = this.length;
     this._entity_ids.push(s), this.length++;
-    const r = t.remove_entity_tag(e);
-    f[0] = n, f[1] = r;
+    const i = t.remove_entity_tag(e);
+    f[0] = n, f[1] = i;
   }
   /**
    * Bulk-move ALL entities from src into this archetype using TypedArray.set().
@@ -542,11 +546,11 @@ class bt {
   bulk_move_all_from(t, e, s) {
     const n = t.length;
     if (n === 0) return this.length;
-    const r = this.length, i = this._flat_columns, c = t._flat_columns;
+    const i = this.length, r = this._flat_columns, c = t._flat_columns;
     this._entity_ids.bulk_append(t._entity_ids.buf, 0, n);
-    for (let _ = 0; _ < i.length; _++) {
+    for (let _ = 0; _ < r.length; _++) {
       const h = e[_];
-      h >= 0 ? i[_].bulk_append(c[h].buf, 0, n) : i[_].bulk_append_zeroes(n);
+      h >= 0 ? r[_].bulk_append(c[h].buf, 0, n) : r[_].bulk_append_zeroes(n);
     }
     const o = this._column_ids;
     for (let _ = 0; _ < o.length; _++)
@@ -554,7 +558,7 @@ class bt {
     this.length += n, t.length = 0, t._entity_ids.clear();
     for (let _ = 0; _ < c.length; _++)
       c[_].clear();
-    return r;
+    return i;
   }
   get_edge(t) {
     return this.edges[t];
@@ -562,12 +566,21 @@ class bt {
   set_edge(t, e) {
     this.edges[t] = e;
   }
+  /**
+   * Get the cached transition map from this archetype to `target`, building
+   * and caching it on miss. Archetypes live for the lifetime of the Store,
+   * so entries never need invalidation.
+   */
+  get_batch_transition_map(t) {
+    let e = this.batch_transition_maps.get(t.id);
+    return e === void 0 && (e = G(this, t), this.batch_transition_maps.set(t.id, e)), e;
+  }
 }
 const f = [0, m];
-function M(a, t) {
-  const e = t._flat_columns, s = new Int16Array(e.length), n = t._column_ids, r = a._col_offset, i = t._col_offset, c = t._field_count;
+function G(a, t) {
+  const e = t._flat_columns, s = new Int16Array(e.length), n = t._column_ids, i = a._col_offset, r = t._col_offset, c = t._field_count;
   for (let o = 0; o < n.length; o++) {
-    const _ = n[o], h = i[_], l = c[_], d = r[_];
+    const _ = n[o], h = r[_], l = c[_], d = i[_];
     if (d !== void 0)
       for (let u = 0; u < l; u++)
         s[h + u] = d + u;
@@ -577,11 +590,11 @@ function M(a, t) {
   }
   return s;
 }
-function K(a, t, e) {
+function Q(a, t, e) {
   const s = a.get(t);
   s !== void 0 ? s.push(e) : a.set(t, [e]);
 }
-class At {
+class xt {
   // --- Entity ID management ---
   // Generational slot allocator: entity_generations[index] holds the current
   // generation for that slot. Free indices are recycled via a stack.
@@ -626,7 +639,7 @@ class At {
   _tick = 0;
   initial_capacity;
   constructor(t) {
-    this.initial_capacity = t ?? H, this.empty_archetype_id = this.arch_get_or_create_from_mask(new k());
+    this.initial_capacity = t ?? K, this.empty_archetype_id = this.arch_get_or_create_from_mask(new p());
   }
   // =======================================================
   // Archetype graph
@@ -645,18 +658,18 @@ class At {
         if (this.archetypes[s[o]].mask.equals(t))
           return s[o];
     }
-    const n = Tt(this.next_archetype_id++), r = [];
+    const n = bt(this.next_archetype_id++), i = [];
     t.for_each((o) => {
       const _ = o, h = this.component_metas[_];
-      h && h.field_names.length > 0 && r.push({
+      h && h.field_names.length > 0 && i.push({
         component_id: _,
         field_names: h.field_names,
         field_index: h.field_index,
         field_types: h.field_types
       });
     });
-    const i = new bt(n, t, r, this.initial_capacity);
-    this.archetypes.push(i), K(this.archetype_map, e, n), t.for_each((o) => {
+    const r = new At(n, t, i, this.initial_capacity);
+    this.archetypes.push(r), Q(this.archetype_map, e, n), t.for_each((o) => {
       const _ = o;
       let h = this.component_index.get(_);
       h || (h = /* @__PURE__ */ new Set(), this.component_index.set(_, h)), h.add(n);
@@ -664,7 +677,7 @@ class At {
     const c = this.registered_queries;
     for (let o = 0; o < c.length; o++) {
       const _ = c[o];
-      i.matches(_.include_mask) && (!_.exclude_mask || !i.mask.overlaps(_.exclude_mask)) && (!_.any_of_mask || i.mask.overlaps(_.any_of_mask)) && (_.result.push(i), _.query?.mark_non_empty_dirty());
+      r.matches(_.include_mask) && (!_.exclude_mask || !r.mask.overlaps(_.exclude_mask)) && (!_.any_of_mask || r.mask.overlaps(_.any_of_mask)) && (_.result.push(r), _.query?.mark_non_empty_dirty());
     }
     return n;
   }
@@ -674,10 +687,10 @@ class At {
     if (s.mask.has(e)) return t;
     const n = s.get_edge(e);
     if (n?.add != null) return n.add;
-    const r = this.arch_get_or_create_from_mask(
+    const i = this.arch_get_or_create_from_mask(
       s.mask.copy_with_set(e)
     );
-    return this.arch_cache_edge(s, this.arch_get(r), e), r;
+    return this.arch_cache_edge(s, this.arch_get(i), e), i;
   }
   /** Resolve "remove component_id from archetype_id" → target ArchetypeID. Caches the edge. */
   arch_resolve_remove(t, e) {
@@ -685,10 +698,10 @@ class At {
     if (!s.mask.has(e)) return t;
     const n = s.get_edge(e);
     if (n?.remove != null) return n.remove;
-    const r = this.arch_get_or_create_from_mask(
+    const i = this.arch_get_or_create_from_mask(
       s.mask.copy_with_clear(e)
     );
-    return this.arch_cache_edge(this.arch_get(r), s, e), r;
+    return this.arch_cache_edge(this.arch_get(i), s, e), i;
   }
   /** Cache a bidirectional add/remove edge between two archetypes. */
   arch_cache_edge(t, e, s) {
@@ -698,14 +711,14 @@ class At {
       add_map: null,
       remove_map: null
     };
-    n.add = e.id, n.add_map = M(t, e), t.set_edge(s, n);
-    const r = e.get_edge(s) ?? {
+    n.add = e.id, n.add_map = G(t, e), t.set_edge(s, n);
+    const i = e.get_edge(s) ?? {
       add: null,
       remove: null,
       add_map: null,
       remove_map: null
     };
-    r.remove = t.id, r.remove_map = M(e, t), e.set_edge(s, r);
+    i.remove = t.id, i.remove_map = G(e, t), e.set_edge(s, i);
   }
   // =======================================================
   // Entity lifecycle
@@ -713,19 +726,19 @@ class At {
   create_entity() {
     let t, e;
     this.entity_free_indices.length > 0 ? (t = this.entity_free_indices.pop(), e = this.entity_generations[t]) : (t = this.entity_high_water++, this.entity_generations[t] = j, e = j), this.entity_alive_count++;
-    const s = wt(t, e);
-    return this.entity_archetype[t] = this.empty_archetype_id, this.entity_row[t] = E, s;
+    const s = vt(t, e);
+    return this.entity_archetype[t] = this.empty_archetype_id, this.entity_row[t] = k, s;
   }
   /** Immediately destroy an entity, removing it from its archetype. */
   destroy_entity(t) {
     if (!this.is_alive(t))
       return;
     const e = y(t), s = this.entity_row[e];
-    if (s !== E) {
-      const i = this.arch_get(this.entity_archetype[e]).remove_entity(s);
-      i !== m && (this.entity_row[i] = s);
+    if (s !== k) {
+      const r = this.arch_get(this.entity_archetype[e]).remove_entity(s);
+      r !== m && (this.entity_row[r] = s);
     }
-    this.entity_archetype[e] = E, this.entity_row[e] = E;
+    this.entity_archetype[e] = k, this.entity_row[e] = k;
     const n = z(t);
     this.entity_generations[e] = n + 1 & V, this.entity_free_indices.push(e), this.entity_alive_count--;
   }
@@ -751,16 +764,16 @@ class At {
   flush_destroyed() {
     const t = this.pending_destroy;
     if (t.length === 0) return;
-    const e = this.entity_archetype, s = this.entity_row, n = this.entity_generations, r = this.archetypes, i = this.entity_high_water;
+    const e = this.entity_archetype, s = this.entity_row, n = this.entity_generations, i = this.archetypes, r = this.entity_high_water;
     for (let c = 0; c < t.length; c++) {
-      const o = t[c], _ = o & G, h = o >> R;
-      if (_ >= i || n[_] !== h) continue;
+      const o = t[c], _ = o & M, h = o >> R;
+      if (_ >= r || n[_] !== h) continue;
       const l = s[_];
-      if (l !== E) {
-        const d = r[e[_]], u = d.has_columns ? d.remove_entity(l) : d.remove_entity_tag(l);
+      if (l !== k) {
+        const d = i[e[_]], u = d.has_columns ? d.remove_entity(l) : d.remove_entity_tag(l);
         u !== m && (s[u] = l);
       }
-      e[_] = E, s[_] = E, n[_] = h + 1 & V, this.entity_free_indices.push(_), this.entity_alive_count--;
+      e[_] = k, s[_] = k, n[_] = h + 1 & V, this.entity_free_indices.push(_), this.entity_alive_count--;
     }
     t.length = 0, this._mark_queries_dirty();
   }
@@ -768,7 +781,7 @@ class At {
     return this.pending_destroy.length;
   }
   add_component_deferred(t, e, s) {
-    this.pending_add_ids.push(t), this.pending_add_defs.push(e), this.pending_add_values.push(s ?? U);
+    this.pending_add_ids.push(t), this.pending_add_defs.push(e), this.pending_add_values.push(s ?? q);
   }
   remove_component_deferred(t, e) {
     this.pending_remove_ids.push(t), this.pending_remove_defs.push(e);
@@ -779,47 +792,47 @@ class At {
   }
   /** Batch-apply all deferred component additions. */
   _flush_adds() {
-    const t = this.pending_add_ids, e = this.pending_add_defs, s = this.pending_add_values, n = t.length, r = this.entity_archetype, i = this.entity_row, c = this.entity_generations, o = this.archetypes, _ = this.component_metas, h = this.entity_high_water, l = this._tick;
+    const t = this.pending_add_ids, e = this.pending_add_defs, s = this.pending_add_values, n = t.length, i = this.entity_archetype, r = this.entity_row, c = this.entity_generations, o = this.archetypes, _ = this.component_metas, h = this.entity_high_water, l = this._tick;
     for (let d = 0; d < n; d++) {
-      const u = t[d], g = u & G, p = u >> R;
-      if (g >= h || c[g] !== p) continue;
-      const T = r[g], w = e[d], v = o[T];
-      if (v.mask.has(w)) {
-        _[w].field_names.length > 0 && v.write_fields(i[g], w, s[d], l);
+      const u = t[d], g = u & M, w = u >> R;
+      if (g >= h || c[g] !== w) continue;
+      const T = i[g], v = e[d], E = o[T];
+      if (E.mask.has(v)) {
+        _[v].field_names.length > 0 && E.write_fields(r[g], v, s[d], l);
         continue;
       }
-      const N = this.arch_resolve_add(T, w), x = o[N], P = i[g], Y = !x.has_columns && !v.has_columns;
-      let q;
-      if (P !== E) {
+      const N = this.arch_resolve_add(T, v), x = o[N], P = r[g], Y = !x.has_columns && !E.has_columns;
+      let U;
+      if (P !== k) {
         if (Y)
-          x.move_entity_from_tag(v, P, u);
+          x.move_entity_from_tag(E, P, u);
         else {
-          const Q = v.get_edge(w);
-          x.move_entity_from(v, P, u, Q.add_map, l);
+          const J = E.get_edge(v);
+          x.move_entity_from(E, P, u, J.add_map, l);
         }
-        q = f[0], f[1] !== m && (i[f[1]] = P);
+        U = f[0], f[1] !== m && (r[f[1]] = P);
       } else
-        q = Y ? x.add_entity_tag(u) : x.add_entity(u);
-      _[w].field_names.length > 0 && x.write_fields(q, w, s[d], l), r[g] = N, i[g] = q;
+        U = Y ? x.add_entity_tag(u) : x.add_entity(u);
+      _[v].field_names.length > 0 && x.write_fields(U, v, s[d], l), i[g] = N, r[g] = U;
     }
     t.length = 0, e.length = 0, s.length = 0;
   }
   /** Batch-apply all deferred component removals. */
   _flush_removes() {
-    const t = this.pending_remove_ids, e = this.pending_remove_defs, s = t.length, n = this.entity_archetype, r = this.entity_row, i = this.entity_generations, c = this.archetypes, o = this.entity_high_water, _ = this._tick;
+    const t = this.pending_remove_ids, e = this.pending_remove_defs, s = t.length, n = this.entity_archetype, i = this.entity_row, r = this.entity_generations, c = this.archetypes, o = this.entity_high_water, _ = this._tick;
     for (let h = 0; h < s; h++) {
-      const l = t[h], d = l & G, u = l >> R;
-      if (d >= o || i[d] !== u) continue;
-      const g = n[d], p = e[h], T = c[g];
-      if (!T.mask.has(p)) continue;
-      const w = this.arch_resolve_remove(g, p), v = c[w], N = r[d];
-      if (!v.has_columns && !T.has_columns)
-        v.move_entity_from_tag(T, N, l);
+      const l = t[h], d = l & M, u = l >> R;
+      if (d >= o || r[d] !== u) continue;
+      const g = n[d], w = e[h], T = c[g];
+      if (!T.mask.has(w)) continue;
+      const v = this.arch_resolve_remove(g, w), E = c[v], N = i[d];
+      if (!E.has_columns && !T.has_columns)
+        E.move_entity_from_tag(T, N, l);
       else {
-        const P = T.get_edge(p);
-        v.move_entity_from(T, N, l, P.remove_map, _);
+        const P = T.get_edge(w);
+        E.move_entity_from(T, N, l, P.remove_map, _);
       }
-      f[1] !== m && (r[f[1]] = N), n[d] = w, r[d] = f[0];
+      f[1] !== m && (i[f[1]] = N), n[d] = v, i[d] = f[0];
     }
     t.length = 0, e.length = 0;
   }
@@ -830,17 +843,17 @@ class At {
   // Component registration
   // =======================================================
   register_component(t) {
-    const e = vt(this.component_count++), s = Object.keys(t), n = new Array(s.length), r = /* @__PURE__ */ Object.create(null);
-    for (let i = 0; i < s.length; i++)
-      r[s[i]] = i, n[i] = t[s[i]];
-    return this.component_metas.push({ field_names: s, field_index: r, field_types: n }), e;
+    const e = Et(this.component_count++), s = Object.keys(t), n = new Array(s.length), i = /* @__PURE__ */ Object.create(null);
+    for (let r = 0; r < s.length; r++)
+      i[s[r]] = r, n[r] = t[s[r]];
+    return this.component_metas.push({ field_names: s, field_index: i, field_types: n }), e;
   }
   add_component(t, e, s) {
     if (!this.is_alive(t))
       return;
-    const n = y(t), r = this.entity_archetype[n], i = this.arch_get(r);
-    if (i.has_component(e)) {
-      i.write_fields(
+    const n = y(t), i = this.entity_archetype[n], r = this.arch_get(i);
+    if (r.has_component(e)) {
+      r.write_fields(
         this.entity_row[n],
         e,
         s,
@@ -848,11 +861,11 @@ class At {
       );
       return;
     }
-    const c = this.arch_resolve_add(r, e), o = this.arch_get(c), _ = this.entity_row[n];
+    const c = this.arch_resolve_add(i, e), o = this.arch_get(c), _ = this.entity_row[n];
     let h;
-    if (_ !== E) {
-      const l = i.get_edge(e);
-      !o.has_columns && !i.has_columns ? o.move_entity_from_tag(i, _, t) : o.move_entity_from(i, _, t, l.add_map, this._tick), h = f[0], f[1] !== m && (this.entity_row[f[1]] = _);
+    if (_ !== k) {
+      const l = r.get_edge(e);
+      !o.has_columns && !r.has_columns ? o.move_entity_from_tag(r, _, t) : o.move_entity_from(r, _, t, l.add_map, this._tick), h = f[0], f[1] !== m && (this.entity_row[f[1]] = _);
     } else
       h = o.has_columns ? o.add_entity(t) : o.add_entity_tag(t);
     o.write_fields(
@@ -867,32 +880,32 @@ class At {
     if (!this.is_alive(t))
       return;
     const s = y(t), n = this.entity_archetype[s];
-    let r = n;
-    for (let i = 0; i < e.length; i++)
-      r = this.arch_resolve_add(r, e[i].def);
-    if (r !== n) {
-      const i = this.arch_get(n), c = this.arch_get(r), o = this.entity_row[s];
+    let i = n;
+    for (let r = 0; r < e.length; r++)
+      i = this.arch_resolve_add(i, e[r].def);
+    if (i !== n) {
+      const r = this.arch_get(n), c = this.arch_get(i), o = this.entity_row[s];
       let _;
-      if (o !== E) {
-        const h = M(i, c);
-        c.move_entity_from(i, o, t, h, this._tick), _ = f[0], f[1] !== m && (this.entity_row[f[1]] = o);
+      if (o !== k) {
+        const h = r.get_batch_transition_map(c);
+        c.move_entity_from(r, o, t, h, this._tick), _ = f[0], f[1] !== m && (this.entity_row[f[1]] = o);
       } else
         _ = c.add_entity(t);
       for (let h = 0; h < e.length; h++)
         c.write_fields(
           _,
           e[h].def,
-          e[h].values ?? U,
+          e[h].values ?? q,
           this._tick
         );
-      this.entity_archetype[s] = r, this.entity_row[s] = _, this._mark_queries_dirty();
+      this.entity_archetype[s] = i, this.entity_row[s] = _, this._mark_queries_dirty();
     } else {
-      const i = this.arch_get(n), c = this.entity_row[s];
+      const r = this.arch_get(n), c = this.entity_row[s];
       for (let o = 0; o < e.length; o++)
-        i.write_fields(
+        r.write_fields(
           c,
           e[o].def,
-          e[o].values ?? U,
+          e[o].values ?? q,
           this._tick
         );
     }
@@ -900,25 +913,25 @@ class At {
   remove_component(t, e) {
     if (!this.is_alive(t))
       return;
-    const s = y(t), n = this.entity_archetype[s], r = this.arch_get(n);
-    if (!r.has_component(e)) return;
-    const i = this.arch_resolve_remove(n, e), c = this.arch_get(i), o = this.entity_row[s], _ = r.get_edge(e);
-    !c.has_columns && !r.has_columns ? c.move_entity_from_tag(r, o, t) : c.move_entity_from(r, o, t, _.remove_map, this._tick), f[1] !== m && (this.entity_row[f[1]] = o), this.entity_archetype[s] = i, this.entity_row[s] = f[0], this._mark_queries_dirty();
+    const s = y(t), n = this.entity_archetype[s], i = this.arch_get(n);
+    if (!i.has_component(e)) return;
+    const r = this.arch_resolve_remove(n, e), c = this.arch_get(r), o = this.entity_row[s], _ = i.get_edge(e);
+    !c.has_columns && !i.has_columns ? c.move_entity_from_tag(i, o, t) : c.move_entity_from(i, o, t, _.remove_map, this._tick), f[1] !== m && (this.entity_row[f[1]] = o), this.entity_archetype[s] = r, this.entity_row[s] = f[0], this._mark_queries_dirty();
   }
   /** Remove multiple components in one transition (resolves final archetype, then moves once). */
   remove_components(t, e) {
     if (!this.is_alive(t))
       return;
     const s = y(t), n = this.entity_archetype[s];
-    let r = n;
+    let i = n;
     for (let h = 0; h < e.length; h++)
-      r = this.arch_resolve_remove(
-        r,
+      i = this.arch_resolve_remove(
+        i,
         e[h]
       );
-    if (r === n) return;
-    const i = this.arch_get(n), c = this.arch_get(r), o = this.entity_row[s], _ = M(i, c);
-    c.move_entity_from(i, o, t, _, this._tick), f[1] !== m && (this.entity_row[f[1]] = o), this.entity_archetype[s] = r, this.entity_row[s] = f[0], this._mark_queries_dirty();
+    if (i === n) return;
+    const r = this.arch_get(n), c = this.arch_get(i), o = this.entity_row[s], _ = G(r, c);
+    c.move_entity_from(r, o, t, _, this._tick), f[1] !== m && (this.entity_row[f[1]] = o), this.entity_archetype[s] = i, this.entity_row[s] = f[0], this._mark_queries_dirty();
   }
   has_component(t, e) {
     if (!this.is_alive(t))
@@ -935,14 +948,14 @@ class At {
     if (t.length === 0) return;
     const n = e;
     if (t.mask.has(n)) return;
-    const r = this.arch_resolve_add(t.id, n), i = this.arch_get(r), c = t.get_edge(n), o = t.length, _ = this.entity_archetype, h = this.entity_row, l = i.bulk_move_all_from(t, c.add_map, this._tick);
+    const i = this.arch_resolve_add(t.id, n), r = this.arch_get(i), c = t.get_edge(n), o = t.length, _ = this.entity_archetype, h = this.entity_row, l = r.bulk_move_all_from(t, c.add_map, this._tick);
     for (let u = 0; u < o; u++) {
-      const g = y(i.entity_ids[l + u]);
-      _[g] = r, h[g] = l + u;
+      const g = y(r.entity_ids[l + u]);
+      _[g] = i, h[g] = l + u;
     }
     if (this.component_metas[n].field_names.length > 0 && s)
       for (let u = 0; u < o; u++)
-        i.write_fields(l + u, n, s, this._tick);
+        r.write_fields(l + u, n, s, this._tick);
     this._mark_queries_dirty();
   }
   /**
@@ -954,9 +967,9 @@ class At {
     if (t.length === 0) return;
     const s = e;
     if (!t.mask.has(s)) return;
-    const n = this.arch_resolve_remove(t.id, s), r = this.arch_get(n), i = t.get_edge(s), c = t.length, o = r.bulk_move_all_from(t, i.remove_map, this._tick), _ = this.entity_archetype, h = this.entity_row;
+    const n = this.arch_resolve_remove(t.id, s), i = this.arch_get(n), r = t.get_edge(s), c = t.length, o = i.bulk_move_all_from(t, r.remove_map, this._tick), _ = this.entity_archetype, h = this.entity_row;
     for (let l = 0; l < c; l++) {
-      const d = y(r.entity_ids[o + l]);
+      const d = y(i.entity_ids[o + l]);
       _[d] = n, h[d] = o + l;
     }
     this._mark_queries_dirty();
@@ -980,17 +993,17 @@ class At {
    */
   get_matching_archetypes(t, e, s) {
     const n = t._words;
-    let r = !1;
+    let i = !1;
     for (let _ = 0; _ < n.length; _++)
       if (n[_] !== 0) {
-        r = !0;
+        i = !0;
         break;
       }
-    if (!r)
+    if (!i)
       return this.archetypes.filter(
         (_) => (!e || !_.mask.overlaps(e)) && (!s || _.mask.overlaps(s))
       );
-    let i, c = !1;
+    let r, c = !1;
     for (let _ = 0; _ < n.length; _++) {
       let h = n[_];
       if (h === 0) continue;
@@ -1003,13 +1016,13 @@ class At {
           c = !0;
           break;
         }
-        (!i || g.size < i.size) && (i = g);
+        (!r || g.size < r.size) && (r = g);
       }
       if (c) break;
     }
-    if (c || !i) return [];
+    if (c || !r) return [];
     const o = [];
-    for (const _ of i) {
+    for (const _ of r) {
       const h = this.arch_get(_);
       h.matches(t) && (!e || !h.mask.overlaps(e)) && (!s || h.mask.overlaps(s)) && o.push(h);
     }
@@ -1044,7 +1057,7 @@ class At {
   // Event channels
   // =======================================================
   register_event(t) {
-    const e = Et(this.event_count++), s = new kt(t);
+    const e = kt(this.event_count++), s = new Tt(t);
     return this.event_channels.push(s), e;
   }
   emit_event(t, e) {
@@ -1105,7 +1118,7 @@ class At {
     return this.resource_key_map.has(t);
   }
 }
-var xt = /* @__PURE__ */ ((a) => (a.PRE_STARTUP = "PRE_STARTUP", a.STARTUP = "STARTUP", a.POST_STARTUP = "POST_STARTUP", a.FIXED_UPDATE = "FIXED_UPDATE", a.PRE_UPDATE = "PRE_UPDATE", a.UPDATE = "UPDATE", a.POST_UPDATE = "POST_UPDATE", a))(xt || {});
+var It = /* @__PURE__ */ ((a) => (a.PRE_STARTUP = "PRE_STARTUP", a.STARTUP = "STARTUP", a.POST_STARTUP = "POST_STARTUP", a.FIXED_UPDATE = "FIXED_UPDATE", a.PRE_UPDATE = "PRE_UPDATE", a.UPDATE = "UPDATE", a.POST_UPDATE = "POST_UPDATE", a))(It || {});
 const L = [
   "PRE_STARTUP",
   "STARTUP",
@@ -1117,7 +1130,7 @@ const L = [
   "POST_UPDATE"
   /* POST_UPDATE */
 ];
-class It {
+class St {
   label_systems = /* @__PURE__ */ new Map();
   sorted_cache = /* @__PURE__ */ new Map();
   system_index = /* @__PURE__ */ new Map();
@@ -1132,30 +1145,30 @@ class It {
   }
   add_systems(t, ...e) {
     for (const s of e) {
-      const n = "system" in s ? s.system : s, r = "system" in s ? s.ordering : void 0, i = {
+      const n = "system" in s ? s.system : s, i = "system" in s ? s.ordering : void 0, r = {
         descriptor: n,
         insertion_order: this.next_insertion_order++,
-        before: new Set(r?.before ?? []),
-        after: new Set(r?.after ?? [])
+        before: new Set(i?.before ?? []),
+        after: new Set(i?.after ?? [])
       };
-      this.label_systems.get(t).push(i), this.system_index.set(n, t), this.system_last_run.set(n, 0), this.sorted_cache.delete(t);
+      this.label_systems.get(t).push(r), this.system_index.set(n, t), this.system_last_run.set(n, 0), this.sorted_cache.delete(t);
     }
   }
   remove_system(t) {
     const e = this.system_index.get(t);
     if (e === void 0) return;
-    const s = this.label_systems.get(e), n = s.findIndex((r) => r.descriptor === t);
+    const s = this.label_systems.get(e), n = s.findIndex((i) => i.descriptor === t);
     if (n !== -1) {
-      const r = s.length - 1;
-      n !== r && (s[n] = s[r]), s.pop();
-      for (const i of s)
-        i.before.delete(t), i.after.delete(t);
+      const i = s.length - 1;
+      n !== i && (s[n] = s[i]), s.pop();
+      for (const r of s)
+        r.before.delete(t), r.after.delete(t);
     }
     this.system_index.delete(t), this.system_last_run.delete(t), this.sorted_cache.delete(e);
   }
   run_startup(t, e) {
     for (const s of L)
-      this.run_label(s, t, mt, e);
+      this.run_label(s, t, pt, e);
   }
   run_update(t, e, s) {
     for (const n of C)
@@ -1186,9 +1199,9 @@ class It {
     this.sorted_cache.clear(), this.system_index.clear(), this.system_last_run.clear();
   }
   run_label(t, e, s, n) {
-    const r = this.get_sorted(t);
-    for (let i = 0; i < r.length; i++)
-      this.system_last_run.set(r[i], n), e.last_run_tick = n, r[i].fn(e, s);
+    const i = this.get_sorted(t);
+    for (let r = 0; r < i.length; r++)
+      this.system_last_run.set(i[r], n), e.last_run_tick = n, i[r].fn(e, s);
     e.flush();
   }
   get_sorted(t) {
@@ -1204,21 +1217,21 @@ class It {
    */
   sort_systems(t, e) {
     if (t.length === 0) return [];
-    const s = [], n = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Set();
+    const s = [], n = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Set();
     for (const _ of t)
-      s.push(_.descriptor), n.set(_.descriptor, _.insertion_order), r.add(_.descriptor);
-    const i = /* @__PURE__ */ new Map();
+      s.push(_.descriptor), n.set(_.descriptor, _.insertion_order), i.add(_.descriptor);
+    const r = /* @__PURE__ */ new Map();
     for (const _ of t)
-      i.set(_.descriptor, []);
+      r.set(_.descriptor, []);
     for (const _ of t) {
       for (const h of _.before)
-        r.has(h) && i.get(_.descriptor).push(h);
+        i.has(h) && r.get(_.descriptor).push(h);
       for (const h of _.after)
-        r.has(h) && i.get(h).push(_.descriptor);
+        i.has(h) && r.get(h).push(_.descriptor);
     }
     const c = (_, h) => n.get(_) - n.get(h), o = (_) => _.name ?? `system_${_.id}`;
     try {
-      return lt(s, i, c, o);
+      return dt(s, r, c, o);
     } catch (_) {
       throw _ instanceof TypeError ? new O(
         D.CIRCULAR_SYSTEM_DEPENDENCY,
@@ -1232,10 +1245,10 @@ function B(a, t) {
   let e = W.get(a);
   if (!e) {
     e = /* @__PURE__ */ Object.create(null);
-    const { field_names: r } = a.layout;
-    for (let i = 0; i < r.length; i++) {
-      const c = i;
-      Object.defineProperty(e, r[i], {
+    const { field_names: i } = a.layout;
+    for (let r = 0; r < i.length; r++) {
+      const c = r;
+      Object.defineProperty(e, i[r], {
         get() {
           return this._columns[c][this._row];
         },
@@ -1249,10 +1262,10 @@ function B(a, t) {
     W.set(a, e);
   }
   const s = Object.create(e), n = new Array(a.columns.length);
-  for (let r = 0; r < a.columns.length; r++) n[r] = a.columns[r].buf;
+  for (let i = 0; i < a.columns.length; i++) n[i] = a.columns[i].buf;
   return s._columns = n, s._row = t, s;
 }
-class St {
+class Dt {
   _archetypes;
   _defs;
   _resolver;
@@ -1261,8 +1274,18 @@ class St {
   _any_of;
   _non_empty_archetypes = [];
   _non_empty_dirty = !0;
-  constructor(t, e, s, n, r, i) {
-    this._archetypes = t, this._defs = e, this._resolver = s, this._include = n, this._exclude = r, this._any_of = i;
+  // Per-Query composition caches — single-component fast path.
+  // The final Query produced by _resolve_query is already cached by the
+  // resolver, but the caller pays a BitSet copy + defs slice per call
+  // before the resolver can hash and hit that cache. These caches
+  // short-circuit that allocation path for the common single-component
+  // composition shape (q.and(X), q.changed(X), etc).
+  _and_cache_single = null;
+  _not_cache_single = null;
+  _any_of_cache_single = null;
+  _changed_cache_single = null;
+  constructor(t, e, s, n, i, r) {
+    this._archetypes = t, this._defs = e, this._resolver = s, this._include = n, this._exclude = i, this._any_of = r;
   }
   /** Number of matching archetypes (including empty ones). */
   get archetype_count() {
@@ -1280,6 +1303,17 @@ class St {
   }
   /** Extend required component set. Returns a new (cached) Query. */
   and(...t) {
+    if (t.length === 1) {
+      const n = t[0], i = this._and_cache_single;
+      if (i !== null) {
+        const _ = i.get(n);
+        if (_ !== void 0) return _;
+      }
+      const r = this._include.copy(), c = this._defs.slice();
+      r.has(n) || (r.set(n), c.push(t[0]));
+      const o = this._resolver._resolve_query(r, this._exclude, this._any_of, c);
+      return (this._and_cache_single ??= /* @__PURE__ */ new Map()).set(n, o), o;
+    }
     const e = this._include.copy(), s = this._defs.slice();
     for (let n = 0; n < t.length; n++)
       e.has(t[n]) || (e.set(t[n]), s.push(t[n]));
@@ -1287,7 +1321,23 @@ class St {
   }
   /** Exclude archetypes that have any of these components. */
   not(...t) {
-    const e = this._exclude ? this._exclude.copy() : new k();
+    if (t.length === 1) {
+      const s = t[0], n = this._not_cache_single;
+      if (n !== null) {
+        const c = n.get(s);
+        if (c !== void 0) return c;
+      }
+      const i = this._exclude ? this._exclude.copy() : new p();
+      i.set(s);
+      const r = this._resolver._resolve_query(
+        this._include,
+        i,
+        this._any_of,
+        this._defs
+      );
+      return (this._not_cache_single ??= /* @__PURE__ */ new Map()).set(s, r), r;
+    }
+    const e = this._exclude ? this._exclude.copy() : new p();
     for (let s = 0; s < t.length; s++) e.set(t[s]);
     return this._resolver._resolve_query(
       this._include,
@@ -1318,7 +1368,23 @@ class St {
   }
   /** Require at least one of these components. */
   any_of(...t) {
-    const e = this._any_of ? this._any_of.copy() : new k();
+    if (t.length === 1) {
+      const s = t[0], n = this._any_of_cache_single;
+      if (n !== null) {
+        const c = n.get(s);
+        if (c !== void 0) return c;
+      }
+      const i = this._any_of ? this._any_of.copy() : new p();
+      i.set(s);
+      const r = this._resolver._resolve_query(
+        this._include,
+        this._exclude,
+        i,
+        this._defs
+      );
+      return (this._any_of_cache_single ??= /* @__PURE__ */ new Map()).set(s, r), r;
+    }
+    const e = this._any_of ? this._any_of.copy() : new p();
     for (let s = 0; s < t.length; s++) e.set(t[s]);
     return this._resolver._resolve_query(
       this._include,
@@ -1329,26 +1395,35 @@ class St {
   }
   /** Create a ChangedQuery that filters archetypes by change tick. */
   changed(...t) {
+    if (t.length === 1) {
+      const s = t[0], n = this._changed_cache_single;
+      if (n !== null) {
+        const r = n.get(s);
+        if (r !== void 0) return r;
+      }
+      const i = new $(this, [s]);
+      return (this._changed_cache_single ??= /* @__PURE__ */ new Map()).set(s, i), i;
+    }
     const e = new Array(t.length);
     for (let s = 0; s < t.length; s++) e[s] = t[s];
-    return new Nt(this, e);
+    return new $(this, e);
   }
   /** @internal — reads last_run_tick from the resolver (ECS). */
   _ctx_last_run_tick() {
     return this._resolver._get_last_run_tick();
   }
 }
-class Dt {
+class Rt {
   constructor(t) {
     this._resolver = t;
   }
   every(...t) {
-    const e = new k();
+    const e = new p();
     for (let s = 0; s < t.length; s++) e.set(t[s]);
     return this._resolver._resolve_query(e, null, null, t);
   }
 }
-class Rt {
+class Nt {
   store;
   last_run_tick = 0;
   /** Current world tick. Use this for write ticks in get_column_mut. */
@@ -1362,12 +1437,12 @@ class Rt {
     return this.store.create_entity();
   }
   get_field(t, e, s) {
-    const n = this.store.get_entity_archetype(t), r = this.store.get_entity_row(t);
-    return n.read_field(r, e, s);
+    const n = this.store.get_entity_archetype(t), i = this.store.get_entity_row(t);
+    return n.read_field(i, e, s);
   }
   set_field(t, e, s, n) {
-    const r = this.store.get_entity_archetype(t), i = this.store.get_entity_row(t), c = r.get_column_mut(e, s, this.store._tick);
-    c[i] = n;
+    const i = this.store.get_entity_archetype(t), r = this.store.get_entity_row(t), c = i.get_column_mut(e, s, this.store._tick);
+    c[r] = n;
   }
   /** Create a cached read-only component reference for a single entity. See ref.ts. */
   ref(t, e) {
@@ -1384,7 +1459,7 @@ class Rt {
     return this.store.destroy_entity_deferred(t), this;
   }
   add_component(t, e, s) {
-    return this.store.add_component_deferred(t, e, s ?? U), this;
+    return this.store.add_component_deferred(t, e, s ?? q), this;
   }
   remove_component(t, e) {
     return this.store.remove_component_deferred(t, e), this;
@@ -1414,7 +1489,7 @@ class Rt {
     return this.store.has_resource(t);
   }
 }
-class Nt {
+class $ {
   _query;
   _changed_ids;
   constructor(t, e) {
@@ -1422,11 +1497,11 @@ class Nt {
   }
   for_each(t) {
     const e = this._query._ctx_last_run_tick(), s = this._query._non_empty(), n = this._changed_ids;
-    for (let r = 0; r < s.length; r++) {
-      const i = s[r];
+    for (let i = 0; i < s.length; i++) {
+      const r = s[i];
       for (let c = 0; c < n.length; c++)
-        if (i._changed_tick[n[c]] >= e) {
-          t(i);
+        if (r._changed_tick[n[c]] >= e) {
+          t(r);
           break;
         }
     }
@@ -1435,7 +1510,7 @@ class Nt {
 const Pt = (a) => F(
   a
 );
-class qt {
+class Ut {
   store;
   schedule;
   ctx;
@@ -1451,9 +1526,9 @@ class qt {
   // Multiple queries can share the same hash (collision), so each bucket is an array.
   query_cache = /* @__PURE__ */ new Map();
   // Reusable BitSet for building query masks — avoids allocation per query() call
-  scratch_mask = new k();
+  scratch_mask = new p();
   constructor(t) {
-    this.store = new At(t?.initial_capacity), this.schedule = new It(), this.ctx = new Rt(this.store), this._fixed_timestep = t?.fixed_timestep ?? gt, this._max_fixed_steps = t?.max_fixed_steps ?? yt;
+    this.store = new xt(t?.initial_capacity), this.schedule = new St(), this.ctx = new Nt(this.store), this._fixed_timestep = t?.fixed_timestep ?? yt, this._max_fixed_steps = t?.max_fixed_steps ?? mt;
   }
   get fixed_timestep() {
     return this._fixed_timestep;
@@ -1468,7 +1543,7 @@ class qt {
   register_component(t, e) {
     if (Array.isArray(t)) {
       const s = e ?? "f64", n = /* @__PURE__ */ Object.create(null);
-      for (const r of t) n[r] = s;
+      for (const i of t) n[i] = s;
       return this.store.register_component(n);
     }
     return this.store.register_component(t);
@@ -1507,7 +1582,7 @@ class qt {
     return this.store.entity_count;
   }
   add_component(t, e, s) {
-    return this.store.add_component(t, e, s ?? U), this;
+    return this.store.add_component(t, e, s ?? q), this;
   }
   add_components(t, e) {
     this.store.add_components(t, e);
@@ -1532,12 +1607,12 @@ class qt {
     this.store.batch_remove_component(t, e);
   }
   get_field(t, e, s) {
-    const n = this.store.get_entity_archetype(t), r = this.store.get_entity_row(t);
-    return n.read_field(r, e, s);
+    const n = this.store.get_entity_archetype(t), i = this.store.get_entity_row(t);
+    return n.read_field(i, e, s);
   }
   set_field(t, e, s, n) {
-    const r = this.store.get_entity_archetype(t), i = this.store.get_entity_row(t), c = r.get_column_mut(e, s, this.store._tick);
-    c[i] = n;
+    const i = this.store.get_entity_archetype(t), r = this.store.get_entity_row(t), c = i.get_column_mut(e, s, this.store._tick);
+    c[r] = n;
   }
   emit(t, e) {
     const s = this.store.get_event_def_by_key(t);
@@ -1559,9 +1634,9 @@ class qt {
   }
   /** QueryResolver implementation — creates or retrieves a cached Query. */
   _resolve_query(t, e, s, n) {
-    const r = t.hash(), i = e ? e.hash() : 0, c = s ? s.hash() : 0, o = r ^ Math.imul(i, dt) ^ Math.imul(c, ut) | 0, _ = this._find_cached(o, t, e, s);
+    const i = t.hash(), r = e ? e.hash() : 0, c = s ? s.hash() : 0, o = i ^ Math.imul(r, ut) ^ Math.imul(c, ft) | 0, _ = this._find_cached(o, t, e, s);
     if (_ !== void 0) return _.query;
-    const h = this.store.register_query(t, e ?? void 0, s ?? void 0), l = new St(
+    const h = this.store.register_query(t, e ?? void 0, s ?? void 0), l = new Dt(
       h,
       n,
       this,
@@ -1569,7 +1644,7 @@ class qt {
       e?.copy() ?? null,
       s?.copy() ?? null
     );
-    return this.store.update_query_ref(h, l), K(this.query_cache, o, {
+    return this.store.update_query_ref(h, l), Q(this.query_cache, o, {
       include_mask: t.copy(),
       exclude_mask: e?.copy() ?? null,
       any_of_mask: s?.copy() ?? null,
@@ -1577,10 +1652,10 @@ class qt {
     }), l;
   }
   _find_cached(t, e, s, n) {
-    const r = this.query_cache.get(t);
-    if (r)
-      for (let i = 0; i < r.length; i++) {
-        const c = r[i];
+    const i = this.query_cache.get(t);
+    if (i)
+      for (let r = 0; r < i.length; r++) {
+        const c = i[r];
         if (!(!c.include_mask.equals(e) || !(s === null ? c.exclude_mask === null : c.exclude_mask !== null && c.exclude_mask.equals(s)) || !(n === null ? c.any_of_mask === null : c.any_of_mask !== null && c.any_of_mask.equals(n))))
           return c;
       }
@@ -1590,14 +1665,14 @@ class qt {
     let s;
     if (typeof t == "function")
       if (e !== void 0) {
-        const i = e(new Dt(this)), c = this.ctx, o = t;
-        s = { fn: (_, h) => o(i, c, h) };
+        const r = e(new Rt(this)), c = this.ctx, o = t;
+        s = { fn: (_, h) => o(r, c, h) };
       } else
         s = { fn: t };
     else
       s = t;
-    const n = Pt(this.next_system_id++), r = Object.freeze(Object.assign({ id: n }, s));
-    return this.systems.add(r), r;
+    const n = Pt(this.next_system_id++), i = Object.freeze(Object.assign({ id: n }, s));
+    return this.systems.add(i), i;
   }
   add_systems(t, ...e) {
     return this.schedule.add_systems(t, ...e), this;
@@ -1635,13 +1710,13 @@ function Mt(a) {
   return Symbol(a);
 }
 export {
-  Nt as ChangedQuery,
-  qt as ECS,
-  St as Query,
-  Dt as QueryBuilder,
-  xt as SCHEDULE,
-  Rt as SystemContext,
+  $ as ChangedQuery,
+  Ut as ECS,
+  Dt as Query,
+  Rt as QueryBuilder,
+  It as SCHEDULE,
+  Nt as SystemContext,
   Ot as event_key,
   Mt as resource_key,
-  Ut as signal_key
+  qt as signal_key
 };