@vworlds/vecs 1.0.19 → 1.0.21

package/dist/query/query.js

@@ -1,9 +1,13 @@
-import { _resolveRelationship } from "../dsl.js";
-import { Entity } from "../entity/index.js";
-import { directInjectEids, getInjected, injectArity, mapInject, } from "../inject.js";
-import { _setGroupedQueryCtor } from "./query.00.base.js";
-import { Grouping } from "./query.07.groups.js";
-import { Groups } from "./query.07.groups.js";
+import { containsDownTerm, isQueryConfig, } from "../dsl.js";
+import { forEachInjected, } from "../inject.js";
+import { SilenceSource, Traversable } from "../modules/relationships.js";
+import { ArrayMap } from "../util/array_map.js";
+import { Bitset } from "../util/bitset.js";
+import { OrderedSet } from "../util/ordered_set.js";
+import { makeEnterCallback, makeExitCallback, makeSortedEntitySet, makeUpdateRegistration, } from "./callbacks.js";
+import { SOURCE_TRACKED_QUERY_ERROR } from "./constants.js";
+import { getGroupedQueryPrototype } from "./grouped_query_registry.js";
+const EMPTY_ENTITIES = new Set();
 /**
  * A reactive, always-up-to-date set of entities matching a {@link QueryDSL}
  * predicate.
@@ -23,116 +27,351 @@ import { Groups } from "./query.07.groups.js";
  * you want a reactive entity set without pipeline integration.
  *
  * @typeParam R - Component classes guaranteed present on every matched entity
- *   (declared via {@link requires} or the `_guaranteed` hint of {@link query}).
- *   Components in `R` appear as non-nullable in {@link sort}, {@link forEach},
+ *   (declared via {@link with} or the `hint` field of a {@link QueryConfig}).
+ *   Components in `R` appear as non-nullable in {@link orderBy}, {@link forEach},
  *   and {@link update} callback tuples.
  */
-export class Query extends Groups {
+export class Query {
     constructor(name, world, track = true) {
-        super(name, world, Query, track);
+        /** True when membership or watched component data changed since the last reset. */
+        this.changed = false;
+        /** @internal DSL predicate used to build the root membership term. */
+        this._dsl = undefined;
+        /** @internal `enter` callback (already wraps any injection logic). */
+        this._enterCallback = undefined;
+        /** @internal `exit` callback (already wraps any injection logic). */
+        this._exitCallback = undefined;
+        /** @internal Component eids the exit callback needs snapshotted before component removal. */
+        this._exitSnapshotTypes = undefined;
+        /** @internal Whether membership APIs are enabled for this query. */
+        this._tracking = false;
+        /** @internal Bitmask of component eids this query reacts to via `update`. */
+        this._watchlistBitmask = new Bitset();
+        /** @internal `true` once this query has been registered with its world. */
+        this._built = false;
+        /** @internal Guards destroy hooks against recursive removal. */
+        this._destroyed = false;
+        /** @internal `true` once `with` has set an explicit predicate. */
+        this._hasExplicitQuery = false;
+        /** @internal Per-component-eid `update` callbacks. */
+        this._componentUpdateCallbacks = new ArrayMap();
+        this._queryComponentClass = Query;
+        this.entity = world.entity();
+        this.entity.name = name;
+        this.entity.attach(Query, this);
+        world._addUnbuiltQuery(this);
+        if (track) {
+            this.track();
+        }
+    }
+    /* -------------------------------------------------------------------------
+     * Identity And Membership Views
+     * -------------------------------------------------------------------------
+     * Read-only accessors over the backing entity and current matched set. These
+     * methods do not change query configuration or world registration state.
+     */
+    /** `true` once this query has been registered with its world. */
+    get built() {
+        return this._built;
+    }
+    /** Unique display name; forwards to the backing entity identity. */
+    get name() {
+        return this.entity.name;
+    }
+    /** World that owns this query; forwards to the backing entity. */
+    get world() {
+        return this.entity.world;
+    }
+    get count() {
+        if (!this._tracking) {
+            return 0;
+        }
+        return this._entities?.size ?? this.rootTerm?.count ?? 0;
+    }
+    [Symbol.iterator]() {
+        return this._matchedEntities()[Symbol.iterator]();
+    }
+    belongs(e) {
+        return this.rootTerm?.has(e) ?? false;
+    }
+    has(e) {
+        if (!this._tracking) {
+            return false;
+        }
+        return this._entities?.has(e) ?? this.rootTerm?.has(e) ?? false;
+    }
+    forEach(arg0, arg1, arg2) {
+        this.changed = false;
+        this._forEach(arg0, arg1, arg2);
+        return this;
+    }
+    /**
+     * @internal Iterate the matched entities with injection, **without**
+     * consuming the {@link changed} flag. Used by `System.each`, which runs every
+     * tick and must not reset `changed` (that flag tracks whether membership or
+     * watched data changed since the caller last read it).
+     */
+    _forEach(arg0, arg1, arg2) {
+        forEachInjected(this.world, this._matchedEntities(), arg0, arg1, arg2);
+    }
+    toString() {
+        return this.name ?? "";
+    }
+    /* -------------------------------------------------------------------------
+     * Predicate And Membership Configuration
+     * -------------------------------------------------------------------------
+     * Fluent builder methods that decide which entities belong to the query and
+     * how that membership is tracked, ordered, grouped, or source-filtered.
+     */
+    with(...specs) {
+        this._assertConfigurable();
+        const terms = [];
+        let cascade;
+        for (const spec of specs) {
+            if (isQueryConfig(spec)) {
+                terms.push(spec.with);
+                if (spec.cascade !== undefined) {
+                    cascade = spec.cascade;
+                }
+            }
+            else {
+                terms.push(spec);
+            }
+        }
+        this._dsl = this._dsl === undefined ? { all: terms } : { all: [this._dsl, ...terms] };
+        this._hasExplicitQuery = true;
+        if (cascade !== undefined) {
+            this.cascade(cascade);
+        }
+        return this;
+    }
+    without(dsl) {
+        this.with({ not: dsl });
+        return this;
+    }
+    track() {
+        this._assertConfigurable();
+        this._tracking = true;
+        return this;
+    }
+    orderBy(arg0, arg1, arg2) {
+        this._assertConfigurable();
+        this._tracking = true;
+        this._entities = makeSortedEntitySet(this.world, arg0, arg1, arg2);
+        return this;
+    }
+    cascade(rel, compare) {
+        this._assertConfigurable();
+        const relEntity = this.world.entity(rel);
+        const relMeta = relEntity.meta;
+        if (!relMeta.isRelationship) {
+            throw new Error(`Component ${relMeta.Class.name} is not a Relationship`);
+        }
+        const traversable = relEntity.get(Traversable);
+        if (!traversable) {
+            throw new Error(`Relationship ${relMeta.Class.name} does not have the Traversable trait`);
+        }
+        const depths = traversable.depths;
+        this.orderBy([], (a, _ra, b) => {
+            const da = depths.get(a) ?? -1;
+            const db = depths.get(b) ?? -1;
+            return da - db || compare?.(a, b) || 0;
+        });
+        this.update(relMeta.Class, (entity) => {
+            this._reSortCascade(entity, relMeta.eid);
+        });
+        return this;
+    }
+    groupBy(arg0, arg1) {
+        this._assertConfigurable();
+        Object.setPrototypeOf(this, getGroupedQueryPrototype());
+        return this._initialize(arg0, arg1);
+    }
+    ignoreSource(source) {
+        this._assertConfigurable();
+        const query = typeof source === "object" && !Array.isArray(source) && "entity" in source
+            ? source
+            : this._buildSilenceQuery(source);
+        this.entity.set(SilenceSource, { target: query.entity });
+        this._silenceQuery = query;
+        return this;
+    }
+    enter(arg0, arg1, arg2) {
+        this._assertConfigurable();
+        this._enterCallback = makeEnterCallback(this.world, arg0, arg1, arg2);
+        return this;
+    }
+    exit(arg0, arg1, arg2) {
+        this._assertConfigurable();
+        const exit = makeExitCallback(this.world, arg0, arg1, arg2);
+        this._exitCallback = exit.callback;
+        this._exitSnapshotTypes = exit.snapshotTypes;
+        return this;
+    }
+    update(arg0, arg1, arg2, arg3) {
+        this._assertConfigurable();
+        const { componentEid, callback } = makeUpdateRegistration(this.world, arg0, arg1, arg2, arg3);
+        this._componentUpdateCallbacks.set(componentEid, callback);
+        this._watchlistBitmask.add(componentEid);
+        if (!this._hasExplicitQuery) {
+            this._dsl = this._watchlistBitmask.indices();
+        }
+        return this;
+    }
+    /* -------------------------------------------------------------------------
+     * World Registration And Routing Hooks
+     * -------------------------------------------------------------------------
+     * Public internals called by World, terms, and System subclasses to register,
+     * destroy, and route membership/update events through the query.
+     */
+    build() {
+        if (this.built) {
+            return this;
+        }
+        if (this.world.deferred) {
+            this.world._addUnbuiltQuery(this);
+            return this;
+        }
+        return this._build();
     }
-}
-const EMPTY_GROUPS = new Map();
-/**
- * A {@link Query} that has been partitioned by {@link Query.groupBy}. Adds the
- * typed group-accessor surface ({@link group}, {@link groups}, etc.) on top of
- * the query's usual reactive membership.
- *
- * `GroupedQuery` lives in the query module alongside `Query`. Instances are
- * created lazily by {@link Query.groupBy} via `Object.setPrototypeOf`.
- *
- * @typeParam K - The grouping key type produced by the key function (or the
- *   relationship target entity, for the relationship form).
- * @typeParam R - Component classes guaranteed present on every matched entity.
- */
-export class GroupedQuery extends Query {
     /** @internal */
-    _initialize(arg0, arg1) {
-        if (this._grouping !== undefined) {
-            throw `query '${this.name}' is already grouped`;
-        }
-        let keyOf;
-        let watchEids;
-        if (typeof arg1 === "function") {
-            const components = arg0;
-            const inject = mapInject(this.world, components);
-            const arity = injectArity(inject);
-            const resolved = new Array(arity);
-            keyOf = (e) => {
-                getInjected(e, inject, false, resolved);
-                return arg1(e, resolved);
-            };
-            watchEids = directInjectEids(inject);
-            this._composeGroupMembership(components);
+    _build() {
+        if (this.built) {
+            return this;
         }
-        else {
-            const relEid = _resolveRelationship(arg0, this.world);
-            keyOf = (e) => e.parent(relEid);
-            watchEids = [relEid];
-            this._composeGroupMembership([arg0]);
+        if (!this._isBuildable()) {
+            this.destroy();
+            return this;
         }
-        for (const eid of watchEids) {
-            this._watchlistBitmask.add(eid);
+        this.world._removeUnbuiltQuery(this);
+        if (this._dsl !== undefined) {
+            if (this._tracking && containsDownTerm(this._dsl)) {
+                this.destroy();
+                throw new Error(SOURCE_TRACKED_QUERY_ERROR);
+            }
+            this.rootTerm = this.world.getTerm(this._dsl);
+            this._unsubscribeTerm = this.rootTerm.subscribe(this);
         }
-        this.track();
-        this._grouping = new Grouping(this.world, keyOf, watchEids);
+        this.world._addQuery(this);
+        this._built = true;
+        this._backfill();
         return this;
     }
     /** @internal */
+    _clearSilence() {
+        this._silenceQuery = undefined;
+    }
+    destroy() {
+        if (this._destroyed) {
+            return;
+        }
+        this._destroyed = true;
+        this.world._removeQuery(this);
+        this._entities?.clear();
+        this._entities = undefined;
+        this._tracking = false;
+        if (!this.entity._destroyed && this.entity.get(this._queryComponentClass) !== undefined) {
+            this.entity.destroy();
+        }
+    }
+    /** @internal */
     _enter(e) {
-        this._grouping.enter(e);
-        super._enter(e);
+        this.changed = true;
+        this._entities?.add(e);
+        e._addQueryMembership(this);
+        this._enterCallback?.(e);
+        e.components.forEach((c, ceid) => {
+            if (!this._watchlistBitmask.has(ceid)) {
+                return;
+            }
+            this._notifyModified(e, ceid, c);
+        });
     }
     /** @internal */
     _exit(e) {
-        super._exit(e);
-        this._grouping.exit(e);
+        this.changed = true;
+        this._exitCallback?.(e);
+        this._entities?.delete(e);
+        e._removeQueryMembership(this);
     }
     /** @internal */
-    _notifyModified(e, meta, c) {
-        super._notifyModified(e, meta, c);
-        this._grouping.refresh(e, meta.eid);
+    _notifyModified(e, ceid, c) {
+        if (!this._watchlistBitmask.has(ceid)) {
+            return;
+        }
+        if (this._isSourceSilenced()) {
+            return;
+        }
+        this.changed = true;
+        const callback = this._componentUpdateCallbacks.get(ceid);
+        if (callback) {
+            callback(e, c);
+        }
+    }
+    onTermEvent(kind, entity) {
+        if (kind === 0 /* TermEventKind.Enter */) {
+            this._enter(entity);
+        }
+        else {
+            this._exit(entity);
+        }
+    }
+    /** @internal */
+    _unsubscribeRootTerm() {
+        this._unsubscribeTerm?.();
+        this._unsubscribeTerm = undefined;
+        this.rootTerm = undefined;
     }
     /** @internal */
     _watchesUpdates() {
-        return super._watchesUpdates() || true;
+        return this._componentUpdateCallbacks.size > 0;
     }
-    group(key) {
-        return this._grouping?.get(key);
+    /** @internal Throw when a builder method is called after registration. */
+    _assertConfigurable() {
+        if (this.built) {
+            throw new Error(`query '${this.name}' has already been built`);
+        }
     }
-    groups() {
-        return (this._grouping?.groups.values() ?? EMPTY_GROUPS.values());
+    /** @internal */
+    _backfill() {
+        if (!this._tracking || !this.rootTerm) {
+            return;
+        }
+        this.world.defer(() => {
+            for (const e of this.rootTerm ?? EMPTY_ENTITIES) {
+                this._enter(e);
+            }
+        });
     }
-    groupKeys() {
-        return (this._grouping?.keys() ?? EMPTY_GROUPS.keys());
+    /** @internal Whether this object has enough configuration to enter the world. */
+    _isBuildable() {
+        return this._dsl !== undefined;
     }
-    get groupCount() {
-        return this._grouping?.groups.size ?? 0;
+    /** @internal */
+    _isSourceSilenced() {
+        const source = this.entity.world._routingSource;
+        return source !== undefined && this._silenceQuery?.has(source) === true;
     }
-    onGroupEnter(callback) {
-        this._assertConfigurable();
-        this._grouping?.setOnGroupEnter(callback);
-        return this;
+    /** @internal */
+    _matchedEntities() {
+        if (!this._tracking) {
+            return EMPTY_ENTITIES;
+        }
+        return this._entities ?? this.rootTerm ?? EMPTY_ENTITIES;
     }
-    onGroupExit(callback) {
-        this._assertConfigurable();
-        this._grouping?.setOnGroupExit(callback);
-        return this;
+    _buildSilenceQuery(dsl) {
+        const q = this.world.query(`${this.name}:silence`).with(dsl);
+        q.entity.childOf(this.entity);
+        return q;
     }
-    _composeGroupMembership(refs) {
-        const componentRefs = refs.filter((ref) => typeof ref === "number" || typeof ref === "function" || ref instanceof Entity);
-        if (componentRefs.length === 0) {
-            return;
+    _reSortCascade(entity, relEid) {
+        const entities = this._entities;
+        if (entities instanceof OrderedSet) {
+            entities.reSort(entity);
+        }
+        for (const child of entity._childrenByEid(relEid) ?? []) {
+            this._reSortCascade(child, relEid);
         }
-        const existing = this._dsl ?? true;
-        this._dsl = { all: [existing, ...componentRefs] };
-        this._hasExplicitQuery = true;
-    }
-    destroy() {
-        this._grouping?.clear();
-        this._grouping = undefined;
-        super.destroy();
     }
 }
-_setGroupedQueryCtor(GroupedQuery);
 //# sourceMappingURL=query.js.map

package/dist/query/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/query/query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/query/query.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,aAAa,GAId,MAAM,WAAW,CAAC;AAEnB,OAAO,EACL,eAAe,GAQhB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAEzE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,mBAAmB,EACnB,sBAAsB,GAGvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAGvE,MAAM,cAAc,GAAwB,IAAI,GAAG,EAAE,CAAC;AAEtD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,OAAO,KAAK;IAqChB,YAAY,IAAY,EAAE,KAAY,EAAE,QAAiB,IAAI;QApC7D,mFAAmF;QAC5E,YAAO,GAAG,KAAK,CAAC;QACvB,sEAAsE;QAC/D,SAAI,GAAyB,SAAS,CAAC;QAG9C,sEAAsE;QAC/D,mBAAc,GAA+B,SAAS,CAAC;QAC9D,qEAAqE;QAC9D,kBAAa,GAA+B,SAAS,CAAC;QAC7D,6FAA6F;QACtF,uBAAkB,GAAsB,SAAS,CAAC;QAKzD,oEAAoE;QAC7D,cAAS,GAAG,KAAK,CAAC;QACzB,6EAA6E;QACtE,sBAAiB,GAAW,IAAI,MAAM,EAAE,CAAC;QAEhD,2EAA2E;QACjE,WAAM,GAAG,KAAK,CAAC;QACzB,gEAAgE;QACtD,eAAU,GAAG,KAAK,CAAC;QAG7B,kEAAkE;QACxD,sBAAiB,GAAY,KAAK,CAAC;QAC7C,sDAAsD;QAC5C,8BAAyB,GAAG,IAAI,QAAQ,EAAqB,CAAC;QAOtE,IAAI,CAAC,oBAAoB,GAAG,KAAsB,CAAC;QACnD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAsB,EAAE,IAAI,CAAC,CAAC;QACjD,KAAK,CAAC,gBAAgB,CAAC,IAAW,CAAC,CAAC;QACpC,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;;;OAKG;IAEH,iEAAiE;IACjE,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,oEAAoE;IACpE,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED,kEAAkE;IAClE,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;IAC3B,CAAC;IAED,IAAW,KAAK;QACd,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,CAAC;QACX,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,EAAE,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC,CAAC;IAC3D,CAAC;IAEM,CAAC,MAAM,CAAC,QAAQ,CAAC;QACtB,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IACpD,CAAC;IAEM,OAAO,CAAC,CAAS;QACtB,OAAO,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;IACxC,CAAC;IAEM,GAAG,CAAC,CAAS;QAClB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;IAClE,CAAC;IAiBM,OAAO,CAAC,IAAa,EAAE,IAAc,EAAE,IAAc;QAC1D,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACO,QAAQ,CAAC,IAAa,EAAE,IAAc,EAAE,IAAc;QAC9D,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACzE,CAAC;IAEM,QAAQ;QACb,OAAO,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;IACzB,CAAC;IAED;;;;;OAKG;IAEI,IAAI,CACT,GAAG,KAAa;QAEhB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAe,EAAE,CAAC;QAC7B,IAAI,OAAiC,CAAC;QAEtC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACtB,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;oBAC/B,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;gBACzB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,CAAC;QACH,CAAC;QAED,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;QACtF,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC9B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;QACD,OAAO,IAA6B,CAAC;IACvC,CAAC;IAEM,OAAO,CAAC,GAAa;QAC1B,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IA+BM,OAAO,CACZ,IAA4D,EAC5D,IAA0C,EAC1C,IAAe;QAEf,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,SAAS,GAAG,mBAAmB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACnE,OAAO,IAAI,CAAC;IACd,CAAC;IAIM,OAAO,CAAC,GAAiB,EAAE,OAA0C;QAC1E,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC;QAC/B,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,aAAa,OAAO,CAAC,KAAK,CAAC,IAAI,wBAAwB,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,KAAK,CAAC,IAAI,sCAAsC,CAAC,CAAC;QAC5F,CAAC;QAED,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;QAClC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE;YAC7B,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/B,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/B,OAAO,EAAE,GAAG,EAAE,IAAI,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE;YACpC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAOM,OAAO,CACZ,IAAgD,EAChD,IAAwC;QAExC,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,wBAAwB,EAAE,CAAC,CAAC;QACxD,OAAQ,IAAY,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IAEM,YAAY,CAAC,MAAwB;QAC1C,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,MAAM,KAAK,GACT,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,QAAQ,IAAI,MAAM;YACxE,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QACzD,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAwBM,KAAK,CACV,IAAuE,EACvE,IAA6B,EAC7B,IAAe;QAEf,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,iBAAiB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;IAiBM,IAAI,CACT,IAA2E,EAC3E,IAAmD,EACnD,IAA+B;QAE/B,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC5D,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC;QACnC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,aAAa,CAAC;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;IA4BM,MAAM,CACX,IAAqC,EACrC,IAA+D,EAC/D,IAA4D,EAC5D,IAA+B;QAE/B,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,sBAAsB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC9F,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC3D,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC;QAC/C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IAEI,KAAK;QACV,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAW,CAAC,CAAC;YACzC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAED,gBAAgB;IACT,MAAM;QACX,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;YACzB,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAW,CAAC,CAAC;QAC5C,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,IAAI,CAAC,SAAS,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;YAC9C,CAAC;YACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9C,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAW,CAAC,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,gBAAgB;IACT,aAAa;QAClB,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;IACjC,CAAC;IAEM,OAAO;QACZ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAW,CAAC,CAAC;QACrC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,SAAS,EAAE,CAAC;YACxF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;IAED,gBAAgB;IACT,MAAM,CAAC,CAAS;QACrB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;QACvB,CAAC,CAAC,mBAAmB,CAAC,IAAW,CAAC,CAAC;QACnC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE;YAC/B,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtC,OAAO;YACT,CAAC;YACD,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB;IACT,KAAK,CAAC,CAAS;QACpB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,sBAAsB,CAAC,IAAW,CAAC,CAAC;IACxC,CAAC;IAED,gBAAgB;IACT,eAAe,CAAC,CAAS,EAAE,IAAS,EAAE,CAAoB;QAC/D,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;QACD,IAAI,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACjB,CAAC;IACH,CAAC;IAEM,WAAW,CAAC,IAAmB,EAAE,MAAc;QACpD,IAAI,IAAI,gCAAwB,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrB,CAAC;IACH,CAAC;IAED,gBAAgB;IACT,oBAAoB;QACzB,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAC1B,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,gBAAgB;IACT,eAAe;QACpB,OAAO,IAAI,CAAC,yBAAyB,CAAC,IAAI,GAAG,CAAC,CAAC;IACjD,CAAC;IAED,0EAA0E;IAChE,mBAAmB;QAC3B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,UAAU,IAAI,CAAC,IAAI,0BAA0B,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED,gBAAgB;IACN,SAAS;QACjB,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE;YACpB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,IAAI,cAAc,EAAE,CAAC;gBAChD,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,iFAAiF;IACvE,YAAY;QACpB,OAAO,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;IACjC,CAAC;IAED,gBAAgB;IACN,iBAAiB;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC;QAChD,OAAO,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;IAC1E,CAAC;IAED,gBAAgB;IACN,gBAAgB;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,cAAc,CAAC;QACxB,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,QAAQ,IAAI,cAAc,CAAC;IAC3D,CAAC;IAEO,kBAAkB,CAAC,GAAa;QACtC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7D,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,OAAO,CAAC,CAAC;IACX,CAAC;IAEO,cAAc,CAAC,MAAc,EAAE,MAAW;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,QAAQ,YAAY,UAAU,EAAE,CAAC;YACnC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YACxD,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;CACF"}

package/dist/system.d.ts

@@ -1,7 +1,7 @@
 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";
@@ -15,7 +15,7 @@ type RunCallback = (now: number, delta: number) => void;
  *
  * ```ts
  * world.system("Move")
- *   .requires(Position, Velocity)       // track entities with both components
+ *   .with(Position, Velocity)       // track entities with both components
  *   .phase("update")
  *   .enter([Position], (e, [pos]) => { pos.x = 0; })
  *   .update(Position, (e, pos) => { pos.x += pos.vx; })
@@ -33,12 +33,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`.
  *
@@ -146,11 +146,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 +163,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 +188,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.
+     * Merges with any existing predicate using `all`. After calling `with`,
+     * watchlist auto-expansion via `update` is disabled.
      *
-     * The optional `_guaranteed` tuple is a pure type-level hint — see
-     * {@link Query.query} for details.
+     * `hint` fields are pure type-level hints — see {@link Query.with} 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`.
+     * @param specs - Query specifications to add.
+     * @returns This system, retyped with the guaranteed components added to `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.
-     *
-     * 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.
-     *
-     * @param components - Component classes to require.
-     * @returns This system, retyped with the required tuple as its `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 +228,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: