cojson 0.3.7 → 0.4.0

package/dist/queries.js

@@ -1,22 +1,67 @@
 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 { QueriedCoMapBase, } from "./queriedCoValues/queriedCoMap.js";
 import { QueriedCoList } from "./queriedCoValues/queriedCoList.js";
 import { QueriedCoStream } from "./queriedCoValues/queriedCoStream.js";
+import { Group } from "./coValues/group.js";
+import { QueriedAccount } from "./queriedCoValues/queriedAccount.js";
+import { QueriedGroup } from "./queriedCoValues/queriedGroup.js";
 export class QueryContext {
     constructor(node, onUpdate) {
         this.values = {};
+        this.extensions = {};
         this.node = node;
         this.onUpdate = onUpdate;
     }
-    getChildLastQueriedOrSubscribe(valueID) {
+    query(valueID, alsoRender) {
         let value = this.values[valueID];
         if (!value) {
+            const render = () => {
+                let newQueried;
+                const lastUpdate = value.lastUpdate;
+                if (lastUpdate instanceof CoMap) {
+                    if (lastUpdate instanceof Account) {
+                        newQueried = new QueriedAccount(lastUpdate, this);
+                    }
+                    else if (lastUpdate instanceof Group) {
+                        newQueried = new QueriedGroup(lastUpdate, this);
+                    }
+                    else {
+                        newQueried = QueriedCoMapBase.newWithKVPairs(lastUpdate, this);
+                    }
+                }
+                else if (lastUpdate instanceof CoList) {
+                    newQueried = new QueriedCoList(lastUpdate, this);
+                }
+                else if (lastUpdate instanceof CoStream) {
+                    if (lastUpdate.meta?.type === "binary") {
+                        // Querying binary string not yet implemented
+                    }
+                    else {
+                        newQueried = new QueriedCoStream(lastUpdate, this);
+                    }
+                }
+                // console.log(
+                //     "Rendered ",
+                //     valueID,
+                //     lastUpdate?.constructor.name,
+                //     newQueried
+                // );
+                value.lastQueried = newQueried;
+                for (const alsoRenderID of alsoRender) {
+                    // console.log("Also rendering", alsoRenderID);
+                    this.values[alsoRenderID]?.render();
+                }
+            };
             value = {
                 lastQueried: undefined,
-                unsubscribe: query(valueID, this.node, (childQueried) => {
-                    value.lastQueried = childQueried;
+                lastUpdate: undefined,
+                render,
+                unsubscribe: this.node.subscribe(valueID, (valueUpdate) => {
+                    value.lastUpdate = valueUpdate;
+                    value.render();
                     this.onUpdate();
                 }),
             };
@@ -24,52 +69,72 @@ export class QueryContext {
         }
         return value.lastQueried;
     }
-    resolveAccount(accountID) {
-        return this.getChildLastQueriedOrSubscribe(accountID);
-    }
-    resolveValue(value) {
-        return (typeof value === "string" && value.startsWith("co_")
-            ? this.getChildLastQueriedOrSubscribe(value)
-            : value);
+    queryIfCoID(value, alsoRender) {
+        if (typeof value === "string" && value.startsWith("co_")) {
+            return this.query(value, alsoRender);
+        }
+        else {
+            return value;
+        }
     }
-    cleanup() {
-        for (const child of Object.values(this.values)) {
-            child.unsubscribe();
+    valueOrSubQueryPropertyDescriptor(value, alsoRender) {
+        if (typeof value === "string" && value.startsWith("co_")) {
+            // TODO: when we track render dirty status, we can actually return the queried value without a getter if it's up to date
+            return {
+                get: () => this.query(value, alsoRender),
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            };
+        }
+        else {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            return { value: value };
         }
     }
-}
-export function query(id, node, callback, parentContext) {
-    console.log("querying", id);
-    const context = parentContext || new QueryContext(node, onUpdate);
-    const unsubscribe = node.subscribe(id, (update) => {
-        lastRootValue = update;
-        onUpdate();
-    });
-    let lastRootValue;
-    function onUpdate() {
-        const rootValue = lastRootValue;
-        if (rootValue === undefined) {
-            return undefined;
+    defineSubqueryPropertiesIn(obj, subqueryProps, alsoRender) {
+        for (const [key, descriptor] of Object.entries(subqueryProps)) {
+            Object.defineProperty(obj, key, {
+                ...this.valueOrSubQueryPropertyDescriptor(descriptor.value, alsoRender),
+                enumerable: descriptor.enumerable,
+            });
         }
-        if (rootValue instanceof CoMap) {
-            callback(QueriedCoMapBase.newWithKVPairs(rootValue, context));
+        return obj;
+    }
+    getOrCreateExtension(valueID, extension) {
+        const id = `${valueID}_${extension.id}`;
+        let ext = this.extensions[id];
+        if (!ext) {
+            ext = {
+                lastOutput: undefined,
+                unsubscribe: extension.query(this.node
+                    .expectCoValueLoaded(valueID)
+                    .getCurrentContent(), this, (output) => {
+                    ext.lastOutput = output;
+                    this.values[valueID]?.render();
+                    this.onUpdate();
+                }),
+            };
+            this.extensions[id] = ext;
         }
-        else if (rootValue instanceof CoList) {
-            callback(new QueriedCoList(rootValue, context));
+        return ext.lastOutput;
+    }
+    cleanup() {
+        for (const child of Object.values(this.values)) {
+            child.unsubscribe?.();
         }
-        else if (rootValue instanceof CoStream) {
-            if (rootValue.meta?.type === "binary") {
-                // Querying binary string not yet implemented
-                return {};
-            }
-            else {
-                callback(new QueriedCoStream(rootValue, context));
-            }
+        for (const extension of Object.values(this.extensions)) {
+            extension.unsubscribe();
         }
     }
+}
+export function query(id, node, callback) {
+    // console.log("querying", id);
+    const context = new QueryContext(node, () => {
+        const rootQueried = context.values[id]?.lastQueried;
+        callback(rootQueried);
+    });
+    context.query(id, []);
     const cleanup = function cleanup() {
         context.cleanup();
-        unsubscribe();
     };
     cleanup[Symbol.dispose] = cleanup;
     return cleanup;

package/dist/queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries.js","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAI9C,OAAO,EAGH,gBAAgB,GACnB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAyBvE,MAAM,OAAO,YAAY;IAUrB,YAAY,IAAe,EAAE,QAAoB;QATjD,WAAM,GAKF,EAAE,CAAC;QAKH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,8BAA8B,CAAoB,OAAgB;QAC9D,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,EAAE;YACR,KAAK,GAAG;gBACJ,WAAW,EAAE,SAAS;gBACtB,WAAW,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,YAAY,EAAE,EAAE;oBACpD,KAAM,CAAC,WAAW,GAAG,YAAgC,CAAC;oBACtD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACpB,CAAC,CAAC;aACL,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;SAChC;QACD,OAAO,KAAK,CAAC,WAAqC,CAAC;IACvD,CAAC;IAED,cAAc,CAAC,SAAoB;QAC/B,OAAO,IAAI,CAAC,8BAA8B,CACtC,SAAS,CACgB,CAAC;IAClC,CAAC;IAED,YAAY,CACR,KAAQ;QAER,OAAO,CACH,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC;YAChD,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,KAAsB,CAAC;YAC7D,CAAC,CAAC,KAAK,CAC0C,CAAC;IAC9D,CAAC;IAED,OAAO;QACH,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC5C,KAAK,CAAC,WAAW,EAAE,CAAC;SACvB;IACL,CAAC;CACJ;AAED,MAAM,UAAU,KAAK,CACjB,EAAW,EACX,IAAe,EACf,QAAmD,EACnD,aAA4B;IAE5B,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAE5B,MAAM,OAAO,GAAG,aAAa,IAAI,IAAI,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAElE,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE;QAC9C,aAAa,GAAG,MAAM,CAAC;QACvB,QAAQ,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,IAAI,aAA4B,CAAC;IAEjC,SAAS,QAAQ;QACb,MAAM,SAAS,GAAG,aAAa,CAAC;QAEhC,IAAI,SAAS,KAAK,SAAS,EAAE;YACzB,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,SAAS,YAAY,KAAK,EAAE;YAC5B,QAAQ,CACJ,gBAAgB,CAAC,cAAc,CAC3B,SAAS,EACT,OAAO,CACI,CAClB,CAAC;SACL;aAAM,IAAI,SAAS,YAAY,MAAM,EAAE;YACpC,QAAQ,CAAC,IAAI,aAAa,CAAC,SAAS,EAAE,OAAO,CAAe,CAAC,CAAC;SACjE;aAAM,IAAI,SAAS,YAAY,QAAQ,EAAE;YACtC,IAAI,SAAS,CAAC,IAAI,EAAE,IAAI,KAAK,QAAQ,EAAE;gBACnC,6CAA6C;gBAC7C,OAAO,EAAE,CAAC;aACb;iBAAM;gBACH,QAAQ,CAAC,IAAI,eAAe,CAAC,SAAS,EAAE,OAAO,CAAe,CAAC,CAAC;aACnE;SACJ;IACL,CAAC;IAED,MAAM,OAAO,GAAG,SAAS,OAAO;QAC5B,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,WAAW,EAAE,CAAC;IAClB,CAA6B,CAAC;IAC9B,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAElC,OAAO,OAAO,CAAC;AACnB,CAAC"}
+{"version":3,"file":"queries.js","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":"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"}

package/dist/tests/testUtils.d.ts

@@ -1,28 +1,36 @@
 import { LocalNode } from "../localNode.js";
-import { AnonymousControlledAccount } from "../account.js";
+import { AnonymousControlledAccount } from "../coValues/account.js";
 import { SessionID } from "../ids.js";
 export declare function randomAnonymousAccountAndSessionID(): [AnonymousControlledAccount, SessionID];
 export declare function newGroup(): {
     node: LocalNode;
-    group: import("../coValueCore.js").CoValueCore;
+    groupCore: import("../coValueCore.js").CoValueCore;
     admin: AnonymousControlledAccount;
 };
 export declare function groupWithTwoAdmins(): {
-    group: import("../coValueCore.js").CoValueCore;
+    groupCore: import("../coValueCore.js").CoValueCore;
     admin: AnonymousControlledAccount;
-    otherAdmin: import("../account.js").ControlledAccount;
+    otherAdmin: import("../coValues/account.js").ControlledAccount<import("../coValues/account.js").Profile<import("../coValues/account.js").ProfileShape, import("../coValues/account.js").ProfileMeta>, import("../index.js").CoMap<{
+        [key: string]: import("../jsonValue.js").JsonValue | undefined;
+    }, import("../jsonValue.js").JsonObject | null>, import("../coValues/account.js").AccountMeta>;
     node: LocalNode;
 };
 export declare function newGroupHighLevel(): {
     admin: AnonymousControlledAccount;
     node: LocalNode;
-    group: import("../group.js").Group;
+    group: import("../coValues/group.js").Group<import("../coValues/account.js").Profile<import("../coValues/account.js").ProfileShape, import("../coValues/account.js").ProfileMeta>, import("../index.js").CoMap<{
+        [key: string]: import("../jsonValue.js").JsonValue | undefined;
+    }, import("../jsonValue.js").JsonObject | null>, import("../jsonValue.js").JsonObject | null>;
 };
 export declare function groupWithTwoAdminsHighLevel(): {
     admin: AnonymousControlledAccount;
     node: LocalNode;
-    group: import("../group.js").Group;
-    otherAdmin: import("../account.js").ControlledAccount;
+    group: import("../coValues/group.js").Group<import("../coValues/account.js").Profile<import("../coValues/account.js").ProfileShape, import("../coValues/account.js").ProfileMeta>, import("../index.js").CoMap<{
+        [key: string]: import("../jsonValue.js").JsonValue | undefined;
+    }, import("../jsonValue.js").JsonObject | null>, import("../jsonValue.js").JsonObject | null>;
+    otherAdmin: import("../coValues/account.js").ControlledAccount<import("../coValues/account.js").Profile<import("../coValues/account.js").ProfileShape, import("../coValues/account.js").ProfileMeta>, import("../index.js").CoMap<{
+        [key: string]: import("../jsonValue.js").JsonValue | undefined;
+    }, import("../jsonValue.js").JsonObject | null>, import("../coValues/account.js").AccountMeta>;
 };
 export declare function shouldNotResolve<T>(promise: Promise<T>, ops: {
     timeout: number;

package/dist/tests/testUtils.js

@@ -1,8 +1,8 @@
 import { createdNowUnique, getAgentID, newRandomAgentSecret } from "../crypto.js";
 import { newRandomSessionID } from "../coValueCore.js";
 import { LocalNode } from "../localNode.js";
-import { expectGroupContent } from "../group.js";
-import { AnonymousControlledAccount } from "../account.js";
+import { expectGroup } from "../coValues/group.js";
+import { AnonymousControlledAccount } from "../coValues/account.js";
 // @ts-ignore
 import { expect } from "bun:test";
 export function randomAnonymousAccountAndSessionID() {
@@ -13,33 +13,32 @@ export function randomAnonymousAccountAndSessionID() {
 export function newGroup() {
     const [admin, sessionID] = randomAnonymousAccountAndSessionID();
     const node = new LocalNode(admin, sessionID);
-    const group = node.createCoValue({
+    const groupCore = node.createCoValue({
         type: "comap",
         ruleset: { type: "group", initialAdmin: admin.id },
         meta: null,
         ...createdNowUnique(),
     });
-    const groupContent = expectGroupContent(group.getCurrentContent());
-    groupContent.mutate((editable) => {
+    const group = expectGroup(groupCore.getCurrentContent());
+    group.mutate((editable) => {
         editable.set(admin.id, "admin", "trusting");
         expect(editable.get(admin.id)).toEqual("admin");
     });
-    return { node, group, admin };
+    return { node, groupCore, admin };
 }
 export function groupWithTwoAdmins() {
-    const { group, admin, node } = newGroup();
+    const { groupCore, admin, node } = newGroup();
     const otherAdmin = node.createAccount("otherAdmin");
-    let content = expectGroupContent(group.getCurrentContent());
-    content.mutate((editable) => {
-        editable.set(otherAdmin.id, "admin", "trusting");
-        expect(editable.get(otherAdmin.id)).toEqual("admin");
+    let group = expectGroup(groupCore.getCurrentContent());
+    group = group.mutate((mutable) => {
+        mutable.set(otherAdmin.id, "admin", "trusting");
+        expect(mutable.get(otherAdmin.id)).toEqual("admin");
     });
-    content = expectGroupContent(group.getCurrentContent());
-    if (content.type !== "comap") {
+    if (group.type !== "comap") {
         throw new Error("Expected map");
     }
-    expect(content.get(otherAdmin.id)).toEqual("admin");
-    return { group, admin, otherAdmin, node };
+    expect(group.get(otherAdmin.id)).toEqual("admin");
+    return { groupCore, admin, otherAdmin, node };
 }
 export function newGroupHighLevel() {
     const [admin, sessionID] = randomAnonymousAccountAndSessionID();
@@ -48,9 +47,9 @@ export function newGroupHighLevel() {
     return { admin, node, group };
 }
 export function groupWithTwoAdminsHighLevel() {
-    const { admin, node, group } = newGroupHighLevel();
+    let { admin, node, group } = newGroupHighLevel();
     const otherAdmin = node.createAccount("otherAdmin");
-    group.addMember(otherAdmin.id, "admin");
+    group = group.addMember(otherAdmin.id, "admin");
     return { admin, node, group, otherAdmin };
 }
 export function shouldNotResolve(promise, ops) {

package/dist/tests/testUtils.js.map

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

package/package.json

@@ -5,7 +5,7 @@
     "types": "dist/index.d.ts",
     "type": "module",
     "license": "MIT",
-    "version": "0.3.7",
+    "version": "0.4.0",
     "devDependencies": {
         "@types/jest": "^29.5.3",
         "@typescript-eslint/eslint-plugin": "^6.2.1",
@@ -51,5 +51,5 @@
             "/dist/"
         ]
     },
-    "gitHead": "33c27053293b4801b968c61d5c4c989f93a67d13"
+    "gitHead": "b2c8d8c8557c0324ee1c10d0f47441b624647f85"
 }

package/src/coValue.ts

@@ -8,7 +8,8 @@ import {
 } from "./coValues/coStream.js";
 import { CoList } from "./coValues/coList.js";
 import { CoValueCore } from "./coValueCore.js";
-import { Group } from "./group.js";
+import { Group } from "./coValues/group.js";
+import { Account, Profile } from "./index.js";
 
 export type CoID<T extends CoValue> = RawCoID & {
     readonly __type: T;
@@ -37,55 +38,35 @@ export interface CoValue {
     subscribe(listener: (coValue: this) => void): () => void;
 }
 
-export type AnyCoMap = CoMap<
-    { [key: string]: JsonValue | CoValue | undefined },
-    JsonObject | null
->;
+export type AnyCoValue = CoMap | Group | Account | Profile | CoList | CoStream | BinaryCoStream;
 
-export type AnyCoList = CoList<JsonValue | CoValue, JsonObject | null>;
-
-export type AnyCoStream = CoStream<JsonValue | CoValue, JsonObject | null>;
-
-export type AnyBinaryCoStream = BinaryCoStream<BinaryCoStreamMeta>;
-
-
-export type AnyCoValue =
-    | AnyCoMap
-    | AnyCoList
-    | AnyCoStream
-    | AnyBinaryCoStream
-
-export function expectMap(
-    content: CoValue
-): AnyCoMap {
+export function expectMap(content: CoValue): CoMap {
     if (content.type !== "comap") {
         throw new Error("Expected map");
     }
 
-    return content as AnyCoMap;
+    return content as CoMap;
 }
 
-export function expectList(
-    content: CoValue
-): AnyCoList {
+export function expectList(content: CoValue): CoList {
     if (content.type !== "colist") {
         throw new Error("Expected list");
     }
 
-    return content as AnyCoList;
+    return content as CoList;
 }
 
-export function expectStream(
-    content: CoValue
-): AnyCoStream {
+export function expectStream(content: CoValue): CoStream {
     if (content.type !== "costream") {
         throw new Error("Expected stream");
     }
 
-    return content as AnyCoStream;
+    return content as CoStream;
 }
 
-export function isCoValue(value: JsonValue | CoValue | undefined) : value is CoValue {
+export function isCoValue(
+    value: JsonValue | CoValue | undefined
+): value is CoValue {
     return (
         value instanceof CoMap ||
         value instanceof CoList ||