cojson 0.3.7 → 0.4.0

package/dist/queriedCoValues/queriedCoMap.d.ts

@@ -1,25 +1,25 @@
-import { MutableCoMap } from "../coValues/coMap.js";
+import { CoMap, 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 { Group } from "../coValues/group.js";
+import { CoID } from "../coValue.js";
 import { TransactionID } from "../ids.js";
-import { ValueOrSubQueried, QueryContext } from "../queries.js";
-export type QueriedCoMap<M extends AnyCoMap> = {
+import { ValueOrSubQueried, QueryContext, QueryExtension } from "../queries.js";
+import { QueriedAccount } from "./queriedAccount.js";
+export type QueriedCoMap<M extends CoMap> = {
     [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;
+export type QueriedCoMapEdit<M extends CoMap, K extends keyof M["_shape"]> = {
+    by?: QueriedAccount;
     tx: TransactionID;
     at: Date;
-    value: M["_shape"][K] extends CoValue ? CoID<M["_shape"][K]> : Exclude<M["_shape"][K], CoValue>;
+    value: M["_shape"][K];
 };
-export declare class QueriedCoMapBase<M extends AnyCoMap> {
+export declare class QueriedCoMapBase<M extends CoMap> {
     coMap: M;
     id: CoID<M>;
     type: "comap";
     /** @internal */
-    static newWithKVPairs<M extends AnyCoMap>(coMap: M, queryContext: QueryContext): QueriedCoMap<M>;
+    static newWithKVPairs<M extends CoMap>(coMap: M, queryContext: QueryContext): QueriedCoMap<M>;
     /** @internal */
     constructor(coMap: M, queryContext: QueryContext);
     edits: {
@@ -30,18 +30,11 @@ export declare class QueriedCoMapBase<M extends AnyCoMap> {
     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<K extends keyof M["_shape"] & string>(key: K, value: 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];
+        [K in keyof M["_shape"] & string]?: 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;
+    as: <O>(extension: QueryExtension<M, O>) => O | undefined;
 }
-export type QueriedAccountAndProfile = {
-    profile?: {
-        name?: string;
-        id: CoID<Profile>;
-    };
-    isMe?: boolean;
-    id: AccountID;
-};

package/dist/queriedCoValues/queriedCoMap.js

@@ -1,47 +1,40 @@
-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
-                );
-            }
+        for (const key of coMap.keys()) {
+            const value = coMap.get(key);
+            if (value === undefined)
+                continue;
+            queryContext.defineSubqueryPropertiesIn(kv, {
+                [key]: { value, enumerable: true },
+            }, [coMap.id]);
         }
         return Object.assign(new QueriedCoMapBase(coMap, queryContext), kv);
     }
     /** @internal */
     constructor(coMap, queryContext) {
         Object.defineProperties(this, {
-            coMap: { value: coMap, enumerable: false },
+            coMap: {
+                get() {
+                    return 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,
+                    const edits = [...coMap.editsAt(key)].map((edit) => queryContext.defineSubqueryPropertiesIn({
                         tx: edit.tx,
                         at: new Date(edit.at),
-                        value: edit.value &&
-                            queryContext.resolveValue(edit.value),
-                    }));
+                    }, {
+                        by: { value: edit.by, enumerable: true },
+                        value: {
+                            value: edit.value,
+                            enumerable: true,
+                        },
+                    }, [coMap.id]));
                     const lastEdit = edits[edits.length - 1];
                     if (!lastEdit)
                         return [];
@@ -58,6 +51,12 @@ export class QueriedCoMapBase {
                 })),
                 enumerable: false,
             },
+            as: {
+                value: (extension) => {
+                    return queryContext.getOrCreateExtension(coMap.id, extension);
+                },
+                enumerable: false,
+            },
         });
     }
     get meta() {

package/dist/queriedCoValues/queriedCoMap.js.map

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

package/dist/queriedCoValues/queriedCoStream.d.ts

@@ -1,25 +1,25 @@
 import { JsonValue } from "../jsonValue.js";
-import { MutableCoStream } from "../coValues/coStream.js";
+import { CoStream, 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 { Group } from "../coValues/group.js";
+import { AccountID } from "../coValues/account.js";
+import { CoID, CoValue } from "../coValue.js";
 import { SessionID, TransactionID } from "../ids.js";
-import { QueriedAccountAndProfile } from "./queriedCoMap.js";
 import { ValueOrSubQueried, QueryContext } from "../queries.js";
+import { QueriedAccount } from "./queriedAccount.js";
 export type QueriedCoStreamItems<Item extends JsonValue | CoValue> = {
     last?: ValueOrSubQueried<Item>;
-    by?: QueriedAccountAndProfile;
+    by?: QueriedAccount;
     tx?: TransactionID;
     at?: Date;
     all: {
         value: ValueOrSubQueried<Item>;
-        by?: QueriedAccountAndProfile;
+        by?: QueriedAccount;
         tx: TransactionID;
         at: Date;
     }[];
 };
-export declare class QueriedCoStream<S extends AnyCoStream> {
+export declare class QueriedCoStream<S extends CoStream> {
     coStream: S;
     id: CoID<S>;
     type: "costream";
@@ -35,6 +35,6 @@ export declare class QueriedCoStream<S extends AnyCoStream> {
     perSession: {
         [session: SessionID]: QueriedCoStreamItems<S["_item"]>;
     };
-    push(item: S["_item"] extends CoValue ? S["_item"] | CoID<S["_item"]> : S["_item"], privacy?: "private" | "trusting"): S;
+    push(item: S["_item"], privacy?: "private" | "trusting"): S;
     mutate(mutator: (mutable: MutableCoStream<S["_item"], S["meta"]>) => void): S;
 }

package/dist/queriedCoValues/queriedCoStream.js

@@ -1,26 +1,40 @@
-import { isAccountID } from "../account.js";
+import { isAccountID } from "../coValues/account.js";
 export class QueriedCoStream {
     /** @internal */
     constructor(coStream, queryContext) {
         this.type = "costream";
-        this.coStream = coStream;
+        Object.defineProperty(this, "coStream", {
+            get() {
+                return 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,
+            const items = [...coStream.itemsIn(sessionID)].map((item) => queryContext.defineSubqueryPropertiesIn({
                 tx: item.tx,
                 at: new Date(item.at),
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                value: queryContext.resolveValue(item.value),
-            }));
+            }, {
+                by: {
+                    value: isAccountID(item.by)
+                        ? item.by
+                        : undefined,
+                    enumerable: true,
+                },
+                value: {
+                    value: item.value,
+                    enumerable: true,
+                },
+            }, [coStream.id]));
             const lastItem = items[items.length - 1];
             return [
                 sessionID,
                 {
-                    last: lastItem?.value,
-                    by: lastItem?.by,
+                    get last() {
+                        return lastItem?.value;
+                    },
+                    get by() {
+                        return lastItem?.by;
+                    },
                     tx: lastItem?.tx,
                     at: lastItem?.at,
                     all: items,
@@ -28,21 +42,31 @@ export class QueriedCoStream {
             ];
         }));
         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,
+            const items = [...coStream.itemsBy(accountID)].map((item) => queryContext.defineSubqueryPropertiesIn({
                 tx: item.tx,
                 at: new Date(item.at),
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                value: queryContext.resolveValue(item.value),
-            }));
+            }, {
+                by: {
+                    value: isAccountID(item.by)
+                        ? item.by
+                        : undefined,
+                    enumerable: true,
+                },
+                value: {
+                    value: item.value,
+                    enumerable: true,
+                },
+            }, [coStream.id]));
             const lastItem = items[items.length - 1];
             return [
                 accountID,
                 {
-                    last: lastItem?.value,
-                    by: lastItem?.by,
+                    get last() {
+                        return lastItem?.value;
+                    },
+                    get by() {
+                        return lastItem?.by;
+                    },
                     tx: lastItem?.tx,
                     at: lastItem?.at,
                     all: items,

package/dist/queriedCoValues/queriedCoStream.js.map

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

package/dist/queriedCoValues/queriedGroup.d.ts

@@ -0,0 +1,29 @@
+import { Everyone, Group, InviteSecret } from "../coValues/group.js";
+import { CoID } from "../coValue.js";
+import { QueryContext, ValueOrSubQueried } from "../queries.js";
+import { CoValueCore } from "../coValueCore.js";
+import { Role } from "../permissions.js";
+import { AccountID } from "../coValues/account.js";
+import { CoMap } from "../coValues/coMap.js";
+import { CoList } from "../coValues/coList.js";
+import { CoStream } from "../coValues/coStream.js";
+import { BinaryCoStream } from "../coValues/coStream.js";
+export declare class QueriedGroup<G extends Group = Group> {
+    group: G;
+    id: CoID<G>;
+    type: "group";
+    profile?: ValueOrSubQueried<G["_shape"]["profile"]>;
+    root?: ValueOrSubQueried<G["_shape"]["root"]>;
+    constructor(group: G, queryContext: QueryContext);
+    get meta(): G["meta"];
+    get core(): CoValueCore;
+    addMember(accountID: AccountID | Everyone, role: Role): G;
+    removeMember(accountID: AccountID): G;
+    createInvite(role: "reader" | "writer" | "admin"): InviteSecret;
+    createMap<M extends CoMap>(init?: {
+        [K in keyof M["_shape"]]: M["_shape"][K];
+    }, meta?: M["meta"], initPrivacy?: "trusting" | "private"): M;
+    createList<L extends CoList>(init?: L["_item"][], meta?: L["meta"], initPrivacy?: "trusting" | "private"): L;
+    createStream<C extends CoStream>(meta?: C["meta"]): C;
+    createBinaryStream<C extends BinaryCoStream>(meta?: C["meta"]): C;
+}

package/dist/queriedCoValues/queriedGroup.js

@@ -0,0 +1,54 @@
+export class QueriedGroup {
+    constructor(group, queryContext) {
+        this.type = "group";
+        const profileID = group.get("profile");
+        const rootID = group.get("root");
+        queryContext.defineSubqueryPropertiesIn(Object.defineProperties(this, {
+            group: {
+                get() {
+                    return group;
+                },
+                enumerable: false,
+            },
+            id: { value: group.id, enumerable: false },
+            type: { value: "group", enumerable: false },
+        }), {
+            profile: {
+                value: profileID,
+                enumerable: false,
+            },
+            root: {
+                value: rootID,
+                enumerable: false,
+            },
+        }, [group.id]);
+    }
+    get meta() {
+        return this.group.meta;
+    }
+    get core() {
+        return this.group.core;
+    }
+    addMember(accountID, role) {
+        return this.group.addMember(accountID, role);
+    }
+    removeMember(accountID) {
+        return this.group.removeMember(accountID);
+    }
+    createInvite(role) {
+        return this.group.createInvite(role);
+    }
+    createMap(init, meta, initPrivacy = "private") {
+        return this.group.createMap(init, meta, initPrivacy);
+    }
+    createList(init, meta, initPrivacy = "private") {
+        return this.group.createList(init, meta, initPrivacy);
+    }
+    createStream(meta) {
+        return this.group.createStream(meta);
+    }
+    createBinaryStream(meta = { type: "binary" }) {
+        return this.group.createBinaryStream(meta);
+    }
+}
+//# sourceMappingURL=queriedGroup.js.map

package/dist/queriedCoValues/queriedGroup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queriedGroup.js","sourceRoot":"","sources":["../../src/queriedCoValues/queriedGroup.ts"],"names":[],"mappings":"AAWA,MAAM,OAAO,YAAY;IAOrB,YAAY,KAAQ,EAAE,YAA0B;QAJhD,SAAI,GAAG,OAAgB,CAAC;QAKpB,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjC,YAAY,CAAC,0BAA0B,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE;YAClE,KAAK,EAAE;gBACH,GAAG;oBACC,OAAO,KAAK,CAAC;gBACjB,CAAC;gBACD,UAAU,EAAE,KAAK;aACpB;YACD,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;YAC1C,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE;SAC9C,CAAC,EAAE;YACA,OAAO,EAAE;gBACL,KAAK,EAAE,SAAS;gBAChB,UAAU,EAAE,KAAK;aACpB;YACD,IAAI,EAAE;gBACF,KAAK,EAAE,MAAM;gBACb,UAAU,EAAE,KAAK;aACpB;SACJ,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IACnB,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,SAAS,CAAC,SAA+B,EAAE,IAAU;QACjD,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,YAAY,CAAC,SAAoB;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC;IAED,YAAY,CAAC,IAAmC;QAC5C,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,SAAS,CACL,IAEC,EACD,IAAgB,EAChB,cAAsC,SAAS;QAE/C,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;IACzD,CAAC;IAED,UAAU,CACN,IAAmB,EACnB,IAAgB,EAChB,cAAsC,SAAS;QAE/C,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;IAC1D,CAAC;IAED,YAAY,CAAqB,IAAgB;QAC7C,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,kBAAkB,CACd,OAAkB,EAAE,IAAI,EAAE,QAAQ,EAAE;QAEpC,OAAO,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;CACJ"}

package/dist/queries.d.ts

@@ -1,31 +1,62 @@
 import { JsonValue } from "./jsonValue.js";
-import { AccountID } from "./account.js";
-import { AnyCoList, AnyCoMap, AnyCoStream, CoID, CoValue } from "./coValue.js";
+import { CoMap } from "./coValues/coMap.js";
+import { CoStream } from "./coValues/coStream.js";
+import { CoList } from "./coValues/coList.js";
+import { Account } from "./coValues/account.js";
+import { CoID, CoValue } from "./coValue.js";
 import { LocalNode } from "./localNode.js";
-import { QueriedAccountAndProfile, QueriedCoMap } from "./queriedCoValues/queriedCoMap.js";
+import { 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 {
+import { Group } from "./coValues/group.js";
+import { QueriedAccount } from "./queriedCoValues/queriedAccount.js";
+import { QueriedGroup } from "./queriedCoValues/queriedGroup.js";
+export type Queried<T extends CoValue> = T extends CoMap ? T extends Account ? QueriedAccount<T> : T extends Group ? QueriedGroup<T> : QueriedCoMap<T> : T extends CoList ? QueriedCoList<T> : T extends CoStream ? T["meta"] extends {
     type: "binary";
-} ? never : QueriedCoStream<T> : never;
+} ? never : QueriedCoStream<T> : QueriedAccount | QueriedGroup | QueriedCoMap<CoMap> | QueriedCoList<CoList> | QueriedCoStream<CoStream>;
 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 interface CleanupCallbackAndUsable {
     (): void;
     [Symbol.dispose]: () => void;
 }
+export interface QueryExtension<T extends CoValue, O> {
+    id: string;
+    query(base: T, queryContext: QueryContext, onUpdate: (value: O) => void): () => void;
+}
 export declare class QueryContext {
     values: {
         [id: CoID<CoValue>]: {
+            lastUpdate: CoValue | undefined;
             lastQueried: Queried<CoValue> | undefined;
+            render: () => void;
+            unsubscribe: () => void;
+        };
+    };
+    extensions: {
+        [id: `${CoID<CoValue>}_${string}`]: {
+            lastOutput: unknown;
             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;
+    query<T extends CoValue>(valueID: CoID<T>, alsoRender: CoID<CoValue>[]): Queried<T> | undefined;
+    queryIfCoID<T extends JsonValue | undefined>(value: T, alsoRender: CoID<CoValue>[]): T extends CoID<infer C> ? Queried<C> | undefined : T;
+    valueOrSubQueryPropertyDescriptor<T extends JsonValue | undefined>(value: T, alsoRender: CoID<CoValue>[]): T extends CoID<infer C> ? {
+        get(): Queried<C> | undefined;
+    } : {
+        value: T;
+    };
+    defineSubqueryPropertiesIn<O extends object, P extends {
+        [key: string]: {
+            value: JsonValue | undefined;
+            enumerable: boolean;
+        };
+    }>(obj: O, subqueryProps: P, alsoRender: CoID<CoValue>[]): O & {
+        [Key in keyof P]: ValueOrSubQueried<P[Key]["value"]>;
+    };
+    getOrCreateExtension<T extends CoValue, O>(valueID: CoID<T>, extension: QueryExtension<T, O>): O | undefined;
     cleanup(): void;
 }
-export declare function query<T extends CoValue>(id: CoID<T>, node: LocalNode, callback: (queried: Queried<T> | undefined) => void, parentContext?: QueryContext): CleanupCallbackAndUsable;
+export declare function query<T extends CoValue>(id: CoID<T>, node: LocalNode, callback: (queried: Queried<T> | undefined) => void): CleanupCallbackAndUsable;