jazz-tools 0.9.9 → 0.9.10

package/dist/index.native.js

@@ -26,7 +26,7 @@ import {
   loadCoValue,
   randomSessionProvider,
   subscribeToCoValue
-} from "./chunk-VQZOWIPU.js";
+} from "./chunk-ICWP2U63.js";
 
 // src/index.native.ts
 import {

package/dist/index.web.js

@@ -26,7 +26,7 @@ import {
   loadCoValue,
   randomSessionProvider,
   subscribeToCoValue
-} from "./chunk-VQZOWIPU.js";
+} from "./chunk-ICWP2U63.js";
 
 // src/index.web.ts
 import { cojsonInternals, MAX_RECOMMENDED_TX_SIZE, WasmCrypto } from "cojson";

package/dist/testing.js

@@ -2,7 +2,7 @@ import {
   Account,
   activeAccountContext,
   createAnonymousJazzContext
-} from "./chunk-VQZOWIPU.js";
+} from "./chunk-ICWP2U63.js";
 
 // src/testing.ts
 import { cojsonInternals } from "cojson";

package/package.json

@@ -23,9 +23,9 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.9.9",
+  "version": "0.9.10",
   "dependencies": {
-    "cojson": "0.9.9"
+    "cojson": "0.9.10"
   },
   "devDependencies": {
     "tsup": "8.3.5",

package/src/coValues/coMap.ts

@@ -426,7 +426,6 @@ export class CoMap extends CoValueBase implements CoValue {
    * ```ts
    * const person = await Person.load(
    *   "co_zdsMhHtfG6VNKt7RqPUPvUtN2Ax",
-   *   me,
    *   { pet: {} }
    * );
    * ```
@@ -473,7 +472,6 @@ export class CoMap extends CoValueBase implements CoValue {
    * ```ts
    * const unsub = Person.subscribe(
    *   "co_zdsMhHtfG6VNKt7RqPUPvUtN2Ax",
-   *   me,
    *   { pet: {} },
    *   (person) => console.log(person)
    * );

package/src/coValues/coPlainText.ts

@@ -117,22 +117,6 @@ export class CoPlainText extends String implements CoValue {
   /**
    * Load a `CoPlainText` with a given ID, as a given account.
    *
-   * `depth` specifies which (if any) fields that reference other CoValues to load as well before resolving.
-   * The `DeeplyLoaded` return type guarantees that corresponding referenced CoValues are loaded to the specified depth.
-   *
-   * You can pass `[]` or `{}` for shallowly loading only this CoPlainText, or `{ fieldA: depthA, fieldB: depthB }` for recursively loading referenced CoValues.
-   *
-   * Check out the `load` methods on `CoMap`/`CoList`/`CoStream`/`Group`/`Account` to see which depth structures are valid to nest.
-   *
-   * @example
-   * ```ts
-   * const person = await Person.load(
-   *   "co_zdsMhHtfG6VNKt7RqPUPvUtN2Ax",
-   *   me,
-   *   { pet: {} }
-   * );
-   * ```
-   *
    * @category Subscription & Loading
    */
   static load<T extends CoPlainText>(
@@ -162,27 +146,12 @@ export class CoPlainText extends String implements CoValue {
    *
    * Automatically also subscribes to updates to all referenced/nested CoValues as soon as they are accessed in the listener.
    *
-   * `depth` specifies which (if any) fields that reference other CoValues to load as well before calling `listener` for the first time.
-   * The `DeeplyLoaded` return type guarantees that corresponding referenced CoValues are loaded to the specified depth.
-   *
-   * You can pass `[]` or `{}` for shallowly loading only this CoMap, or `{ fieldA: depthA, fieldB: depthB }` for recursively loading referenced CoValues.
-   *
    * Check out the `load` methods on `CoMap`/`CoList`/`CoStream`/`Group`/`Account` to see which depth structures are valid to nest.
    *
    * Returns an unsubscribe function that you should call when you no longer need updates.
    *
    * Also see the `useCoState` hook to reactively subscribe to a CoValue in a React component.
    *
-   * @example
-   * ```ts
-   * const unsub = Person.subscribe(
-   *   "co_zdsMhHtfG6VNKt7RqPUPvUtN2Ax",
-   *   me,
-   *   { pet: {} },
-   *   (person) => console.log(person)
-   * );
-   * ```
-   *
    * @category Subscription & Loading
    */
   static subscribe<T extends CoPlainText>(

package/src/coValues/coRichText.ts

@@ -372,6 +372,7 @@ export class CoRichText extends CoMap {
           end + 1,
           mark.endBefore,
           RangeClass,
+          // @ts-ignore Some Typescript versions flag this as an error
           {},
           {
             markOwner: mark.sourceMark._owner || this._owner,

package/src/implementation/createContext.ts

@@ -128,129 +128,106 @@ export async function createJazzContext<Acc extends Account>(
 ): Promise<JazzContext<Acc>>;
 export async function createJazzContext<Acc extends Account>(
   options: ContextParamsWithAuth<Acc> | BaseContextParams,
-): Promise<JazzContext<Acc>> {
-  // eslint-disable-next-line no-constant-condition
-  while (true) {
-    if (!("auth" in options)) {
-      return createAnonymousJazzContext({
-        peersToLoadFrom: options.peersToLoadFrom,
-        crypto: options.crypto,
-      });
-    }
+): Promise<JazzContext<Acc> | JazzContextWithAgent> {
+  if (!("auth" in options)) {
+    return createAnonymousJazzContext({
+      peersToLoadFrom: options.peersToLoadFrom,
+      crypto: options.crypto,
+    });
+  }
 
-    const { auth, sessionProvider, peersToLoadFrom, crypto } = options;
-    const AccountSchema =
-      options.AccountSchema ??
-      (RegisteredSchemas["Account"] as unknown as AccountClass<Acc>);
-    let authResult: AuthResult;
-    try {
-      authResult = await auth.start(crypto);
-    } catch (e) {
-      console.error("error", e);
-      throw e;
-    }
+  const { auth, sessionProvider, peersToLoadFrom, crypto } = options;
+  const AccountSchema =
+    options.AccountSchema ??
+    (RegisteredSchemas["Account"] as unknown as AccountClass<Acc>);
+  const authResult = await auth.start(crypto);
 
-    if (authResult.type === "existing") {
-      try {
-        const { sessionID, sessionDone } = await sessionProvider(
-          authResult.credentials.accountID,
-          crypto,
-        );
+  if (authResult.type === "existing") {
+    const { sessionID, sessionDone } = await sessionProvider(
+      authResult.credentials.accountID,
+      crypto,
+    );
 
-        try {
-          const node = await LocalNode.withLoadedAccount({
-            accountID: authResult.credentials
-              .accountID as unknown as CoID<RawAccount>,
-            accountSecret: authResult.credentials.secret,
-            sessionID: sessionID,
-            peersToLoadFrom: peersToLoadFrom,
-            crypto: crypto,
-            migration: async (rawAccount, _node, creationProps) => {
-              const account = new AccountSchema({
-                fromRaw: rawAccount,
-              }) as Acc;
+    const node = await LocalNode.withLoadedAccount({
+      accountID: authResult.credentials
+        .accountID as unknown as CoID<RawAccount>,
+      accountSecret: authResult.credentials.secret,
+      sessionID: sessionID,
+      peersToLoadFrom: peersToLoadFrom,
+      crypto: crypto,
+      migration: async (rawAccount, _node, creationProps) => {
+        const account = new AccountSchema({
+          fromRaw: rawAccount,
+        }) as Acc;
 
-              activeAccountContext.set(account);
+        activeAccountContext.set(account);
 
-              await account.applyMigration(creationProps);
-            },
-          });
+        await account.applyMigration(creationProps);
+      },
+    });
 
-          const account = AccountSchema.fromNode(node);
-          activeAccountContext.set(account);
+    const account = AccountSchema.fromNode(node);
+    activeAccountContext.set(account);
 
-          if (authResult.saveCredentials) {
-            await authResult.saveCredentials({
-              accountID: node.account.id as unknown as ID<Account>,
-              secret: node.account.agentSecret,
-            });
-          }
+    if (authResult.saveCredentials) {
+      await authResult.saveCredentials({
+        accountID: node.account.id as unknown as ID<Account>,
+        secret: node.account.agentSecret,
+      });
+    }
 
-          authResult.onSuccess();
+    authResult.onSuccess();
 
-          return {
-            account,
-            done: () => {
-              node.gracefulShutdown();
-              sessionDone();
-            },
-            logOut: () => {
-              node.gracefulShutdown();
-              sessionDone();
-              authResult.logOut();
-            },
-          };
-        } catch (e) {
-          authResult.onError(new Error("Error loading account", { cause: e }));
-          sessionDone();
-        }
-      } catch (e) {
-        authResult.onError(
-          new Error("Error acquiring sessionID", { cause: e }),
-        );
-      }
-    } else if (authResult.type === "new") {
-      try {
-        // TODO: figure out a way to not "waste" the first SessionID
-        const { node } = await LocalNode.withNewlyCreatedAccount({
-          creationProps: authResult.creationProps,
-          peersToLoadFrom: peersToLoadFrom,
-          crypto: crypto,
-          initialAgentSecret: authResult.initialSecret,
-          migration: async (rawAccount, _node, creationProps) => {
-            const account = new AccountSchema({
-              fromRaw: rawAccount,
-            }) as Acc;
-            activeAccountContext.set(account);
+    return {
+      account,
+      done: () => {
+        node.gracefulShutdown();
+        sessionDone();
+      },
+      logOut: () => {
+        node.gracefulShutdown();
+        sessionDone();
+        authResult.logOut();
+      },
+    };
+  } else if (authResult.type === "new") {
+    const { node } = await LocalNode.withNewlyCreatedAccount({
+      creationProps: authResult.creationProps,
+      peersToLoadFrom: peersToLoadFrom,
+      crypto: crypto,
+      initialAgentSecret: authResult.initialSecret,
+      migration: async (rawAccount, _node, creationProps) => {
+        const account = new AccountSchema({
+          fromRaw: rawAccount,
+        }) as Acc;
+        activeAccountContext.set(account);
 
-            await account.applyMigration(creationProps);
-          },
-        });
+        await account.applyMigration(creationProps);
+      },
+    });
 
-        const account = AccountSchema.fromNode(node);
-        activeAccountContext.set(account);
+    const account = AccountSchema.fromNode(node);
+    activeAccountContext.set(account);
 
-        await authResult.saveCredentials({
-          accountID: node.account.id as unknown as ID<Account>,
-          secret: node.account.agentSecret,
-        });
+    await authResult.saveCredentials({
+      accountID: node.account.id as unknown as ID<Account>,
+      secret: node.account.agentSecret,
+    });
 
-        authResult.onSuccess();
-        return {
-          account,
-          done: () => {
-            node.gracefulShutdown();
-          },
-          logOut: () => {
-            node.gracefulShutdown();
-            authResult.logOut();
-          },
-        };
-      } catch (e) {
-        authResult.onError(new Error("Error creating account", { cause: e }));
-      }
-    }
+    authResult.onSuccess();
+    return {
+      account,
+      done: () => {
+        node.gracefulShutdown();
+      },
+      logOut: () => {
+        node.gracefulShutdown();
+        authResult.logOut();
+      },
+    };
   }
+
+  throw new Error("Invalid auth result");
 }
 
 export async function createAnonymousJazzContext({

package/src/tests/groupsAndAccounts.test.ts

@@ -1,12 +1,12 @@
-import { RawGroup } from "cojson";
+import { WasmCrypto } from "cojson";
 import { describe, expect, test } from "vitest";
-import { Account, CoMap, Group, WasmCrypto, co } from "../index.web.js";
+import { Account, CoMap, Group, Profile, co } from "../exports.js";
 import { setupTwoNodes } from "./utils.js";
 
 const Crypto = await WasmCrypto.create();
 
 describe("Custom accounts and groups", async () => {
-  class CustomProfile extends CoMap {
+  class CustomProfile extends Profile {
     name = co.string;
     color = co.string;
   }

package/tsconfig.native.json

@@ -1,5 +1,5 @@
 {
   "extends": "./tsconfig.json",
   "include": ["./src/**/*.ts"],
-  "exclude": ["./node_modules", "./src/tests", "./src/index.web.ts"]
+  "exclude": ["./node_modules", "./src/tests", "./src/index.native.ts"]
 }

package/tsconfig.web.json

@@ -1,5 +1,5 @@
 {
   "extends": "./tsconfig.json",
   "include": ["./src/**/*.ts"],
-  "exclude": ["./node_modules", "./src/tests", "./src/index.native.ts"]
+  "exclude": ["./node_modules", "./src/tests", "./src/index.web.ts"]
 }