cojson 0.2.3 → 0.3.0-alpha.0

package/dist/queriedCoValues/queriedCoList.d.ts

@@ -0,0 +1,66 @@
+import { MutableCoList } from "../coValues/coList.js";
+import { CoValueCore } from "../coValueCore.js";
+import { Group } from "../group.js";
+import { AnyCoList, CoID, CoValue } from "../coValue.js";
+import { TransactionID } from "../ids.js";
+import { QueriedAccountAndProfile } from "./queriedCoMap.js";
+import { ValueOrSubQueried, QueryContext } from "../queries.js";
+export declare class QueriedCoList<L extends AnyCoList> extends Array<ValueOrSubQueried<L["_item"]>> {
+    coList: L;
+    id: CoID<L>;
+    type: "colist";
+    /** @internal */
+    constructor(coList: L, queryContext: QueryContext);
+    get meta(): L["meta"];
+    get group(): Group;
+    get core(): CoValueCore;
+    append(item: L["_item"] extends CoValue ? L["_item"] | CoID<L["_item"]> : L["_item"], after?: number, privacy?: "private" | "trusting"): L;
+    prepend(item: L["_item"] extends CoValue ? L["_item"] | CoID<L["_item"]> : L["_item"], before?: number, privacy?: "private" | "trusting"): L;
+    delete(at: number, privacy: "private" | "trusting"): L;
+    mutate(mutator: (mutable: MutableCoList<L["_item"], L["meta"]>) => void): L;
+    edits: {
+        by?: QueriedAccountAndProfile;
+        tx: TransactionID;
+        at: Date;
+        value: L["_item"] extends CoValue ? CoID<L["_item"]> : Exclude<L["_item"], CoValue>;
+    }[];
+    deletions: {
+        by?: QueriedAccountAndProfile;
+        tx: TransactionID;
+        at: Date;
+    }[];
+    /** @internal */
+    static isArray(arg: any): arg is any[];
+    /** @internal */
+    static from<T>(arrayLike: ArrayLike<T>): T[];
+    /** @internal */
+    static from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
+    /** @internal */
+    static from<T>(iterable: Iterable<T> | ArrayLike<T>): T[];
+    /** @internal */
+    static from<T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
+    /** @internal */
+    static of<T>(..._items: T[]): T[];
+    /** @internal */
+    pop(): ValueOrSubQueried<L["_item"]> | undefined;
+    /** @internal */
+    push(..._items: ValueOrSubQueried<L["_item"]>[]): number;
+    /** @internal */
+    concat(..._items: ConcatArray<ValueOrSubQueried<L["_item"]>>[]): ValueOrSubQueried<L["_item"]>[];
+    /** @internal */
+    concat(..._items: (ValueOrSubQueried<L["_item"]> | ConcatArray<ValueOrSubQueried<L["_item"]>>)[]): ValueOrSubQueried<L["_item"]>[];
+    /** @internal */
+    reverse(): ValueOrSubQueried<L["_item"]>[];
+    /** @internal */
+    shift(): ValueOrSubQueried<L["_item"]> | undefined;
+    /** @internal */
+    sort(_compareFn?: ((a: ValueOrSubQueried<L["_item"]>, b: ValueOrSubQueried<L["_item"]>) => number) | undefined): this;
+    /** @internal */
+    splice(_start: number, _deleteCount?: number | undefined): ValueOrSubQueried<L["_item"]>[];
+    /** @internal */
+    unshift(..._items: ValueOrSubQueried<L["_item"]>[]): number;
+    /** @internal */
+    fill(_value: ValueOrSubQueried<L["_item"]>, _start?: number | undefined, _end?: number | undefined): this;
+    /** @internal */
+    copyWithin(_target: number, _start: number, _end?: number | undefined): this;
+}

package/dist/queriedCoValues/queriedCoList.js

@@ -0,0 +1,120 @@
+import { CoList } from "../coValues/coList.js";
+import { isAccountID } from "../account.js";
+export class QueriedCoList extends Array {
+    /** @internal */
+    constructor(coList, queryContext) {
+        if (!(coList instanceof CoList)) {
+            // this might be called from an intrinsic, like map, trying to create an empty array
+            // passing `0` as the only parameter
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            return new Array(coList);
+        }
+        super(...coList
+            .asArray()
+            .map((item) => queryContext.resolveValue(item)));
+        Object.defineProperties(this, {
+            coList: { value: coList },
+            id: { value: coList.id },
+            type: { value: "colist" },
+            edits: {
+                value: [...this.keys()].map((i) => {
+                    const edit = coList.editAt(i);
+                    return {
+                        by: edit.by && isAccountID(edit.by)
+                            ? queryContext.resolveAccount(edit.by)
+                            : undefined,
+                        tx: edit.tx,
+                        at: new Date(edit.at),
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        value: queryContext.resolveValue(edit.value),
+                    };
+                }),
+            },
+            deletions: {
+                value: coList.deletionEdits().map((deletion) => ({
+                    by: deletion.by && isAccountID(deletion.by)
+                        ? queryContext.resolveAccount(deletion.by)
+                        : undefined,
+                    tx: deletion.tx,
+                    at: new Date(deletion.at),
+                })),
+            },
+        });
+    }
+    get meta() {
+        return this.coList.meta;
+    }
+    get group() {
+        return this.coList.group;
+    }
+    get core() {
+        return this.coList.core;
+    }
+    append(item, after, privacy) {
+        return this.coList.append(item, after, privacy);
+    }
+    prepend(item, before, privacy) {
+        return this.coList.prepend(item, before, privacy);
+    }
+    delete(at, privacy) {
+        return this.coList.delete(at, privacy);
+    }
+    mutate(mutator) {
+        return this.coList.mutate(mutator);
+    }
+    /** @internal */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    static isArray(arg) {
+        return Array.isArray(arg);
+    }
+    /** @internal */
+    static from(_iterable, _mapfn, _thisArg) {
+        throw new Error("Array method 'from' not supported on QueriedCoList");
+    }
+    /** @internal */
+    static of(..._items) {
+        throw new Error("Array method 'of' not supported on QueriedCoList");
+    }
+    /** @internal */
+    pop() {
+        throw new Error("Array method 'pop' not supported on QueriedCoList");
+    }
+    /** @internal */
+    push(..._items) {
+        throw new Error("Array method 'push' not supported on QueriedCoList");
+    }
+    /** @internal */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    concat(..._items) {
+        throw new Error("Array method 'concat' not supported on QueriedCoList");
+    }
+    /** @internal */
+    reverse() {
+        throw new Error("Array method 'reverse' not supported on QueriedCoList");
+    }
+    /** @internal */
+    shift() {
+        throw new Error("Array method 'shift' not supported on QueriedCoList");
+    }
+    /** @internal */
+    sort(_compareFn) {
+        throw new Error("Array method 'sort' not supported on QueriedCoList");
+    }
+    /** @internal */
+    splice(_start, _deleteCount) {
+        throw new Error("Array method 'splice' not supported on QueriedCoList");
+    }
+    /** @internal */
+    unshift(..._items) {
+        throw new Error("Array method 'unshift' not supported on QueriedCoList");
+    }
+    /** @internal */
+    fill(_value, _start, _end) {
+        throw new Error("Array method 'fill' not supported on QueriedCoList");
+    }
+    /** @internal */
+    copyWithin(_target, _start, _end) {
+        throw new Error("Array method 'copyWithin' not supported on QueriedCoList");
+    }
+}
+//# sourceMappingURL=queriedCoList.js.map

package/dist/queriedCoValues/queriedCoList.js.map

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

package/dist/queriedCoValues/queriedCoMap.d.ts

@@ -0,0 +1,47 @@
+import { MutableCoMap } from "../coValues/coMap.js";
+import { CoValueCore } from "../coValueCore.js";
+import { Group } from "../group.js";
+import { AccountID, Profile } from "../account.js";
+import { AnyCoMap, CoID, CoValue } from "../coValue.js";
+import { TransactionID } from "../ids.js";
+import { ValueOrSubQueried, QueryContext } from "../queries.js";
+export type QueriedCoMap<M extends AnyCoMap> = {
+    [K in keyof M["_shape"] & string]: ValueOrSubQueried<M["_shape"][K]>;
+} & QueriedCoMapBase<M>;
+export type QueriedCoMapEdit<M extends AnyCoMap, K extends keyof M["_shape"]> = {
+    by?: QueriedAccountAndProfile;
+    tx: TransactionID;
+    at: Date;
+    value: M["_shape"][K] extends CoValue ? CoID<M["_shape"][K]> : Exclude<M["_shape"][K], CoValue>;
+};
+export declare class QueriedCoMapBase<M extends AnyCoMap> {
+    coMap: M;
+    id: CoID<M>;
+    type: "comap";
+    /** @internal */
+    static newWithKVPairs<M extends AnyCoMap>(coMap: M, queryContext: QueryContext): QueriedCoMap<M>;
+    /** @internal */
+    constructor(coMap: M, queryContext: QueryContext);
+    edits: {
+        [K in keyof M["_shape"] & string]: (QueriedCoMapEdit<M, K> & {
+            all: QueriedCoMapEdit<M, K>[];
+        }) | undefined;
+    };
+    get meta(): M["meta"];
+    get group(): Group;
+    get core(): CoValueCore;
+    set<K extends keyof M["_shape"] & string>(key: K, value: M["_shape"][K] extends CoValue ? M["_shape"][K] | CoID<M["_shape"][K]> : M["_shape"][K], privacy?: "private" | "trusting"): M;
+    set(kv: {
+        [K in keyof M["_shape"] & string]?: M["_shape"][K] extends CoValue ? M["_shape"][K] | CoID<M["_shape"][K]> : M["_shape"][K];
+    }, privacy?: "private" | "trusting"): M;
+    delete(key: keyof M["_shape"] & string, privacy?: "private" | "trusting"): M;
+    mutate(mutator: (mutable: MutableCoMap<M["_shape"], M["meta"]>) => void): M;
+}
+export type QueriedAccountAndProfile = {
+    profile?: {
+        name?: string;
+        id: CoID<Profile>;
+    };
+    isMe?: boolean;
+    id: AccountID;
+};

package/dist/queriedCoValues/queriedCoMap.js

@@ -0,0 +1,83 @@
+import { isAccountID } from "../account.js";
+export class QueriedCoMapBase {
+    /** @internal */
+    static newWithKVPairs(coMap, queryContext) {
+        const kv = {};
+        if (coMap.meta?.type === "account") {
+            const profileID = coMap.get("profile");
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            kv.profile =
+                profileID && queryContext.resolveValue(profileID);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            kv.isMe =
+                coMap.id ===
+                    queryContext.node.account.id;
+        }
+        else {
+            for (const key of coMap.keys()) {
+                const value = coMap.get(key);
+                if (value === undefined)
+                    continue;
+                kv[key] = queryContext.resolveValue(value
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                );
+            }
+        }
+        return Object.assign(new QueriedCoMapBase(coMap, queryContext), kv);
+    }
+    /** @internal */
+    constructor(coMap, queryContext) {
+        Object.defineProperties(this, {
+            coMap: { value: coMap, enumerable: false },
+            id: { value: coMap.id, enumerable: false },
+            type: { value: "comap", enumerable: false },
+            edits: {
+                value: Object.fromEntries(coMap.keys().flatMap((key) => {
+                    const edits = [...coMap.editsAt(key)].map((edit) => ({
+                        by: edit.by && isAccountID(edit.by)
+                            ? queryContext.resolveAccount(edit.by)
+                            : undefined,
+                        tx: edit.tx,
+                        at: new Date(edit.at),
+                        value: edit.value &&
+                            queryContext.resolveValue(edit.value),
+                    }));
+                    const lastEdit = edits[edits.length - 1];
+                    if (!lastEdit)
+                        return [];
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    const editsAtKey = {
+                        by: lastEdit.by,
+                        tx: lastEdit.tx,
+                        at: lastEdit.at,
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        value: lastEdit.value,
+                        all: edits,
+                    };
+                    return [[key, editsAtKey]];
+                })),
+                enumerable: false,
+            },
+        });
+    }
+    get meta() {
+        return this.coMap.meta;
+    }
+    get group() {
+        return this.coMap.group;
+    }
+    get core() {
+        return this.coMap.core;
+    }
+    set(...args) {
+        // eslint-disable-next-line @typescript-eslint/ban-types
+        return this.coMap.set(...args);
+    }
+    delete(key, privacy) {
+        return this.coMap.delete(key, privacy);
+    }
+    mutate(mutator) {
+        return this.coMap.mutate(mutator);
+    }
+}
+//# sourceMappingURL=queriedCoMap.js.map

package/dist/queriedCoValues/queriedCoMap.js.map

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

package/dist/queriedCoValues/queriedCoStream.d.ts

@@ -0,0 +1,40 @@
+import { JsonValue } from "../jsonValue.js";
+import { MutableCoStream } from "../coValues/coStream.js";
+import { CoValueCore } from "../coValueCore.js";
+import { Group } from "../group.js";
+import { AccountID } from "../account.js";
+import { AnyCoStream, CoID, CoValue } from "../coValue.js";
+import { SessionID, TransactionID } from "../ids.js";
+import { QueriedAccountAndProfile } from "./queriedCoMap.js";
+import { ValueOrSubQueried, QueryContext } from "../queries.js";
+export type QueriedCoStreamItems<Item extends JsonValue | CoValue> = {
+    last?: ValueOrSubQueried<Item>;
+    by?: QueriedAccountAndProfile;
+    tx?: TransactionID;
+    at?: Date;
+    all: {
+        value: ValueOrSubQueried<Item>;
+        by?: QueriedAccountAndProfile;
+        tx: TransactionID;
+        at: Date;
+    }[];
+};
+export declare class QueriedCoStream<S extends AnyCoStream> {
+    coStream: S;
+    id: CoID<S>;
+    type: "costream";
+    /** @internal */
+    constructor(coStream: S, queryContext: QueryContext);
+    get meta(): S["meta"];
+    get group(): Group;
+    get core(): CoValueCore;
+    me?: QueriedCoStreamItems<S["_item"]>;
+    perAccount: {
+        [account: AccountID]: QueriedCoStreamItems<S["_item"]>;
+    };
+    perSession: {
+        [session: SessionID]: QueriedCoStreamItems<S["_item"]>;
+    };
+    push(item: S["_item"] extends CoValue ? S["_item"] | CoID<S["_item"]> : S["_item"], privacy?: "private" | "trusting"): S;
+    mutate(mutator: (mutable: MutableCoStream<S["_item"], S["meta"]>) => void): S;
+}

package/dist/queriedCoValues/queriedCoStream.js

@@ -0,0 +1,72 @@
+import { isAccountID } from "../account.js";
+export class QueriedCoStream {
+    /** @internal */
+    constructor(coStream, queryContext) {
+        this.type = "costream";
+        this.coStream = coStream;
+        this.id = coStream.id;
+        this.perSession = Object.fromEntries(coStream.sessions().map((sessionID) => {
+            const items = [...coStream.itemsIn(sessionID)].map((item) => ({
+                by: item.by && isAccountID(item.by)
+                    ? queryContext.resolveAccount(item.by)
+                    : undefined,
+                tx: item.tx,
+                at: new Date(item.at),
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                value: queryContext.resolveValue(item.value),
+            }));
+            const lastItem = items[items.length - 1];
+            return [
+                sessionID,
+                {
+                    last: lastItem?.value,
+                    by: lastItem?.by,
+                    tx: lastItem?.tx,
+                    at: lastItem?.at,
+                    all: items,
+                },
+            ];
+        }));
+        this.perAccount = Object.fromEntries([...coStream.accounts()].map((accountID) => {
+            const items = [...coStream.itemsBy(accountID)].map((item) => ({
+                by: item.by && isAccountID(item.by)
+                    ? queryContext.resolveAccount(item.by)
+                    : undefined,
+                tx: item.tx,
+                at: new Date(item.at),
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                value: queryContext.resolveValue(item.value),
+            }));
+            const lastItem = items[items.length - 1];
+            return [
+                accountID,
+                {
+                    last: lastItem?.value,
+                    by: lastItem?.by,
+                    tx: lastItem?.tx,
+                    at: lastItem?.at,
+                    all: items,
+                },
+            ];
+        }));
+        this.me = isAccountID(queryContext.node.account.id)
+            ? this.perAccount[queryContext.node.account.id]
+            : undefined;
+    }
+    get meta() {
+        return this.coStream.meta;
+    }
+    get group() {
+        return this.coStream.group;
+    }
+    get core() {
+        return this.coStream.core;
+    }
+    push(item, privacy) {
+        return this.coStream.push(item, privacy);
+    }
+    mutate(mutator) {
+        return this.coStream.mutate(mutator);
+    }
+}
+//# sourceMappingURL=queriedCoStream.js.map

package/dist/queriedCoValues/queriedCoStream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queriedCoStream.js","sourceRoot":"","sources":["../../src/queriedCoValues/queriedCoStream.ts"],"names":[],"mappings":"AAIA,OAAO,EAAa,WAAW,EAAE,MAAM,eAAe,CAAC;AAoBvD,MAAM,OAAO,eAAe;IAKxB,gBAAgB;IAChB,YAAY,QAAW,EAAE,YAA0B;QAHnD,SAAI,GAAG,UAAmB,CAAC;QAIvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;QAEtB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,WAAW,CAChC,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAClC,MAAM,KAAK,GAAG,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1D,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC/B,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;oBACtC,CAAC,CAAC,SAAS;gBACf,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,EAAE,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrB,8DAA8D;gBAC9D,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAQ;aACtD,CAAC,CAAC,CAAC;YAEJ,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAEzC,OAAO;gBACH,SAAS;gBACT;oBACI,IAAI,EAAE,QAAQ,EAAE,KAAK;oBACrB,EAAE,EAAE,QAAQ,EAAE,EAAE;oBAChB,EAAE,EAAE,QAAQ,EAAE,EAAE;oBAChB,EAAE,EAAE,QAAQ,EAAE,EAAE;oBAChB,GAAG,EAAE,KAAK;iBAC8B;aAC/C,CAAC;QACN,CAAC,CAAC,CACL,CAAC;QAEF,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,WAAW,CAChC,CAAC,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YACvC,MAAM,KAAK,GAAG,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1D,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC/B,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;oBACtC,CAAC,CAAC,SAAS;gBACf,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,EAAE,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrB,8DAA8D;gBAC9D,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAQ;aACtD,CAAC,CAAC,CAAC;YAEJ,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAEzC,OAAO;gBACH,SAAS;gBACT;oBACI,IAAI,EAAE,QAAQ,EAAE,KAAK;oBACrB,EAAE,EAAE,QAAQ,EAAE,EAAE;oBAChB,EAAE,EAAE,QAAQ,EAAE,EAAE;oBAChB,EAAE,EAAE,QAAQ,EAAE,EAAE;oBAChB,GAAG,EAAE,KAAK;iBAC8B;aAC/C,CAAC;QACN,CAAC,CAAC,CACL,CAAC;QAEF,IAAI,CAAC,EAAE,GAAG,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/C,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/C,CAAC,CAAC,SAAS,CAAC;IACpB,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC/B,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC9B,CAAC;IAUD,IAAI,CACA,IAA6E,EAC7E,OAAgC;QAEhC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,CACF,OAAkE;QAElE,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;CACJ"}

package/dist/queries.d.ts

@@ -1,114 +1,31 @@
 import { JsonValue } from "./jsonValue.js";
-import { CoMap, WriteableCoMap } from "./coValues/coMap.js";
-import { BinaryCoStream, BinaryStreamInfo, CoStream, WriteableBinaryCoStream, WriteableCoStream } from "./coValues/coStream.js";
-import { Static } from "./coValues/static.js";
-import { CoList, WriteableCoList } from "./coValues/coList.js";
-import { CoValueCore } from "./coValueCore.js";
-import { Group } from "./group.js";
-import { AccountID, Profile } from "./account.js";
-import { AnyBinaryCoStream, AnyCoList, AnyCoMap, AnyCoStream, AnyCoValue, AnyStatic, CoID, CoValue } from "./coValue.js";
-import { SessionID } from "./ids.js";
-import { LocalNode } from "./node.js";
-export declare const AllReservedQueryProps: readonly ["id", "type", "meta", "core", "group", "shadowed", "edit", "edits"];
-export type ReservedQueryProps = (typeof AllReservedQueryProps)[number];
-export type QueriedCoMap<T extends AnyCoMap> = T extends CoMap<infer M, infer Meta> ? Readonly<{
-    [K in keyof M as Exclude<K, ReservedQueryProps>]: ValueOrSubQueried<M[K]>;
-}> & (keyof M & ReservedQueryProps extends never ? {} : Readonly<{
-    shadowed: Readonly<{
-        [K in keyof M as Extract<K, ReservedQueryProps>]: ValueOrSubQueried<M[K]>;
-    }>;
-}>) & Readonly<{
-    id: CoID<T>;
-    type: "comap";
-    edits: Readonly<{
-        [K in keyof M & string]: Readonly<{
-            by?: QueriedAccountAndProfile;
-            at: Date;
-        }>;
-    }>;
-    meta: Meta;
-    group: Group;
-    core: CoValueCore;
-    edit: (changer: (editable: WriteableCoMap<M, Meta>) => void) => T;
-}> : never;
-export type QueriedAccountAndProfile = Readonly<{
-    id: AccountID;
-    profile?: Readonly<{
-        name?: string;
-        id: CoID<Profile>;
-    }>;
-    isMe?: boolean;
-}>;
-export type QueriedCoList<T extends AnyCoList> = T extends CoList<infer I, infer Meta> ? readonly ValueOrSubQueried<I>[] & Readonly<{
-    id: CoID<T>;
-    type: "colist";
-    meta: Meta;
-    group: Group;
-    core: CoValueCore;
-    edit: (changer: (editable: WriteableCoList<I, Meta>) => void) => T;
-    edits: readonly Readonly<{
-        by?: QueriedAccountAndProfile;
-        at: Date;
-    }>[] & {};
-}> : never;
-export type QueriedCoStreamItems<I extends JsonValue | CoValue> = Readonly<{
-    last: ValueOrSubQueried<I> | undefined;
-    by?: QueriedAccountAndProfile;
-    at?: Date;
-    all: {
-        value: ValueOrSubQueried<I>;
-        at: Date;
-    }[];
-}>;
-export type QueriedCoStream<T extends AnyCoStream> = T extends CoStream<infer I, infer Meta> ? Readonly<{
-    id: CoID<T>;
-    type: "costream";
-    me?: QueriedCoStreamItems<I>;
-    perAccount: Readonly<{
-        [account: AccountID]: QueriedCoStreamItems<I>;
-    }>;
-    perSession: Readonly<{
-        [session: SessionID]: QueriedCoStreamItems<I>;
-    }>;
-    meta: Meta;
-    group: Group;
-    core: CoValueCore;
-    edit: (changer: (editable: WriteableCoStream<I, Meta>) => void) => T;
-}> : never;
-export type QueriedBinaryCoStreamItems = Readonly<{
-    last: Uint8Array | undefined;
-    by: QueriedAccountAndProfile;
-    at: Date;
-    all: {
-        value: Uint8Array;
-        at: Date;
-    }[];
-}>;
-export type QueriedBinaryCoStream<T extends AnyBinaryCoStream> = T extends BinaryCoStream<infer Meta> ? Readonly<{
-    id: CoID<T>;
-    type: "costream";
-    me?: QueriedBinaryCoStreamItems;
-    perAccount: Readonly<{
-        [account: AccountID]: QueriedBinaryCoStreamItems;
-    }>;
-    perSession: Readonly<{
-        [session: SessionID]: QueriedBinaryCoStreamItems;
-    }>;
-    meta: Meta;
-    group: Group;
-    core: CoValueCore;
-    edit: (changer: (editable: WriteableBinaryCoStream<Meta>) => void) => T;
-}> & Readonly<BinaryStreamInfo> : never;
-export type QueriedStatic<T extends AnyStatic> = T extends Static<infer Meta> ? Readonly<{
-    id: CoID<T>;
-    type: "colist";
-    meta: Meta;
-    group: Group;
-    core: CoValueCore;
-}> : never;
-export type Queried<T extends CoValue> = T extends AnyCoMap ? QueriedCoMap<T> : T extends AnyCoList ? QueriedCoList<T> : T extends AnyCoStream ? QueriedCoStream<T> : T extends AnyStatic ? QueriedStatic<T> : never;
+import { AccountID } from "./account.js";
+import { AnyCoList, AnyCoMap, AnyCoStream, CoID, CoValue } from "./coValue.js";
+import { LocalNode } from "./localNode.js";
+import { QueriedAccountAndProfile, QueriedCoMap } from "./queriedCoValues/queriedCoMap.js";
+import { QueriedCoList } from "./queriedCoValues/queriedCoList.js";
+import { QueriedCoStream } from "./queriedCoValues/queriedCoStream.js";
+export type Queried<T extends CoValue> = T extends AnyCoMap ? QueriedCoMap<T> : T extends AnyCoList ? QueriedCoList<T> : T extends AnyCoStream ? T["meta"] extends {
+    type: "binary";
+} ? never : QueriedCoStream<T> : never;
 export type ValueOrSubQueried<V extends JsonValue | CoValue | CoID<CoValue> | undefined> = V extends CoID<infer C> ? Queried<C> | undefined : V extends CoValue ? Queried<V> | undefined : V;
-export type QueryInclude<T extends CoValue> = T extends CoMap<infer M, infer _Meta> ? {
-    [K in keyof M as M[K] extends AnyCoValue | CoID<AnyCoValue> ? K : never]?: M[K] extends AnyCoValue ? true | QueryInclude<M[K]> : M[K] extends CoID<infer S> ? true | QueryInclude<S> : never;
-} : T extends CoList<infer I, infer _> ? I extends AnyCoValue ? [true] | [QueryInclude<I>] : I extends CoID<infer S> ? [true] | [QueryInclude<S>] : never : never;
-export declare function query<T extends CoValue>(id: CoID<T>, node: LocalNode, callback: (queried: Queried<T> | undefined) => void): () => void;
+export interface CleanupCallbackAndUsable {
+    (): void;
+    [Symbol.dispose]: () => void;
+}
+export declare class QueryContext {
+    values: {
+        [id: CoID<CoValue>]: {
+            lastQueried: Queried<CoValue> | undefined;
+            unsubscribe: () => void;
+        };
+    };
+    node: LocalNode;
+    onUpdate: () => void;
+    constructor(node: LocalNode, onUpdate: () => void);
+    getChildLastQueriedOrSubscribe<T extends CoValue>(valueID: CoID<T>): Queried<T> | undefined;
+    resolveAccount(accountID: AccountID): QueriedAccountAndProfile;
+    resolveValue<T extends JsonValue>(value: T): T extends CoID<infer C> ? Queried<C> | undefined : T;
+    cleanup(): void;
+}
+export declare function query<T extends CoValue>(id: CoID<T>, node: LocalNode, callback: (queried: Queried<T> | undefined) => void, parentContext?: QueryContext): CleanupCallbackAndUsable;