jazz-tools 0.9.10-jazz-bridge-preview.0 → 0.9.11

package/.turbo/turbo-build.log

@@ -1,20 +1,20 @@
 
-> jazz-tools@0.9.9 build /vercel/path0/packages/jazz-tools
+> jazz-tools@0.9.11 build /home/runner/work/jazz/jazz/packages/jazz-tools
 > tsup
 
 CLI Building entry: {"index.web":"src/index.web.ts","index.native":"src/index.native.ts","testing":"src/testing.ts"}
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.3.5
-CLI Using tsup config: /vercel/path0/packages/jazz-tools/tsup.config.ts
+CLI Using tsup config: /home/runner/work/jazz/jazz/packages/jazz-tools/tsup.config.ts
 CLI Target: es2021
 CLI Cleaning output folder
 ESM Build start
 ESM dist/index.web.js          1.15 KB
 ESM dist/index.native.js       1.14 KB
 ESM dist/testing.js            2.30 KB
-ESM dist/chunk-VQZOWIPU.js     96.39 KB
+ESM dist/chunk-ICWP2U63.js     94.94 KB
 ESM dist/index.web.js.map      273.00 B
 ESM dist/index.native.js.map   283.00 B
 ESM dist/testing.js.map        4.89 KB
-ESM dist/chunk-VQZOWIPU.js.map 238.27 KB
-ESM ⚡️ Build success in 90ms
+ESM dist/chunk-ICWP2U63.js.map 235.54 KB
+ESM ⚡️ Build success in 88ms

package/CHANGELOG.md

@@ -1,10 +1,20 @@
 # jazz-tools
 
-## 0.9.10-jazz-bridge-preview.0
+## 0.9.11
 
 ### Patch Changes
 
-- 5f43fbf: Implement applyDiff for CoLists
+- Updated dependencies [efbf3d8]
+- Updated dependencies [5863bad]
+  - cojson@0.9.11
+
+## 0.9.10
+
+### Patch Changes
+
+- 5e83864: Improve error management on initial auth, fixed an infinite loop when migration fails
+- Updated dependencies [4aa377d]
+  - cojson@0.9.10
 
 ## 0.9.9
 

package/dist/{chunk-YWGGIF2U.js → chunk-ICWP2U63.js}

@@ -454,110 +454,88 @@ async function randomSessionProvider(accountID, crypto) {
   };
 }
 async function createJazzContext(options) {
-  while (true) {
-    if (!("auth" in options)) {
-      return createAnonymousJazzContext({
-        peersToLoadFrom: options.peersToLoadFrom,
-        crypto: options.crypto
+  if (!("auth" in options)) {
+    return createAnonymousJazzContext({
+      peersToLoadFrom: options.peersToLoadFrom,
+      crypto: options.crypto
+    });
+  }
+  const { auth, sessionProvider, peersToLoadFrom, crypto } = options;
+  const AccountSchema = options.AccountSchema ?? RegisteredSchemas["Account"];
+  const authResult = await auth.start(crypto);
+  if (authResult.type === "existing") {
+    const { sessionID, sessionDone } = await sessionProvider(
+      authResult.credentials.accountID,
+      crypto
+    );
+    const node = await LocalNode.withLoadedAccount({
+      accountID: authResult.credentials.accountID,
+      accountSecret: authResult.credentials.secret,
+      sessionID,
+      peersToLoadFrom,
+      crypto,
+      migration: async (rawAccount, _node, creationProps) => {
+        const account2 = new AccountSchema({
+          fromRaw: rawAccount
+        });
+        activeAccountContext.set(account2);
+        await account2.applyMigration(creationProps);
+      }
+    });
+    const account = AccountSchema.fromNode(node);
+    activeAccountContext.set(account);
+    if (authResult.saveCredentials) {
+      await authResult.saveCredentials({
+        accountID: node.account.id,
+        secret: node.account.agentSecret
       });
     }
-    const { auth, sessionProvider, peersToLoadFrom, crypto } = options;
-    const AccountSchema = options.AccountSchema ?? RegisteredSchemas["Account"];
-    let authResult;
-    try {
-      authResult = await auth.start(crypto);
-    } catch (e) {
-      console.error("error", e);
-      throw e;
-    }
-    if (authResult.type === "existing") {
-      try {
-        const { sessionID, sessionDone } = await sessionProvider(
-          authResult.credentials.accountID,
-          crypto
-        );
-        try {
-          const node = await LocalNode.withLoadedAccount({
-            accountID: authResult.credentials.accountID,
-            accountSecret: authResult.credentials.secret,
-            sessionID,
-            peersToLoadFrom,
-            crypto,
-            migration: async (rawAccount, _node, creationProps) => {
-              const account2 = new AccountSchema({
-                fromRaw: rawAccount
-              });
-              activeAccountContext.set(account2);
-              await account2.applyMigration(creationProps);
-            }
-          });
-          const account = AccountSchema.fromNode(node);
-          activeAccountContext.set(account);
-          if (authResult.saveCredentials) {
-            await authResult.saveCredentials({
-              accountID: node.account.id,
-              secret: node.account.agentSecret
-            });
-          }
-          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 })
-        );
+    authResult.onSuccess();
+    return {
+      account,
+      done: () => {
+        node.gracefulShutdown();
+        sessionDone();
+      },
+      logOut: () => {
+        node.gracefulShutdown();
+        sessionDone();
+        authResult.logOut();
       }
-    } else if (authResult.type === "new") {
-      try {
-        const { node } = await LocalNode.withNewlyCreatedAccount({
-          creationProps: authResult.creationProps,
-          peersToLoadFrom,
-          crypto,
-          initialAgentSecret: authResult.initialSecret,
-          migration: async (rawAccount, _node, creationProps) => {
-            const account2 = new AccountSchema({
-              fromRaw: rawAccount
-            });
-            activeAccountContext.set(account2);
-            await account2.applyMigration(creationProps);
-          }
-        });
-        const account = AccountSchema.fromNode(node);
-        activeAccountContext.set(account);
-        await authResult.saveCredentials({
-          accountID: node.account.id,
-          secret: node.account.agentSecret
+    };
+  } else if (authResult.type === "new") {
+    const { node } = await LocalNode.withNewlyCreatedAccount({
+      creationProps: authResult.creationProps,
+      peersToLoadFrom,
+      crypto,
+      initialAgentSecret: authResult.initialSecret,
+      migration: async (rawAccount, _node, creationProps) => {
+        const account2 = new AccountSchema({
+          fromRaw: rawAccount
         });
-        authResult.onSuccess();
-        return {
-          account,
-          done: () => {
-            node.gracefulShutdown();
-          },
-          logOut: () => {
-            node.gracefulShutdown();
-            authResult.logOut();
-          }
-        };
-      } catch (e) {
-        authResult.onError(new Error("Error creating account", { cause: e }));
+        activeAccountContext.set(account2);
+        await account2.applyMigration(creationProps);
       }
-    }
+    });
+    const account = AccountSchema.fromNode(node);
+    activeAccountContext.set(account);
+    await authResult.saveCredentials({
+      accountID: node.account.id,
+      secret: node.account.agentSecret
+    });
+    authResult.onSuccess();
+    return {
+      account,
+      done: () => {
+        node.gracefulShutdown();
+      },
+      logOut: () => {
+        node.gracefulShutdown();
+        authResult.logOut();
+      }
+    };
   }
+  throw new Error("Invalid auth result");
 }
 async function createAnonymousJazzContext({
   peersToLoadFrom,
@@ -1121,7 +1099,6 @@ function getAccountIDfromSessionID(sessionID) {
 
 // src/coValues/coMap.ts
 import {
-  CoValueCore,
   cojsonInternals
 } from "cojson";
 var _CoMap = class _CoMap extends CoValueBase {
@@ -1376,43 +1353,6 @@ var _CoMap = class _CoMap extends CoValueBase {
     const crypto = as._type === "Anonymous" ? as.node.crypto : as._raw.core.crypto;
     return cojsonInternals.idforHeader(header, crypto);
   }
-  static async getUnique(unique, ownerID, as) {
-    as ||= activeAccountContext.get();
-    const header = {
-      type: "comap",
-      ruleset: {
-        type: "ownedByGroup",
-        group: ownerID
-      },
-      meta: null,
-      uniqueness: unique
-    };
-    const crypto = as._raw.core.crypto;
-    const id = cojsonInternals.idforHeader(header, crypto);
-    const existingEntry = as._raw.core.node.coValuesStore.get(id);
-    if (existingEntry) {
-      if (existingEntry.state.type === "available") {
-        return this.fromRaw(
-          existingEntry.state.coValue.getCurrentContent()
-        );
-      } else if (existingEntry.state.type !== "unknown") {
-        throw new Error(
-          `Can't handle intermediate state for unique CoMap: ${existingEntry.state.type}`
-        );
-      }
-    }
-    as._raw.core.node.coValuesStore.setAsAvailable(
-      id,
-      new CoValueCore(header, as._raw.core.node)
-    );
-    const entry = as._raw.core.node.coValuesStore.get(id);
-    if (entry.state.type !== "available") {
-      throw new Error("CoValue not found");
-    }
-    return this.fromRaw(
-      entry.state.coValue.getCurrentContent()
-    );
-  }
   /**
    * Given an already loaded `CoMap`, ensure that the specified fields are loaded to the specified depth.
    *
@@ -2352,7 +2292,6 @@ var FileStream = class extends CoValueBase {
 
 // src/coValues/coList.ts
 import { RawAccount as RawAccount5 } from "cojson";
-import { calcPatch } from "fast-myers-diff";
 var _CoList = class _CoList extends Array {
   /**
    * Declare a `CoList` by subclassing `CoList.Of(...)` and passing the item schema using `co`.
@@ -2517,20 +2456,12 @@ var _CoList = class _CoList extends Array {
     }
     let appendAfter = Math.max(start - 1, 0);
     for (const item of toRawItems(items, this._schema[ItemsSym])) {
+      console.log(this._raw.asArray(), appendAfter);
       this._raw.append(item, appendAfter);
       appendAfter++;
     }
     return deleted;
   }
-  applyDiff(other) {
-    const current = this._raw.asArray();
-    const cmp = isRefEncoded(this._schema[ItemsSym]) ? (aIdx, bIdx) => current[aIdx].id === other[bIdx].id : void 0;
-    for (const [from, to, insert] of [
-      ...calcPatch(current, other, cmp)
-    ].reverse()) {
-      this.splice(from, to - from, ...insert);
-    }
-  }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   toJSON(_key, seenAbove) {
     const itemDescriptor = this._schema[ItemsSym];
@@ -3123,6 +3054,7 @@ var CoRichText = class extends CoMap {
           end + 1,
           mark.endBefore,
           RangeClass,
+          // @ts-ignore Some Typescript versions flag this as an error
           {},
           {
             markOwner: mark.sourceMark._owner || this._owner
@@ -3448,4 +3380,4 @@ export {
   SchemaUnion
 };
 /* istanbul ignore file -- @preserve */
-//# sourceMappingURL=chunk-YWGGIF2U.js.map
+//# sourceMappingURL=chunk-ICWP2U63.js.map