@vworlds/vecs 1.0.20 → 1.0.22

package/dist/system.d.ts

@@ -1,9 +1,8 @@
 import { type ComponentType } from "./component.js";
 import { Iter, type FanInjectTuple, type MaybeResolvedInjectTuple } from "./inject.js";
 import { Query } from "./query/index.js";
-import { type QueryDSL } from "./dsl.js";
+import { type ExtractSpecsRequired, type QuerySpec } from "./dsl.js";
 import { Entity } from "./entity/index.js";
-import { type IPhase } from "./phase.js";
 import { type World } from "./world/index.js";
 import { type ITickSource } from "./timer.js";
 export type { QueryDSL as SystemQuery, EntityTestFunc } from "./dsl.js";
@@ -15,16 +14,14 @@ type RunCallback = (now: number, delta: number) => void;
  *
  * ```ts
  * world.system("Move")
- *   .requires(Position, Velocity)       // track entities with both components
- *   .phase("update")
+ *   .with(Position, Velocity)       // track entities with both components
  *   .enter([Position], (e, [pos]) => { pos.x = 0; })
  *   .update(Position, (e, pos) => { pos.x += pos.vx; })
  *   .exit((e) => { console.log("entity left", e.eid); });
  * ```
  *
- * Every builder method returns `this` for chaining. After registering systems
- * call {@link World.start} once, then drive the loop with
- * {@link World.runPhase} or {@link World.progress}.
+ * Every builder method returns `this` for chaining. Systems are inserted into
+ * the world's pipeline the next time {@link World.progress} runs.
  *
  * Internally each system holds a single ordered **inbox** of routed events
  * (`enter`, `exit`, `update`). The world appends to it during command-queue
@@ -33,12 +30,12 @@ type RunCallback = (now: number, delta: number) => void;
  *
  * ### Component injection and type inference
  *
- * `enter`, `exit`, `update`, `each`, and `sort` accept an array of component
+ * `enter`, `exit`, `update`, `each`, and `orderBy` accept an array of component
  * classes resolved from the entity and passed as a typed tuple to the
  * callback.
  *
- * Components declared via {@link requires} (or the `_guaranteed` argument of
- * {@link query}) are tracked as the type parameter `R`. Inside `sort`,
+ * Components declared via {@link with} (or the `hint` field of a
+ * {@link QueryConfig}) are tracked as the type parameter `R`. Inside `orderBy`,
  * `each`, and `update` injection callbacks they are non-nullable; any other
  * component remains `Type | undefined`.
  *
@@ -50,11 +47,13 @@ export declare class System<R extends ComponentType[] = []> extends Query<R> imp
     get didTick(): boolean;
     /** Milliseconds accumulated into this system's most recent fire. */
     get lastFireDelta(): number;
+    /** Place this system after a phase entity in the world pipeline. */
+    phase(phase: Entity | string): this;
     /**
      * Run this system at a fixed interval, expressed in seconds.
      *
-     * This is seconds, unlike `World.beginFrame`, `World.progress`, and
-     * `runPhase`, which receive millisecond deltas. Calling `interval` replaces
+     * This is seconds, unlike `World.beginFrame` and `World.progress`, which
+     * receive millisecond deltas. Calling `interval` replaces
      * the current cadence source with an {@link IntervalTickSource}. When this
      * system has a cadence source, the `delta` passed to {@link run} is the
      * accumulated milliseconds since the previous fire, not the per-frame delta.
@@ -113,19 +112,6 @@ export declare class System<R extends ComponentType[] = []> extends Query<R> imp
      */
     tickSource(source: ITickSource): this;
     private _setTickSource;
-    /**
-     * Assign this system to a pipeline phase.
-     *
-     * Pass either a phase name (resolved at {@link World.start}) or an
-     * {@link IPhase} reference returned from {@link World.addPhase}. Systems
-     * with no explicit phase fall into the built-in `"update"` phase.
-     *
-     * @param p - Phase name or `IPhase` reference.
-     * @returns This system, for chaining.
-     * @throws When the phase reference is not a `Phase`, or belongs to a
-     *   different world.
-     */
-    phase(p: string | IPhase): this;
     /**
      * Register a per-tick callback fired every time this system's phase runs,
      * regardless of entity membership.
@@ -146,11 +132,11 @@ export declare class System<R extends ComponentType[] = []> extends Query<R> imp
      *
      * Unlike {@link update} (which only fires when `entity.modified(C)` is
      * called), `each` fires every tick the system runs, once per tracked entity.
-     * Components declared via {@link requires} are non-nullable in the resolved
+     * Components declared via {@link with} are non-nullable in the resolved
      * tuple; any other component class may be `undefined` if the entity lacks it.
      *
      * `each` does **not** modify the system's query — define membership with
-     * {@link requires} or {@link query} as usual. It does, however, implicitly
+     * {@link with} as usual. It does, however, implicitly
      * enable {@link track}, so matched entities are exposed via {@link count},
      * {@link has}, iteration, and {@link forEach}.
      *
@@ -163,14 +149,14 @@ export declare class System<R extends ComponentType[] = []> extends Query<R> imp
      *
      * @param components - Component classes to resolve from each entity.
      * @param callback - Receives the entity and a tuple of resolved component
-     *   instances (`undefined` for any not covered by {@link requires}).
+     *   instances (`undefined` for any not covered by {@link with}).
      * @returns This system, for chaining.
      * @throws When `each` has already been registered on this system.
      *
      * @example
      * ```ts
      * world.system("Move")
-     *   .requires(Position, Velocity)
+     *   .with(Position, Velocity)
      *   .each([Position, Velocity], (e, [pos, vel]) => {
      *     pos.x += vel.vx;
      *     pos.y += vel.vy;
@@ -188,37 +174,21 @@ export declare class System<R extends ComponentType[] = []> extends Query<R> imp
      * cursor instead of the bare entity. The cursor exposes the visited entity
      * (`it.entity`) and, in `it.src`, the source entity each resolved component
      * was read from (the visited entity for direct components, the relationship
-     * target for `up`-injected ones).
+     * target for `target`-injected ones).
      */
     each<J extends FanInjectTuple>(cursor: typeof Iter, components: readonly [...J], callback: (it: Iter, resolved: MaybeResolvedInjectTuple<J, R>) => void): this;
     /**
-     * Set the entity-membership predicate using a {@link QueryDSL} expression.
+     * Add entity-membership predicates using {@link QuerySpec} expressions.
      *
-     * Replaces any implicit query derived from `update` watchlists and any
-     * previous `requires` call. After calling `query`, watchlist auto-expansion
-     * via `update` is disabled.
-     *
-     * The optional `_guaranteed` tuple is a pure type-level hint — see
-     * {@link Query.query} for details.
-     *
-     * @param q - Query expression.
-     * @param _guaranteed - Component classes guaranteed present on every matched
-     *   entity (type hint only — not validated at runtime).
-     * @returns This system, retyped with the guaranteed tuple as its `R`.
-     */
-    query<T extends ComponentType[] = []>(q: QueryDSL, _guaranteed?: readonly [...T]): System<T>;
-    /**
-     * Shorthand for `query([...components])` — tracks entities that have **all**
-     * of the listed component types.
+     * Merges with any existing predicate using `all`. After calling `with`,
+     * watchlist auto-expansion via `update` is disabled.
      *
-     * Equivalent to `query(components)`. The listed components are also
-     * recorded in the type parameter `R`, so {@link sort}, {@link each}, and
-     * {@link update} callbacks treat them as non-nullable.
+     * `hint` fields are pure type-level hints — see {@link Query.with} for details.
      *
-     * @param components - Component classes to require.
-     * @returns This system, retyped with the required tuple as its `R`.
+     * @param specs - Query specifications to add.
+     * @returns This system, retyped with the guaranteed components added to `R`.
      */
-    requires<T extends ComponentType[]>(...components: [...T]): System<T>;
+    with<const S extends readonly QuerySpec[]>(...specs: [...S]): System<[...R, ...ExtractSpecsRequired<S>]>;
     /**
      * Systems cannot use groupBy. Use `world.query(...).groupBy(...)` instead.
      */
@@ -244,7 +214,7 @@ export declare class System<R extends ComponentType[] = []> extends Query<R> imp
      *
      * @example
      * ```ts
-     * const sys = world.system("AI").requires(Enemy).run(runAI);
+     * const sys = world.system("AI").with(Enemy).run(runAI);
      * // Pause AI processing during a cutscene:
      * sys.disable();
      * // Resume:

package/dist/system.js

@@ -1,7 +1,8 @@
 import { isCursorMarker, makeInjectedInvoker, wantsIter, } from "./inject.js";
 import { SOURCE_TRACKED_QUERY_ERROR, Query } from "./query/index.js";
-import { containsDownTerm } from "./dsl.js";
-import { Phase } from "./phase.js";
+import { containsDownTerm, } from "./dsl.js";
+import { ON_UPDATE, Phase } from "./modules/pipeline.js";
+import { DependsOn } from "./modules/relationships.js";
 import { ALWAYS_TICK_SOURCE, IntervalTickSource, RateTickSource, } from "./timer.js";
 /**
  * A reactive processor running over a filtered subset of world entities.
@@ -10,16 +11,14 @@ import { ALWAYS_TICK_SOURCE, IntervalTickSource, RateTickSource, } from "./timer
  *
  * ```ts
  * world.system("Move")
- *   .requires(Position, Velocity)       // track entities with both components
- *   .phase("update")
+ *   .with(Position, Velocity)       // track entities with both components
  *   .enter([Position], (e, [pos]) => { pos.x = 0; })
  *   .update(Position, (e, pos) => { pos.x += pos.vx; })
  *   .exit((e) => { console.log("entity left", e.eid); });
  * ```
  *
- * Every builder method returns `this` for chaining. After registering systems
- * call {@link World.start} once, then drive the loop with
- * {@link World.runPhase} or {@link World.progress}.
+ * Every builder method returns `this` for chaining. Systems are inserted into
+ * the world's pipeline the next time {@link World.progress} runs.
  *
  * Internally each system holds a single ordered **inbox** of routed events
  * (`enter`, `exit`, `update`). The world appends to it during command-queue
@@ -28,12 +27,12 @@ import { ALWAYS_TICK_SOURCE, IntervalTickSource, RateTickSource, } from "./timer
  *
  * ### Component injection and type inference
  *
- * `enter`, `exit`, `update`, `each`, and `sort` accept an array of component
+ * `enter`, `exit`, `update`, `each`, and `orderBy` accept an array of component
  * classes resolved from the entity and passed as a typed tuple to the
  * callback.
  *
- * Components declared via {@link requires} (or the `_guaranteed` argument of
- * {@link query}) are tracked as the type parameter `R`. Inside `sort`,
+ * Components declared via {@link with} (or the `hint` field of a
+ * {@link QueryConfig}) are tracked as the type parameter `R`. Inside `orderBy`,
  * `each`, and `update` injection callbacks they are non-nullable; any other
  * component remains `Type | undefined`.
  *
@@ -49,6 +48,7 @@ export class System extends Query {
         /** @internal Cadence source for this system. Defaults to every frame. */
         this._tickSource = ALWAYS_TICK_SOURCE;
         this.entity.attach(System, this);
+        this.phase(ON_UPDATE);
     }
     /** @internal Reject non-reactive source/children terms before registering this system. */
     _build() {
@@ -72,6 +72,7 @@ export class System extends Query {
      * translate root-term membership events into inbox commands here.
      */
     _enter(e) {
+        this.changed = true;
         this._entities?.add(e);
         e._addQueryMembership(this);
         if (!this._enabled) {
@@ -80,13 +81,13 @@ export class System extends Query {
         if (this._enterCallback !== undefined) {
             this._inbox.push({ kind: 0 /* InboxCommand.Enter */, entity: e });
         }
-        e.components.forEach((c, eid) => {
-            const meta = this.world.entity(eid).ownMeta;
-            if (this._watchlistBitmask.hasBit(meta.bitPtr)) {
-                // Entry-time initialization bypasses the silence filter: an entity
-                // introduced by an ignored source must still initialize in this system.
-                this._pushUpdate(e, meta, c);
+        e.components.forEach((c, ceid) => {
+            if (!this._watchlistBitmask.has(ceid)) {
+                return;
             }
+            // Entry-time initialization bypasses the silence filter: an entity
+            // introduced by an ignored source must still initialize in this system.
+            this._pushUpdate(e, ceid, c);
         });
     }
     /**
@@ -96,6 +97,7 @@ export class System extends Query {
      * resolvable after the underlying components are removed.
      */
     _exit(e) {
+        this.changed = true;
         this._entities?.delete(e);
         e._removeQueryMembership(this);
         if (!this._enabled) {
@@ -105,10 +107,10 @@ export class System extends Query {
             let snapshot;
             if (this._exitSnapshotTypes && this._exitSnapshotTypes.length > 0) {
                 snapshot = new Map();
-                for (const eid of this._exitSnapshotTypes) {
-                    const c = e._get(eid);
+                for (const ceid of this._exitSnapshotTypes) {
+                    const c = e._get(ceid);
                     if (c) {
-                        snapshot.set(eid, c);
+                        snapshot.set(ceid, c);
                     }
                 }
             }
@@ -119,8 +121,8 @@ export class System extends Query {
      * @internal Routing entry: push an inbox `update` event when the modified
      * component matches the watchlist and its source is not silenced.
      */
-    _notifyModified(e, meta, c) {
-        if (!this._watchlistBitmask.hasBit(meta.bitPtr)) {
+    _notifyModified(e, ceid, c) {
+        if (!this._watchlistBitmask.has(ceid)) {
             return;
         }
         if (!this._enabled) {
@@ -129,11 +131,12 @@ export class System extends Query {
         if (this._isSourceSilenced()) {
             return;
         }
-        this._pushUpdate(e, meta, c);
+        this.changed = true;
+        this._pushUpdate(e, ceid, c);
     }
     /** @internal Append an `update` event to the inbox, bypassing the silence filter. */
-    _pushUpdate(e, meta, c) {
-        this._inbox.push({ kind: 2 /* InboxCommand.Update */, entity: e, meta, component: c });
+    _pushUpdate(e, ceid, c) {
+        this._inbox.push({ kind: 2 /* InboxCommand.Update */, entity: e, eid: ceid, component: c });
     }
     /**
      * @internal Execute one tick: drain the inbox in arrival order, then run
@@ -175,7 +178,7 @@ export class System extends Query {
                         this._exitCallback(event.entity, event.snapshot);
                         break;
                     case 2 /* InboxCommand.Update */:
-                        const callback = this._componentUpdateCallbacks.get(event.meta.eid);
+                        const callback = this._componentUpdateCallbacks.get(event.eid);
                         if (callback) {
                             callback(event.entity, event.component);
                         }
@@ -187,7 +190,7 @@ export class System extends Query {
                 this._runCallback(now, tickDelta);
             }
             if (this._eachCallback) {
-                this.forEach(this._eachCallback);
+                this._forEach(this._eachCallback);
             }
         });
     }
@@ -208,11 +211,18 @@ export class System extends Query {
         world._registerTickSource(this);
         this._tickSource._register(world);
     }
+    /** Place this system after a phase entity in the world pipeline. */
+    phase(phase) {
+        this._assertConfigurable();
+        const target = (typeof phase === "string" ? this.world.entity(phase) : phase).add(Phase);
+        this.entity.set(DependsOn, { target });
+        return this;
+    }
     /**
      * Run this system at a fixed interval, expressed in seconds.
      *
-     * This is seconds, unlike `World.beginFrame`, `World.progress`, and
-     * `runPhase`, which receive millisecond deltas. Calling `interval` replaces
+     * This is seconds, unlike `World.beginFrame` and `World.progress`, which
+     * receive millisecond deltas. Calling `interval` replaces
      * the current cadence source with an {@link IntervalTickSource}. When this
      * system has a cadence source, the `delta` passed to {@link run} is the
      * accumulated milliseconds since the previous fire, not the per-frame delta.
@@ -264,31 +274,6 @@ export class System extends Query {
         this._tickSource = source;
         source._register(this.world);
     }
-    /**
-     * Assign this system to a pipeline phase.
-     *
-     * Pass either a phase name (resolved at {@link World.start}) or an
-     * {@link IPhase} reference returned from {@link World.addPhase}. Systems
-     * with no explicit phase fall into the built-in `"update"` phase.
-     *
-     * @param p - Phase name or `IPhase` reference.
-     * @returns This system, for chaining.
-     * @throws When the phase reference is not a `Phase`, or belongs to a
-     *   different world.
-     */
-    phase(p) {
-        this._assertConfigurable();
-        if (typeof p !== "string") {
-            if (!(p instanceof Phase)) {
-                throw new Error("Invalid Phase object");
-            }
-            if (p.world !== this.world) {
-                throw new Error("Phase does not belong to this system's world");
-            }
-        }
-        this._phase = p;
-        return this;
-    }
     /**
      * Register a per-tick callback fired every time this system's phase runs,
      * regardless of entity membership.
@@ -320,37 +305,18 @@ export class System extends Query {
         return this;
     }
     /**
-     * Set the entity-membership predicate using a {@link QueryDSL} expression.
-     *
-     * Replaces any implicit query derived from `update` watchlists and any
-     * previous `requires` call. After calling `query`, watchlist auto-expansion
-     * via `update` is disabled.
+     * Add entity-membership predicates using {@link QuerySpec} expressions.
      *
-     * The optional `_guaranteed` tuple is a pure type-level hint — see
-     * {@link Query.query} for details.
-     *
-     * @param q - Query expression.
-     * @param _guaranteed - Component classes guaranteed present on every matched
-     *   entity (type hint only — not validated at runtime).
-     * @returns This system, retyped with the guaranteed tuple as its `R`.
-     */
-    query(q, _guaranteed) {
-        super.query(q, _guaranteed);
-        return this;
-    }
-    /**
-     * Shorthand for `query([...components])` — tracks entities that have **all**
-     * of the listed component types.
+     * Merges with any existing predicate using `all`. After calling `with`,
+     * watchlist auto-expansion via `update` is disabled.
      *
-     * Equivalent to `query(components)`. The listed components are also
-     * recorded in the type parameter `R`, so {@link sort}, {@link each}, and
-     * {@link update} callbacks treat them as non-nullable.
+     * `hint` fields are pure type-level hints — see {@link Query.with} for details.
      *
-     * @param components - Component classes to require.
-     * @returns This system, retyped with the required tuple as its `R`.
+     * @param specs - Query specifications to add.
+     * @returns This system, retyped with the guaranteed components added to `R`.
      */
-    requires(...components) {
-        super.requires(...components);
+    with(...specs) {
+        super.with(...specs);
         return this;
     }
     /**
@@ -380,7 +346,7 @@ export class System extends Query {
      *
      * @example
      * ```ts
-     * const sys = world.system("AI").requires(Enemy).run(runAI);
+     * const sys = world.system("AI").with(Enemy).run(runAI);
      * // Pause AI processing during a cutscene:
      * sys.disable();
      * // Resume:

package/dist/system.js.map

@@ -1 +1 @@
-{"version":3,"file":"system.js","sourceRoot":"","sources":["../src/system.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"system.js","sourceRoot":"","sources":["../src/system.ts"],"names":[],"mappings":"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"}

package/dist/terms/all_term.d.ts

@@ -1,7 +1,7 @@
 import type { QueryDSL } from "../dsl.js";
 import type { World } from "../world/index.js";
 import { Term } from "./term.js";
-import { type MergedInfo } from "./predicate_term.js";
+import { type CompositePrecheck } from "./composite_build.js";
 import type { getTerm as GetTermFn } from "./build.js";
 /**
  * Composite term that matches entities present in **all** of its children.
@@ -24,9 +24,5 @@ export declare class AllTerm extends Term {
      * @param onDestroy - Called when the last consumer unsubscribes.
      * @returns An `AllTerm` or, on diamond, a `PredicateTerm` with `kind === "merged"`.
      */
-    static build(world: World, terms: readonly QueryDSL[], key: string, originalDSL: QueryDSL, getTerm: typeof GetTermFn, precheck: (terms: readonly QueryDSL[]) => {
-        hasDiamond: boolean;
-        containsTarget: boolean;
-        info: MergedInfo;
-    }, onDestroy: (term: Term) => void): Term;
+    static build(world: World, terms: readonly QueryDSL[], key: string, originalDSL: QueryDSL, getTerm: typeof GetTermFn, precheck: CompositePrecheck, onDestroy: (term: Term) => void): Term;
 }

package/dist/terms/all_term.js

@@ -1,5 +1,5 @@
 import { Term } from "./term.js";
-import { PredicateTerm } from "./predicate_term.js";
+import { buildCompositeTerm } from "./composite_build.js";
 /**
  * Composite term that matches entities present in **all** of its children.
  *
@@ -26,12 +26,7 @@ export class AllTerm extends Term {
      * @returns An `AllTerm` or, on diamond, a `PredicateTerm` with `kind === "merged"`.
      */
     static build(world, terms, key, originalDSL, getTerm, precheck, onDestroy) {
-        const checked = precheck(terms);
-        if (checked.hasDiamond && !checked.containsTarget) {
-            return PredicateTerm.buildMerged(world, originalDSL, key, checked.info, getTerm, onDestroy);
-        }
-        const children = terms.map((dsl) => getTerm(world, dsl));
-        return new AllTerm(world, key, children, onDestroy);
+        return buildCompositeTerm(AllTerm, world, terms, key, originalDSL, getTerm, precheck, onDestroy);
     }
     /** @internal */
     _matches(entity) {

package/dist/terms/all_term.js.map

@@ -1 +1 @@
-{"version":3,"file":"all_term.js","sourceRoot":"","sources":["../../src/terms/all_term.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAmB,MAAM,qBAAqB,CAAC;AAGrE;;;;;GAKG;AACH,MAAM,OAAO,OAAQ,SAAQ,IAAI;IAC/B,YACE,KAAY,EACZ,GAAW,EACX,QAAyB,EACzB,SAA+B;QAE/B,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3C,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5B,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAED;;;;;;;;;;;;OAYG;IACI,MAAM,CAAC,KAAK,CACjB,KAAY,EACZ,KAA0B,EAC1B,GAAW,EACX,WAAqB,EACrB,OAAyB,EACzB,QAIC,EACD,SAA+B;QAE/B,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChC,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YAClD,OAAO,aAAa,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC9F,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACzD,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAED,gBAAgB;IACN,QAAQ,CAAC,MAAc;QAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,CAAC;CACF"}
+{"version":3,"file":"all_term.js","sourceRoot":"","sources":["../../src/terms/all_term.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAA0B,MAAM,sBAAsB,CAAC;AAGlF;;;;;GAKG;AACH,MAAM,OAAO,OAAQ,SAAQ,IAAI;IAC/B,YACE,KAAY,EACZ,GAAW,EACX,QAAyB,EACzB,SAA+B;QAE/B,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3C,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5B,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAED;;;;;;;;;;;;OAYG;IACI,MAAM,CAAC,KAAK,CACjB,KAAY,EACZ,KAA0B,EAC1B,GAAW,EACX,WAAqB,EACrB,OAAyB,EACzB,QAA2B,EAC3B,SAA+B;QAE/B,OAAO,kBAAkB,CACvB,OAAO,EACP,KAAK,EACL,KAAK,EACL,GAAG,EACH,WAAW,EACX,OAAO,EACP,QAAQ,EACR,SAAS,CACV,CAAC;IACJ,CAAC;IAED,gBAAgB;IACN,QAAQ,CAAC,MAAc;QAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,CAAC;CACF"}

package/dist/terms/any_term.d.ts

@@ -1,7 +1,7 @@
 import type { QueryDSL } from "../dsl.js";
 import type { World } from "../world/index.js";
 import { Term } from "./term.js";
-import { type MergedInfo } from "./predicate_term.js";
+import { type CompositePrecheck } from "./composite_build.js";
 import type { getTerm as GetTermFn } from "./build.js";
 /**
  * Composite term that matches entities present in **at least one** of its
@@ -25,9 +25,5 @@ export declare class AnyTerm extends Term {
      * @param onDestroy - Called when the last consumer unsubscribes.
      * @returns An `AnyTerm` or, on diamond, a `PredicateTerm` with `kind === "merged"`.
      */
-    static build(world: World, terms: readonly QueryDSL[], key: string, originalDSL: QueryDSL, getTerm: typeof GetTermFn, precheck: (terms: readonly QueryDSL[]) => {
-        hasDiamond: boolean;
-        containsTarget: boolean;
-        info: MergedInfo;
-    }, onDestroy: (term: Term) => void): Term;
+    static build(world: World, terms: readonly QueryDSL[], key: string, originalDSL: QueryDSL, getTerm: typeof GetTermFn, precheck: CompositePrecheck, onDestroy: (term: Term) => void): Term;
 }

package/dist/terms/any_term.js

@@ -1,5 +1,5 @@
 import { Term } from "./term.js";
-import { PredicateTerm } from "./predicate_term.js";
+import { buildCompositeTerm } from "./composite_build.js";
 /**
  * Composite term that matches entities present in **at least one** of its
  * children.
@@ -27,12 +27,7 @@ export class AnyTerm extends Term {
      * @returns An `AnyTerm` or, on diamond, a `PredicateTerm` with `kind === "merged"`.
      */
     static build(world, terms, key, originalDSL, getTerm, precheck, onDestroy) {
-        const checked = precheck(terms);
-        if (checked.hasDiamond && !checked.containsTarget) {
-            return PredicateTerm.buildMerged(world, originalDSL, key, checked.info, getTerm, onDestroy);
-        }
-        const children = terms.map((dsl) => getTerm(world, dsl));
-        return new AnyTerm(world, key, children, onDestroy);
+        return buildCompositeTerm(AnyTerm, world, terms, key, originalDSL, getTerm, precheck, onDestroy);
     }
     /** @internal */
     _matches(entity) {

package/dist/terms/any_term.js.map

@@ -1 +1 @@
-{"version":3,"file":"any_term.js","sourceRoot":"","sources":["../../src/terms/any_term.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAmB,MAAM,qBAAqB,CAAC;AAGrE;;;;;;GAMG;AACH,MAAM,OAAO,OAAQ,SAAQ,IAAI;IAC/B,YACE,KAAY,EACZ,GAAW,EACX,QAAyB,EACzB,SAA+B;QAE/B,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3C,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5B,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAED;;;;;;;;;;;;OAYG;IACI,MAAM,CAAC,KAAK,CACjB,KAAY,EACZ,KAA0B,EAC1B,GAAW,EACX,WAAqB,EACrB,OAAyB,EACzB,QAIC,EACD,SAA+B;QAE/B,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChC,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YAClD,OAAO,aAAa,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC9F,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACzD,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAED,gBAAgB;IACN,QAAQ,CAAC,MAAc;QAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3D,CAAC;CACF"}
+{"version":3,"file":"any_term.js","sourceRoot":"","sources":["../../src/terms/any_term.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAA0B,MAAM,sBAAsB,CAAC;AAGlF;;;;;;GAMG;AACH,MAAM,OAAO,OAAQ,SAAQ,IAAI;IAC/B,YACE,KAAY,EACZ,GAAW,EACX,QAAyB,EACzB,SAA+B;QAE/B,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3C,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5B,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAED;;;;;;;;;;;;OAYG;IACI,MAAM,CAAC,KAAK,CACjB,KAAY,EACZ,KAA0B,EAC1B,GAAW,EACX,WAAqB,EACrB,OAAyB,EACzB,QAA2B,EAC3B,SAA+B;QAE/B,OAAO,kBAAkB,CACvB,OAAO,EACP,KAAK,EACL,KAAK,EACL,GAAG,EACH,WAAW,EACX,OAAO,EACP,QAAQ,EACR,SAAS,CACV,CAAC;IACJ,CAAC;IAED,gBAAgB;IACN,QAAQ,CAAC,MAAc;QAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3D,CAAC;CACF"}

package/dist/terms/build.d.ts

@@ -1,6 +1,6 @@
 import { type QueryDSL } from "../dsl.js";
 import type { World } from "../world/index.js";
-import type { Entity } from "../entity/index.js";
+import type { EID, Entity } from "../entity/index.js";
 import { Term } from "./term.js";
 /**
  * Canonicalize `dsl`, look up or create its term in the world cache, and
@@ -18,7 +18,9 @@ export declare function getTerm(world: World, dsl: QueryDSL): Term;
 /**
  * Return the cached term for `dsl` without creating one if absent.
  *
- * Useful for introspection and testing; does not simplify the DSL.
+ * Useful for introspection and testing. It canonicalizes `dsl` (via the same
+ * simplify + cache-key path as {@link getTerm}) to look the term up, but never
+ * creates one.
  *
  * @param world - Owning world.
  * @param dsl - Query DSL expression to look up.
@@ -31,7 +33,7 @@ export declare function getCachedTerm(world: World, dsl: QueryDSL): Term | undef
  * Routes to the corresponding `ComponentTerm` (membership enter) and to the
  * world term (shape change, needed by `only` and merged predicate terms).
  */
-export declare function notifyComponentAdded(world: World, componentEid: number, entity: Entity): void;
+export declare function notifyComponentAdded(world: World, componentEid: EID, entity: Entity): void;
 /**
  * Notify the term graph that a component of `componentEid` changed value on
  * `entity` without a membership change.
@@ -39,18 +41,19 @@ export declare function notifyComponentAdded(world: World, componentEid: number,
  * Routes only to the `ComponentTerm`'s refresh channel (not shape), which
  * wakes predicate terms watching this component.
  */
-export declare function notifyComponentChanged(world: World, componentEid: number, entity: Entity): void;
+export declare function notifyComponentChanged(world: World, componentEid: EID, entity: Entity): void;
 /**
  * Notify the term graph that `componentEid` was removed from `entity`.
  *
  * Routes to the `ComponentTerm` (membership exit) and world term (shape).
  */
-export declare function notifyComponentRemoved(world: World, componentEid: number, entity: Entity): void;
+export declare function notifyComponentRemoved(world: World, componentEid: EID, entity: Entity): void;
 /**
  * Notify the term graph that a new entity was created.
  *
  * The world term evaluates the entity immediately and emits an enter event if
- * it qualifies (i.e. it is not a `Component` instance).
+ * it qualifies (any live, non-destroyed entity — component-definition entities
+ * included, so they are picked up reactively like ordinary entities).
  */
 export declare function notifyEntityCreated(world: World, entity: Entity): void;
 /**