jazz-tools 0.7.0-alpha.4 → 0.7.0-alpha.42

package/dist/tests/groupsAndAccounts.test.js

@@ -0,0 +1,83 @@
+import { expect, describe, test } from "vitest";
+import { Account, CoMap, co, Group, WasmCrypto } from "../index.js";
+const Crypto = await WasmCrypto.create();
+describe("Custom accounts and groups", async () => {
+    var _a;
+    class CustomProfile extends CoMap {
+        constructor() {
+            super(...arguments);
+            this.name = co.string;
+            this.color = co.string;
+        }
+    }
+    class CustomAccount extends Account {
+        constructor() {
+            super(...arguments);
+            this.profile = co.ref(CustomProfile);
+            this.root = co.ref(CoMap);
+        }
+        migrate(creationProps) {
+            if (creationProps) {
+                const profileGroup = Group.create({ owner: this });
+                profileGroup.addMember("everyone", "reader");
+                this.profile = CustomProfile.create({ name: creationProps.name, color: "blue" }, { owner: this });
+            }
+        }
+    }
+    class CustomGroup extends Group {
+        constructor() {
+            super(...arguments);
+            this.profile = co.null;
+            this.root = co.null;
+            this[_a] = co.ref(CustomAccount);
+        }
+        get nMembers() {
+            return this.members.length;
+        }
+    }
+    _a = co.members;
+    test("Custom account and group", async () => {
+        const me = await CustomAccount.create({
+            creationProps: { name: "Hermes Puggington" },
+            crypto: Crypto,
+        });
+        expect(me.profile).toBeDefined();
+        expect(me.profile?.name).toBe("Hermes Puggington");
+        expect(me.profile?.color).toBe("blue");
+        const group = new CustomGroup({ owner: me });
+        group.addMember("everyone", "reader");
+        expect(group.members).toMatchObject([
+            { id: me.id, role: "admin" },
+            { id: "everyone", role: "reader" },
+        ]);
+        expect(group.nMembers).toBe(2);
+        await new Promise((resolve) => {
+            CustomGroup.subscribe(group, {}, (update) => {
+                const meAsMember = update.members.find((member) => {
+                    return member.id === me.id && member.account?.profile;
+                });
+                if (meAsMember) {
+                    expect(meAsMember.account?.profile?.name).toBe("Hermes Puggington");
+                    expect(meAsMember.account?.profile?.color).toBe("blue");
+                    resolve();
+                }
+            });
+        });
+        class MyMap extends CoMap {
+            constructor() {
+                super(...arguments);
+                this.name = co.string;
+            }
+        }
+        const map = MyMap.create({ name: "test" }, { owner: group });
+        const meAsCastMember = map._owner
+            .as(CustomGroup)
+            .members.find((member) => member.id === me.id);
+        expect(meAsCastMember?.account?.profile?.name).toBe("Hermes Puggington");
+        expect(meAsCastMember?.account?.profile?.color).toBe("blue");
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        expect(map._owner.nMembers).toBeUndefined();
+        expect(map._owner.as(CustomGroup).nMembers).toBe(2);
+    });
+});
+//# sourceMappingURL=groupsAndAccounts.test.js.map

package/dist/tests/groupsAndAccounts.test.js.map

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

package/package.json

@@ -1,15 +1,17 @@
 {
   "name": "jazz-tools",
-  "module": "dist/index.js",
-  "main": "dist/index.js",
-  "types": "src/index.ts",
+  "module": "./dist/index.js",
+  "main": "./dist/index.js",
+  "types": "./src/index.ts",
   "type": "module",
   "license": "MIT",
-  "version": "0.7.0-alpha.4",
+  "version": "0.7.0-alpha.42",
   "dependencies": {
-    "@effect/schema": "^0.64.20",
-    "effect": "^2.4.18",
-    "cojson": "0.7.0-alpha.1"
+    "@effect/schema": "^0.66.16",
+    "effect": "^3.1.5",
+    "fast-check": "^3.17.2",
+    "cojson-transport-nodejs-ws": "0.7.0-alpha.42",
+    "cojson": "0.7.0-alpha.42"
   },
   "devDependencies": {
     "typescript": "^5.3.3",
@@ -22,9 +24,15 @@
       }
     }
   },
+  "lint-staged": {
+    "*.{ts,tsx}": "eslint --fix",
+    "*.{js,jsx,mdx,json}": "prettier --write"
+  },
   "scripts": {
-    "test": "vitest",
-    "lint": "eslint src/**/*.ts",
+    "test": "vitest --run",
+    "test-watch": "vitest",
+    "lint": "eslint . --ext ts,tsx",
+    "format": "prettier --write './src/**/*.{ts,tsx}'",
     "build": "npm run lint && rm -rf ./dist && tsc --sourceMap --outDir dist"
   }
 }

package/src/coValues/account.ts

@@ -2,6 +2,7 @@ import { LocalNode } from "cojson";
 import type {
     AgentSecret,
     CoID,
+    CryptoProvider,
     InviteSecret,
     Peer,
     RawAccount,
@@ -15,109 +16,100 @@ import type {
     CoMap,
     CoValue,
     CoValueClass,
-    FieldDescriptor,
-    Group,
+    Schema,
     ID,
-    RefField,
-    SubclassedConstructor,
-    UnavailableError,
+    RefEncoded,
+    ClassOf,
+    RefIfCoValue,
+} from "../internal.js";
+import {
+    Group,
+    CoValueBase,
+    MembersSym,
+    Profile,
+    Ref,
+    SchemaInit,
+    inspect,
+    subscriptionsScopes,
 } from "../internal.js";
-import { CoValueBase, Profile, ValueRef, inspect } from "../internal.js";
-import type { Stream } from "effect/Stream";
 
-export class Account<
-        Def extends { profile: Profile | null; root: CoMap | null } = {
-            profile: Profile | null;
-            root: CoMap | null;
-        },
-    >
+/** @category Identity & Permissions */
+export class Account
     extends CoValueBase
     implements CoValue<"Account", RawAccount | RawControlledAccount>
 {
-    id!: ID<this>;
-    _type!: "Account";
-    _raw!: RawAccount | RawControlledAccount;
+    declare id: ID<this>;
+    declare _type: "Account";
+    declare _raw: RawAccount | RawControlledAccount;
 
-    static _encoding: any;
-    get _encoding(): {
-        profile: FieldDescriptor;
-        root: FieldDescriptor;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    static _schema: any;
+    get _schema(): {
+        profile: Schema;
+        root: Schema;
     } {
-        return (this.constructor as typeof Account)._encoding;
+        return (this.constructor as typeof Account)._schema;
     }
     static {
-        this._encoding = {
-            profile: { ref: () => Profile },
-            root: { json: true },
+        this._schema = {
+            profile: () => Profile satisfies Schema,
+            root: "json" satisfies Schema,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
         } as any;
     }
 
     get _owner(): Account {
         return this as Account;
     }
-    get _loadedAs(): Account & Me {
+    get _loadedAs(): Account {
         return this.isMe
-            ? (this as Account & Me)
+            ? this
             : Account.fromNode(this._raw.core.node);
     }
 
-    profile!: NonNullable<Def["profile"]> | null;
-    root!: NonNullable<Def["root"]> | null;
+    declare profile: Profile | null;
+    declare root: CoMap | null;
 
-    get _refs(): {
-        profile: NonNullable<Def["profile"]> extends Profile
-            ? ValueRef<NonNullable<Def["profile"]>> | null
-            : null;
-        root: NonNullable<Def["root"]> extends CoMap
-            ? ValueRef<NonNullable<Def["root"]>> | null
-            : null;
-    } {
-        const profileID = this._raw.get("profile") as unknown as ID<
-            NonNullable<Def["profile"]>
-        > | undefined;
+    get _refs() {
+        const profileID = this._raw.get("profile") as unknown as
+            | ID<NonNullable<this["profile"]>>
+            | undefined;
         const rootID = this._raw.get("root") as unknown as
-            | ID<NonNullable<Def["root"]>>
+            | ID<NonNullable<this["root"]>>
             | undefined;
+
         return {
-            profile: profileID && (new ValueRef(
-                profileID,
-                this._loadedAs,
-                (
-                    this._encoding.profile as RefField<
-                        NonNullable<Def["profile"]> & CoValue
-                    >
-                ).ref()
-            )) as any,
+            profile:
+                profileID &&
+                (new Ref(
+                    profileID,
+                    this._loadedAs,
+                    this._schema.profile as RefEncoded<
+                        NonNullable<this["profile"]> & CoValue
+                    >,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                ) as any as RefIfCoValue<this["profile"]>),
             root:
                 rootID &&
-                (new ValueRef(
+                (new Ref(
                     rootID,
                     this._loadedAs,
-                    (
-                        this._encoding.root as RefField<NonNullable<Def["root"]> & CoValue>
-                    ).ref()
-                ) as any),
+                    this._schema.root as RefEncoded<
+                        NonNullable<this["root"]> & CoValue
+                    >,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                ) as any as RefIfCoValue<this["root"]>),
         };
     }
 
     isMe: boolean;
     sessionID: SessionID | undefined;
 
-    constructor(init: undefined, options: { owner: Group | Account });
-    constructor(
-        init: undefined,
-        options: { fromRaw: RawAccount | RawControlledAccount }
-    );
-    constructor(
-        init: undefined,
-        options:
-            | { fromRaw: RawAccount | RawControlledAccount }
-            | { owner: Group | Account }
-    ) {
+    constructor(options: { fromRaw: RawAccount | RawControlledAccount }) {
         super();
         if (!("fromRaw" in options)) {
             throw new Error(
-                "Can only construct account from raw or with .create()"
+                "Can only construct account from raw or with .create()",
             );
         }
         this.isMe = options.fromRaw.id == options.fromRaw.core.node.account.id;
@@ -128,40 +120,18 @@ export class Account<
                 enumerable: false,
             },
             _raw: { value: options.fromRaw, enumerable: false },
-            profile: {
-                get: () => {
-                    const ref = this._refs.profile;
-                    return ref ? ref.accessFrom(this) : (undefined as any);
-                },
-                set: (value: Def["profile"] | null) => {
-                    if (value) {
-                        this._raw.set(
-                            "profile",
-                            value.id as unknown as CoID<RawCoMap>
-                        );
-                    }
-                },
-            },
-            root: {
-                get: () => {
-                    const ref = this._refs.root;
-                    return ref ? ref.accessFrom(this) : (undefined as any);
-                },
-                set: (value: Def["root"] | null) => {
-                    if (value) {
-                        this._raw.set(
-                            "root",
-                            value.id as unknown as CoID<RawCoMap>
-                        );
-                    }
-                },
-            },
+            _type: { value: "Account", enumerable: false },
         });
 
         if (this.isMe) {
-            (this as Account & Me).sessionID =
+            this.sessionID =
                 options.fromRaw.core.node.currentSessionID;
         }
+
+        return new Proxy(
+            this,
+            AccountAndGroupProxyHandler as ProxyHandler<this>,
+        );
     }
 
     myRole(): "admin" | undefined {
@@ -170,88 +140,89 @@ export class Account<
         }
     }
 
-    acceptInvite:
-        | (<V extends CoValue>(
-              valueID: ID<V>,
-              inviteSecret: InviteSecret,
-              coValueClass: CoValueClass<V>
-          ) => Promise<V | undefined>)
-        | undefined = (async <V extends CoValue>(
+    async acceptInvite <V extends CoValue>(
         valueID: ID<V>,
         inviteSecret: InviteSecret,
-        coValueClass: CoValueClass<V>
-    ) => {
+        coValueClass: CoValueClass<V>,
+    ) {
         if (!this.isMe) {
             throw new Error("Only a controlled account can accept invites");
         }
 
         await (this._raw as RawControlledAccount).acceptInvite(
             valueID as unknown as CoID<RawCoValue>,
-            inviteSecret
+            inviteSecret,
         );
 
-        return coValueClass.load(valueID, {
-            as: this as Account & Me,
-        });
-    }) as any;
+        return coValueClass.load(
+            valueID,
+            this as Account,
+            [],
+        );
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    }
 
     static async create<A extends Account>(
-        this: SubclassedConstructor<A> & typeof Account,
+        this: ClassOf<A> & typeof Account,
         options: {
-            name: string;
+            creationProps: { name: string };
             initialAgentSecret?: AgentSecret;
             peersToLoadFrom?: Peer[];
-        }
-    ): Promise<A & Me> {
+            crypto: CryptoProvider;
+        },
+    ): Promise<A> {
         const { node } = await LocalNode.withNewlyCreatedAccount({
             ...options,
-            migration: async (rawAccount) => {
-                const account = new this(undefined, {
+            migration: async (rawAccount, _node, creationProps) => {
+                const account = new this({
                     fromRaw: rawAccount,
-                }) as A & Me;
+                }) as A;
 
-                await account.migrate?.();
+                await account.migrate?.(creationProps);
             },
         });
 
-        return this.fromNode(node) as A & Me;
+        return this.fromNode(node) as A;
     }
 
     static async become<A extends Account>(
-        this: SubclassedConstructor<A> & typeof Account,
+        this: ClassOf<A> & typeof Account,
         options: {
             accountID: ID<Account>;
             accountSecret: AgentSecret;
-            sessionID: SessionID;
+            sessionID?: SessionID;
             peersToLoadFrom: Peer[];
-        }
-    ): Promise<A & Me> {
+            crypto: CryptoProvider;
+        },
+    ): Promise<A> {
         const node = await LocalNode.withLoadedAccount({
             accountID: options.accountID as unknown as CoID<RawAccount>,
             accountSecret: options.accountSecret,
             sessionID: options.sessionID,
             peersToLoadFrom: options.peersToLoadFrom,
-            migration: async (rawAccount) => {
-                const account = new this(undefined, {
+            crypto: options.crypto,
+            migration: async (rawAccount, _node, creationProps) => {
+                const account = new this({
                     fromRaw: rawAccount,
-                }) as A & Me;
+                }) as A;
 
-                await account.migrate?.();
+                await account.migrate?.(creationProps);
             },
         });
 
-        return this.fromNode(node) as A & Me;
+        return this.fromNode(node) as A;
     }
 
     static fromNode<A extends Account>(
-        this: SubclassedConstructor<A>,
-        node: LocalNode
-    ): A & Me {
-        return new this(undefined, {
+        this: ClassOf<A>,
+        node: LocalNode,
+    ): A {
+        return new this({
             fromRaw: node.account as RawControlledAccount,
-        }) as A & Me;
+        }) as A;
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     toJSON(): object | any[] {
         return {
             id: this.id,
@@ -263,35 +234,95 @@ export class Account<
         return this.toJSON();
     }
 
-    static encoding<V extends Account>(
-        this: { new (...args: any[]): V } & CoValueClass<V> & { _encoding: any },
-        fields: {
-            profile: V["_encoding"]["profile"];
-            root: V["_encoding"]["root"];
+    migrate(creationProps?: { name: string }): void | Promise<void> {
+        if (creationProps) {
+            const profileGroup = Group.create({ owner: this });
+            profileGroup.addMember("everyone", "reader");
+            this.profile = Profile.create(
+                { name: creationProps.name },
+                { owner: profileGroup },
+            );
         }
-    ) {
-        this._encoding ||= {};
-        Object.assign(this._encoding, fields);
     }
-
-    migrate: (() => void | Promise<void>) | undefined;
 }
 
-export interface Me {
-    id: ID<any>;
-    isMe: true;
-    _raw: RawControlledAccount;
-    sessionID: SessionID;
-    subscribe(listener: (update: this & Me) => void): () => void;
-    subscribeEf(): Stream<this & Me, UnavailableError, never>;
-    acceptInvite: (...args: any[]) => any;
-}
+export const AccountAndGroupProxyHandler: ProxyHandler<Account | Group> = {
+    get(target, key, receiver) {
+        if (key === "profile") {
+            const ref = target._refs.profile;
+            return ref
+                ? ref.accessFrom(receiver, "profile")
+                : // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                  (undefined as any);
+        } else if (key === "root") {
+            const ref = target._refs.root;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            return ref ? ref.accessFrom(receiver, "root") : (undefined as any);
+        } else {
+            return Reflect.get(target, key, receiver);
+        }
+    },
+    set(target, key, value, receiver) {
+        if (
+            (key === "profile" || key === "root" || key === MembersSym) &&
+            typeof value === "object" &&
+            SchemaInit in value
+        ) {
+            (target.constructor as typeof CoMap)._schema ||= {};
+            (target.constructor as typeof CoMap)._schema[key] =
+                value[SchemaInit];
+            return true;
+        } else if (key === "profile") {
+            if (value) {
+                target._raw.set(
+                    "profile",
+                    value.id as unknown as CoID<RawCoMap>,
+                    "trusting",
+                );
+            }
+            subscriptionsScopes
+                .get(receiver)
+                ?.onRefAccessedOrSet(target.id, value.id);
+            return true;
+        } else if (key === "root") {
+            if (value) {
+                target._raw.set("root", value.id as unknown as CoID<RawCoMap>);
+            }
+            subscriptionsScopes
+                .get(receiver)
+                ?.onRefAccessedOrSet(target.id, value.id);
+            return true;
+        } else {
+            return Reflect.set(target, key, value, receiver);
+        }
+    },
+    defineProperty(target, key, descriptor) {
+        if (
+            (key === "profile" || key === "root" || key === MembersSym) &&
+            typeof descriptor.value === "object" &&
+            SchemaInit in descriptor.value
+        ) {
+            (target.constructor as typeof CoMap)._schema ||= {};
+            (target.constructor as typeof CoMap)._schema[key] =
+                descriptor.value[SchemaInit];
+            return true;
+        } else {
+            return Reflect.defineProperty(target, key, descriptor);
+        }
+    },
+};
 
+/** @category Identity & Permissions */
 export class AccountCtx extends Context.Tag("Account")<
     AccountCtx,
-    Account & Me
+    Account
 >() {}
 
-export function isControlledAccount(account: Account): account is Account & Me {
+/** @category Identity & Permissions */
+export function isControlledAccount(account: Account): account is Account & {
+    isMe: true;
+    sessionID: SessionID;
+    _raw: RawControlledAccount;
+} {
     return account.isMe;
 }