@vworlds/vecs 1.0.20 → 1.0.21

package/dist/query/grouped_query.js

@@ -0,0 +1,121 @@
+import { _resolveRelationship } from "../dsl.js";
+import { Entity } from "../entity/index.js";
+import { directInjectEids, getInjected, injectArity, mapInject, } from "../inject.js";
+import { Grouping } from "./grouping.js";
+import { registerGroupedQueryPrototype } from "./grouped_query_registry.js";
+import { Query } from "./query.js";
+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.
+ *
+ * Instances are created lazily by {@link Query.groupBy} via
+ * `Object.setPrototypeOf`, so callers keep the same configured query object.
+ *
+ * @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 {
+    get groupCount() {
+        return this._grouping?.groups.size ?? 0;
+    }
+    /** @internal */
+    _enter(e) {
+        this._grouping.enter(e);
+        super._enter(e);
+    }
+    /** @internal */
+    _exit(e) {
+        super._exit(e);
+        this._grouping.exit(e);
+    }
+    /** @internal */
+    _initialize(arg0, arg1) {
+        if (this._grouping !== undefined) {
+            throw new Error(`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);
+        }
+        else {
+            const relEid = _resolveRelationship(arg0, this.world);
+            keyOf = (e) => e.parent(relEid);
+            watchEids = [relEid];
+            this._composeGroupMembership([arg0]);
+        }
+        for (const ceid of watchEids) {
+            this._watchlistBitmask.add(ceid);
+        }
+        this.track();
+        this._grouping = new Grouping(this.world, keyOf, watchEids);
+        return this;
+    }
+    /** @internal */
+    _notifyModified(e, ceid, c) {
+        super._notifyModified(e, ceid, c);
+        // A mutation routed from a silenced source must be invisible to the query,
+        // including its group membership: re-keying here would leak the silenced
+        // write through `group(...)`. Mirror the base early-return.
+        if (this._isSourceSilenced()) {
+            return;
+        }
+        this._grouping.refresh(e, ceid);
+    }
+    /**
+     * @internal A grouped query always reacts to component changes: a watched
+     * component changing can re-key an entity into a different group, so the
+     * host entity must register it in `_queries` regardless of whether a user
+     * `update` callback is present.
+     */
+    _watchesUpdates() {
+        return true;
+    }
+    destroy() {
+        this._grouping?.clear();
+        this._grouping = undefined;
+        super.destroy();
+    }
+    group(key) {
+        return this._grouping?.get(key);
+    }
+    groups() {
+        return (this._grouping?.groups.values() ?? EMPTY_GROUPS.values());
+    }
+    groupKeys() {
+        return (this._grouping?.keys() ?? EMPTY_GROUPS.keys());
+    }
+    onGroupEnter(callback) {
+        this._assertConfigurable();
+        this._grouping?.setOnGroupEnter(callback);
+        return this;
+    }
+    onGroupExit(callback) {
+        this._assertConfigurable();
+        this._grouping?.setOnGroupExit(callback);
+        return this;
+    }
+    _composeGroupMembership(refs) {
+        const componentRefs = refs.filter((ref) => typeof ref === "number" || typeof ref === "function" || ref instanceof Entity);
+        if (componentRefs.length === 0) {
+            return;
+        }
+        const existing = this._dsl ?? true;
+        this._dsl = { all: [existing, ...componentRefs] };
+        this._hasExplicitQuery = true;
+    }
+}
+registerGroupedQueryPrototype(GroupedQuery.prototype);
+//# sourceMappingURL=grouped_query.js.map

package/dist/query/grouped_query.js.map

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

package/dist/query/grouped_query_registry.d.ts

@@ -0,0 +1,4 @@
+type GroupedQueryPrototype = object;
+export declare function getGroupedQueryPrototype(): GroupedQueryPrototype;
+export declare function registerGroupedQueryPrototype(prototype: GroupedQueryPrototype): void;
+export {};

package/dist/query/grouped_query_registry.js

@@ -0,0 +1,11 @@
+let groupedQueryPrototype;
+export function getGroupedQueryPrototype() {
+    if (groupedQueryPrototype === undefined) {
+        throw new Error("GroupedQuery has not been registered");
+    }
+    return groupedQueryPrototype;
+}
+export function registerGroupedQueryPrototype(prototype) {
+    groupedQueryPrototype = prototype;
+}
+//# sourceMappingURL=grouped_query_registry.js.map

package/dist/query/grouped_query_registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"grouped_query_registry.js","sourceRoot":"","sources":["../../src/query/grouped_query_registry.ts"],"names":[],"mappings":"AAEA,IAAI,qBAAwD,CAAC;AAE7D,MAAM,UAAU,wBAAwB;IACtC,IAAI,qBAAqB,KAAK,SAAS,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,SAAgC;IAC5E,qBAAqB,GAAG,SAAS,CAAC;AACpC,CAAC"}

package/dist/query/grouping.d.ts

@@ -0,0 +1,24 @@
+import { Entity, type EID } from "../entity/index.js";
+import { type World } from "../world/index.js";
+import { Group } from "./group.js";
+export declare class Grouping {
+    readonly groups: Map<unknown, Group<unknown, []>>;
+    private readonly _entityKeys;
+    private readonly _keyOf;
+    private readonly _watchEids;
+    private readonly _world;
+    private _onGroupEnter;
+    private _onGroupExit;
+    constructor(world: World, keyOf: (e: Entity) => unknown, watchEids: Iterable<EID>);
+    clear(): void;
+    enter(e: Entity): void;
+    exit(e: Entity): void;
+    get(key: unknown): Group | undefined;
+    keys(): IterableIterator<unknown>;
+    refresh(e: Entity, ceid: EID): void;
+    setOnGroupEnter(callback: (group: Group) => void): void;
+    setOnGroupExit(callback: (key: unknown, group: Group) => void): void;
+    private _addToBucket;
+    private _assign;
+    private _removeFromBucket;
+}

package/dist/query/{query.07.groups.js → grouping.js}

@@ -1,33 +1,4 @@
-import { forEachInjected, } from "../inject.js";
-import { Predicate } from "./query.06.predicate.js";
-export class Group {
-    constructor(world, key) {
-        this._entities = new Set();
-        this._world = world;
-        this.key = key;
-    }
-    get count() {
-        return this._entities.size;
-    }
-    has(e) {
-        return this._entities.has(e);
-    }
-    [Symbol.iterator]() {
-        return this._entities[Symbol.iterator]();
-    }
-    forEach(arg0, arg1, arg2) {
-        forEachInjected(this._world, this._entities, arg0, arg1, arg2);
-    }
-    /** @internal */
-    _add(e) {
-        this._entities.add(e);
-    }
-    /** @internal */
-    _remove(e) {
-        this._entities.delete(e);
-        return this._entities.size === 0;
-    }
-}
+import { Group } from "./group.js";
 export class Grouping {
     constructor(world, keyOf, watchEids) {
         this.groups = new Map();
@@ -36,17 +7,9 @@ export class Grouping {
         this._keyOf = keyOf;
         this._watchEids = new Set(watchEids);
     }
-    get(key) {
-        return this.groups.get(key);
-    }
-    keys() {
-        return this.groups.keys();
-    }
-    setOnGroupEnter(callback) {
-        this._onGroupEnter = callback;
-    }
-    setOnGroupExit(callback) {
-        this._onGroupExit = callback;
+    clear() {
+        this.groups.clear();
+        this._entityKeys.clear();
     }
     enter(e) {
         this._assign(e, this._keyOf(e));
@@ -58,15 +21,34 @@ export class Grouping {
         }
         this._entityKeys.delete(e);
     }
-    refresh(e, eid) {
-        if (!this._watchEids.has(eid)) {
+    get(key) {
+        return this.groups.get(key);
+    }
+    keys() {
+        return this.groups.keys();
+    }
+    refresh(e, ceid) {
+        if (!this._watchEids.has(ceid)) {
             return;
         }
         this._assign(e, this._keyOf(e));
     }
-    clear() {
-        this.groups.clear();
-        this._entityKeys.clear();
+    setOnGroupEnter(callback) {
+        this._onGroupEnter = callback;
+    }
+    setOnGroupExit(callback) {
+        this._onGroupExit = callback;
+    }
+    _addToBucket(e, key) {
+        let group = this.groups.get(key);
+        if (group === undefined) {
+            group = new Group(this._world, key);
+            this.groups.set(key, group);
+            group._add(e);
+            this._onGroupEnter?.(group);
+            return;
+        }
+        group._add(e);
     }
     _assign(e, newKey) {
         const oldKey = this._entityKeys.get(e);
@@ -83,17 +65,6 @@ export class Grouping {
         this._addToBucket(e, newKey);
         this._entityKeys.set(e, newKey);
     }
-    _addToBucket(e, key) {
-        let group = this.groups.get(key);
-        if (group === undefined) {
-            group = new Group(this._world, key);
-            this.groups.set(key, group);
-            group._add(e);
-            this._onGroupEnter?.(group);
-            return;
-        }
-        group._add(e);
-    }
     _removeFromBucket(e, key) {
         const group = this.groups.get(key);
         if (group === undefined) {
@@ -105,6 +76,4 @@ export class Grouping {
         }
     }
 }
-export class Groups extends Predicate {
-}
-//# sourceMappingURL=query.07.groups.js.map
+//# sourceMappingURL=grouping.js.map

package/dist/query/grouping.js.map

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

package/dist/query/index.d.ts

@@ -1,6 +1,6 @@
-export { Query, GroupedQuery } from "./query.js";
-export { Group, Grouping } from "./query.07.groups.js";
-export { _setGroupedQueryCtor, SOURCE_TRACKED_QUERY_ERROR } from "./query.00.base.js";
-export type { EntityTestFunc, MaybeRequired, QueryDSL } from "../dsl.js";
-export { Iter } from "../inject.js";
-export type { DownInject, FanInjectElement, FanInjectTuple, InjectElement, InjectTuple, MaybeResolvedInjectTuple, RequiredResolvedInjectTuple, UpInject, } from "../inject.js";
+import "./grouped_query.js";
+export { SOURCE_TRACKED_QUERY_ERROR } from "./constants.js";
+export { Group } from "./group.js";
+export { GroupedQuery } from "./grouped_query.js";
+export { Grouping } from "./grouping.js";
+export { Query } from "./query.js";

package/dist/query/index.js

@@ -1,5 +1,7 @@
-export { Query, GroupedQuery } from "./query.js";
-export { Group, Grouping } from "./query.07.groups.js";
-export { _setGroupedQueryCtor, SOURCE_TRACKED_QUERY_ERROR } from "./query.00.base.js";
-export { Iter } from "../inject.js";
+import "./grouped_query.js";
+export { SOURCE_TRACKED_QUERY_ERROR } from "./constants.js";
+export { Group } from "./group.js";
+export { GroupedQuery } from "./grouped_query.js";
+export { Grouping } from "./grouping.js";
+export { Query } from "./query.js";
 //# sourceMappingURL=index.js.map

package/dist/query/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAEtF,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAC;AAE5B,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC"}

package/dist/query/query.d.ts

@@ -1,7 +1,10 @@
-import { type ComponentType } from "../component.js";
+import { type ComponentRef, type ComponentType } from "../component.js";
+import { type ExtractSpecsRequired, type QueryDSL, type QuerySpec } from "../dsl.js";
+import { Entity } from "../entity/index.js";
+import { Iter, type FanInjectTuple, type InjectTuple, type MaybeResolvedInjectTuple, type RequiredResolvedInjectTuple } from "../inject.js";
+import { TermConsumer, TermEventKind, type Term } from "../terms/term.js";
 import { type World } from "../world/index.js";
-import { Group } from "./query.07.groups.js";
-import { Groups } from "./query.07.groups.js";
+import { type GroupedQuery } from "./grouped_query.js";
 /**
  * A reactive, always-up-to-date set of entities matching a {@link QueryDSL}
  * predicate.
@@ -21,33 +24,60 @@ 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 declare class Query<R extends ComponentType[] = []> extends Groups<R> {
+export declare class Query<R extends ComponentType[] = []> implements TermConsumer {
+    /** True when membership or watched component data changed since the last reset. */
+    changed: boolean;
+    /** Entity that stores this query as a component and carries query traits. */
+    readonly entity: Entity;
+    /** Materialized root term that owns membership for this query. */
+    rootTerm: Term | undefined;
     constructor(name: string, world: World, track?: boolean);
-}
-/**
- * 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 declare class GroupedQuery<K = unknown, R extends ComponentType[] = []> extends Query<R> {
-    private _grouping;
-    group(key: K): Group<K, R> | undefined;
-    groups(): IterableIterator<Group<K, R>>;
-    groupKeys(): IterableIterator<K>;
-    get groupCount(): number;
-    onGroupEnter(callback: (group: Group<K, R>) => void): this;
-    onGroupExit(callback: (key: K, group: Group<K, R>) => void): this;
-    private _composeGroupMembership;
+    /** `true` once this query has been registered with its world. */
+    get built(): boolean;
+    /** Unique display name; forwards to the backing entity identity. */
+    get name(): string | undefined;
+    /** World that owns this query; forwards to the backing entity. */
+    get world(): World;
+    get count(): number;
+    [Symbol.iterator](): IterableIterator<Entity>;
+    belongs(e: Entity): boolean;
+    has(e: Entity): boolean;
+    forEach(callback: (e: Entity) => void): this;
+    forEach<J extends FanInjectTuple>(components: readonly [...J], callback: (e: Entity, resolved: MaybeResolvedInjectTuple<J, R>) => void): this;
+    forEach<J extends FanInjectTuple>(cursor: typeof Entity, components: readonly [...J], callback: (e: Entity, resolved: MaybeResolvedInjectTuple<J, R>) => void): this;
+    forEach<J extends FanInjectTuple>(cursor: typeof Iter, components: readonly [...J], callback: (it: Iter, resolved: MaybeResolvedInjectTuple<J, R>) => void): this;
+    toString(): string;
+    with<const S extends readonly QuerySpec[]>(...specs: [...S]): Query<[...R, ...ExtractSpecsRequired<S>]>;
+    without(dsl: QueryDSL): this;
+    track(): this;
+    orderBy<J extends InjectTuple>(components: readonly [...J], compare: (entityA: Entity, a: MaybeResolvedInjectTuple<J, R>, entityB: Entity, b: MaybeResolvedInjectTuple<J, R>) => number): this;
+    orderBy<J extends InjectTuple>(cursor: typeof Entity, components: readonly [...J], compare: (entityA: Entity, a: MaybeResolvedInjectTuple<J, R>, entityB: Entity, b: MaybeResolvedInjectTuple<J, R>) => number): this;
+    orderBy<J extends InjectTuple>(cursor: typeof Iter, components: readonly [...J], compare: (a: Iter, aResolved: MaybeResolvedInjectTuple<J, R>, b: Iter, bResolved: MaybeResolvedInjectTuple<J, R>) => number): this;
+    cascade(rel: ComponentRef): this;
+    cascade(rel: ComponentRef, compare: (a: Entity, b: Entity) => number): this;
+    groupBy<K, J extends FanInjectTuple>(components: readonly [...J], key: (e: Entity, resolved: MaybeResolvedInjectTuple<J, R>) => K): GroupedQuery<K, R>;
+    groupBy(relationship: ComponentRef): GroupedQuery<Entity, R>;
+    ignoreSource(source: QueryDSL | Query): this;
+    enter<J extends InjectTuple>(inject: readonly [...J], callback: (e: Entity, injected: RequiredResolvedInjectTuple<J>) => void): this;
+    enter<J extends InjectTuple>(cursor: typeof Entity, inject: readonly [...J], callback: (e: Entity, injected: RequiredResolvedInjectTuple<J>) => void): this;
+    enter<J extends InjectTuple>(cursor: typeof Iter, inject: readonly [...J], callback: (it: Iter, injected: RequiredResolvedInjectTuple<J>) => void): this;
+    enter(callback: (e: Entity) => void): this;
+    exit<J extends InjectTuple>(inject: readonly [...J], callback: (e: Entity, injected: RequiredResolvedInjectTuple<J>) => void): this;
+    exit<J extends InjectTuple>(cursor: typeof Entity, inject: readonly [...J], callback: (e: Entity, injected: RequiredResolvedInjectTuple<J>) => void): this;
+    exit<J extends InjectTuple>(cursor: typeof Iter, inject: readonly [...J], callback: (it: Iter, injected: RequiredResolvedInjectTuple<J>) => void): this;
+    exit(callback: (e: Entity) => void): this;
+    update<C extends ComponentType>(ComponentClass: C, callback: (e: Entity, c: InstanceType<C>) => void): this;
+    update<C extends ComponentType, J extends InjectTuple>(ComponentClass: C, inject: readonly [...J], callback: (e: Entity, c: InstanceType<C>, injected: MaybeResolvedInjectTuple<J, R>) => void): this;
+    update<C extends ComponentType, J extends InjectTuple>(cursor: typeof Entity, ComponentClass: C, inject: readonly [...J], callback: (e: Entity, c: InstanceType<C>, injected: MaybeResolvedInjectTuple<J, R>) => void): this;
+    update<C extends ComponentType>(cursor: typeof Entity, ComponentClass: C, callback: (e: Entity, c: InstanceType<C>) => void): this;
+    update<C extends ComponentType, J extends InjectTuple>(cursor: typeof Iter, ComponentClass: C, inject: readonly [...J], callback: (it: Iter, c: InstanceType<C>, injected: MaybeResolvedInjectTuple<J, R>) => void): this;
+    build(): this;
     destroy(): void;
+    onTermEvent(kind: TermEventKind, entity: Entity): void;
+    private _buildSilenceQuery;
+    private _reSortCascade;
 }