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

package/dist/index.native.js

@@ -26,7 +26,7 @@ import {
   loadCoValue,
   randomSessionProvider,
   subscribeToCoValue
-} from "./chunk-YWGGIF2U.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-YWGGIF2U.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-YWGGIF2U.js";
+} from "./chunk-ICWP2U63.js";
 
 // src/testing.ts
 import { cojsonInternals } from "cojson";

package/package.json

@@ -23,10 +23,9 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.9.10-jazz-bridge-preview.0",
+  "version": "0.9.11",
   "dependencies": {
-    "fast-myers-diff": "^3.2.0",
-    "cojson": "0.9.9"
+    "cojson": "0.9.11"
   },
   "devDependencies": {
     "tsup": "8.3.5",

package/src/coValues/coList.ts

@@ -1,6 +1,5 @@
 import type { JsonValue, RawCoList } from "cojson";
 import { RawAccount } from "cojson";
-import { calcPatch } from "fast-myers-diff";
 import type {
   CoValue,
   CoValueClass,
@@ -288,6 +287,7 @@ export class CoList<Item = any> extends Array<Item> implements CoValue {
 
     let appendAfter = Math.max(start - 1, 0);
     for (const item of toRawItems(items as Item[], this._schema[ItemsSym])) {
+      console.log(this._raw.asArray(), appendAfter);
       this._raw.append(item, appendAfter);
       appendAfter++;
     }
@@ -295,19 +295,6 @@ export class CoList<Item = any> extends Array<Item> implements CoValue {
     return deleted;
   }
 
-  applyDiff(other: Item[]) {
-    const current = this._raw.asArray() as Item[];
-    const cmp = isRefEncoded(this._schema[ItemsSym])
-      ? (aIdx: number, bIdx: number) =>
-          (current[aIdx] as CoValue).id === (other[bIdx] as CoValue).id
-      : undefined;
-    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?: string, seenAbove?: ID<CoValue>[]): any[] {
     const itemDescriptor = this._schema[ItemsSym] as Schema;

package/src/coValues/coMap.ts

@@ -1,6 +1,5 @@
 import {
   AgentID,
-  CoValueCore,
   type CoValueUniqueness,
   CojsonInternalTypes,
   type JsonValue,
@@ -533,59 +532,6 @@ export class CoMap extends CoValueBase implements CoValue {
     return cojsonInternals.idforHeader(header, crypto) as ID<M>;
   }
 
-  static async getUnique<M extends CoMap>(
-    this: CoValueClass<M>,
-    unique: CoValueUniqueness["uniqueness"],
-    ownerID: ID<Account> | ID<Group>,
-    as: Account,
-  ): Promise<M> {
-    // TODO: this is broken and won't load the CoMap even if it already exists on peers!!
-
-    as ||= activeAccountContext.get();
-
-    const header = {
-      type: "comap" as const,
-      ruleset: {
-        type: "ownedByGroup" as const,
-        group: ownerID,
-      },
-      meta: null,
-      uniqueness: unique,
-    };
-
-    const crypto = as._raw.core.crypto;
-    const id = cojsonInternals.idforHeader(header, crypto) as ID<M>;
-
-    const existingEntry = as._raw.core.node.coValuesStore.get(id);
-
-    if (existingEntry) {
-      if (existingEntry.state.type === "available") {
-        return (this as CoValueClass<M> & typeof CoMap).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 as CoValueClass<M> & typeof CoMap).fromRaw(
-      entry.state.coValue.getCurrentContent(),
-    );
-  }
-
   /**
    * Given an already loaded `CoMap`, ensure that the specified fields are loaded to the specified depth.
    *

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/coValues/interfaces.ts

@@ -27,16 +27,6 @@ export interface CoValueClass<Value extends CoValue = CoValue> {
   new (...args: any[]): Value;
 }
 
-export interface CoValueClassWithLoad<V extends CoValue>
-  extends CoValueClass<V> {
-  load<D extends DepthsIn<V>>(id: ID<V>, depth: D): Promise<DeeplyLoaded<V, D>>;
-  load<D extends DepthsIn<V>>(
-    id: ID<V>,
-    as: Account,
-    depth: D,
-  ): Promise<DeeplyLoaded<V, D>>;
-}
-
 export interface CoValueFromRaw<V extends CoValue> {
   fromRaw(raw: V["_raw"]): V;
 }

package/src/exports.ts

@@ -41,12 +41,7 @@ export { CoValueBase } from "./coValues/interfaces.js";
 export { Profile } from "./coValues/profile.js";
 export { SchemaUnion } from "./coValues/schemaUnion.js";
 
-export type {
-  CoValueClass,
-  CoValueClassWithLoad,
-  DeeplyLoaded,
-  DepthsIn,
-} from "./internal.js";
+export type { CoValueClass, DeeplyLoaded, DepthsIn } from "./internal.js";
 
 export {
   createCoValueObservable,

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/coList.test.ts

@@ -115,26 +115,6 @@ describe("Simple CoList operations", async () => {
       expect(list.length).toBe(4);
       expect(list._raw.asArray()).toEqual(["bread", "salt", "pepper", "onion"]);
     });
-
-    test("applyDiff", () => {
-      const list = TestList.create(["bread", "butter", "onion"], {
-        owner: me,
-      });
-      // replace
-      list.applyDiff(["bread", "margarine", "onion"]);
-      expect(list._raw.asArray()).toEqual(["bread", "margarine", "onion"]);
-      // delete
-      list.applyDiff(["bread", "onion"]);
-      expect(list._raw.asArray()).toEqual(["bread", "onion"]);
-      // insert multiple
-      list.applyDiff(["bread", "margarine", "onion", "cheese"]);
-      expect(list._raw.asArray()).toEqual([
-        "bread",
-        "margarine",
-        "onion",
-        "cheese",
-      ]);
-    });
   });
 });
 

package/src/tests/schemaUnion.test.ts

@@ -13,11 +13,29 @@ class BaseWidget extends CoMap {
   type = co.string;
 }
 
-class ButtonWidget extends BaseWidget {
+class RedButtonWidget extends BaseWidget {
   type = co.literal("button");
+  color = co.literal("red");
   label = co.string;
 }
 
+class BlueButtonWidget extends BaseWidget {
+  type = co.literal("button");
+  color = co.literal("blue");
+  label = co.string;
+}
+
+const ButtonWidget = SchemaUnion.Of<BaseWidget>((raw) => {
+  switch (raw.get("color")) {
+    case "red":
+      return RedButtonWidget;
+    case "blue":
+      return BlueButtonWidget;
+    default:
+      throw new Error(`Unknown button color: ${raw.get("color")}`);
+  }
+});
+
 class SliderWidget extends BaseWidget {
   type = co.literal("slider");
   min = co.number;
@@ -57,8 +75,8 @@ describe("SchemaUnion", () => {
   });
 
   it("should instantiate the correct subclass based on schema and provided data", async () => {
-    const buttonWidget = ButtonWidget.create(
-      { type: "button", label: "Submit" },
+    const buttonWidget = RedButtonWidget.create(
+      { type: "button", color: "red", label: "Submit" },
       { owner: me },
     );
     const sliderWidget = SliderWidget.create(
@@ -89,14 +107,14 @@ describe("SchemaUnion", () => {
       {},
     );
 
-    expect(loadedButtonWidget).toBeInstanceOf(ButtonWidget);
+    expect(loadedButtonWidget).toBeInstanceOf(RedButtonWidget);
     expect(loadedSliderWidget).toBeInstanceOf(SliderWidget);
     expect(loadedCheckboxWidget).toBeInstanceOf(CheckboxWidget);
   });
 
   it("should integrate with subscribeToCoValue correctly", async () => {
-    const buttonWidget = ButtonWidget.create(
-      { type: "button", label: "Submit" },
+    const buttonWidget = BlueButtonWidget.create(
+      { type: "button", color: "blue", label: "Submit" },
       { owner: me },
     );
     let currentValue = "Submit";
@@ -106,7 +124,7 @@ describe("SchemaUnion", () => {
       me,
       {},
       (value: BaseWidget) => {
-        if (value instanceof ButtonWidget) {
+        if (value instanceof BlueButtonWidget) {
           expect(value.label).toBe(currentValue);
         } else {
           throw new Error("Unexpected widget type");

package/.turbo/turbo-lint.log

@@ -1,4 +0,0 @@
-
-> jazz-tools@0.7.35-guest-auth.5 lint /Users/anselm/jazz/jazz/packages/jazz-tools
-> eslint . --ext ts,tsx
-

package/.turbo/turbo-test.log

@@ -1,144 +0,0 @@
-
-> jazz-tools@0.7.35-unique.2 test /Users/anselm/jazz/jazz/packages/jazz-tools
-> vitest --run
-
-
- RUN  v0.34.6 /Users/anselm/jazz/jazz/packages/jazz-tools
-
- ✓ src/tests/groupsAndAccounts.test.ts  (1 test) 64ms
-stdout | unknown test
-TestMap schema undefined
-
- ✓ src/tests/deepLoading.test.ts  (3 tests) 83ms
-stdout | src/tests/coList.test.ts > Simple CoList operations > Mutation > splice
-[ 'bread', 'onion' ] 0
-[ 'bread', 'salt', 'onion' ] 1
-
-stdout | src/tests/coList.test.ts > CoList resolution > Subscription & auto-resolution
-subscribedList?.[0]?.[0]?.[0] undefined
-subscribedList?.[0]?.[0]?.[0] undefined
-subscribedList?.[0]?.[0]?.[0] a
-subscribedList?.[0]?.[0]?.[0] x
-subscribedList?.[0]?.[0]?.[0] y
-subscribedList?.[0]?.[0]?.[0] w
-
- ✓ src/tests/coList.test.ts  (10 tests) 190ms
-stdout | src/tests/coStream.test.ts > CoStream resolution > Subscription & auto-resolution
-subscribedStream[me.id] {
-  value: [Getter],
-  ref: [Getter],
-  by: [Getter],
-  madeAt: 2024-09-05T17:35:38.414Z,
-  tx: {
-    sessionID: 'co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_ziAMdGVstAxF',
-    txIndex: 0
-  }
-}
-subscribedStream[me.id]?.value?.[me.id]?.value undefined
-subscribedStream[me.id]?.value?.[me.id]?.value?.[me.id]?.value undefined
-subscribedStream[me.id] {
-  value: [Getter],
-  ref: [Getter],
-  by: [Getter],
-  madeAt: 2024-09-05T17:35:38.414Z,
-  tx: {
-    sessionID: 'co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_ziAMdGVstAxF',
-    txIndex: 0
-  }
-}
-subscribedStream[me.id]?.value?.[me.id]?.value null
-subscribedStream[me.id]?.value?.[me.id]?.value?.[me.id]?.value undefined
-subscribedStream[me.id] {
-  value: [Getter],
-  ref: [Getter],
-  by: [Getter],
-  madeAt: 2024-09-05T17:35:38.414Z,
-  tx: {
-    sessionID: 'co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_ziAMdGVstAxF',
-    txIndex: 0
-  }
-}
-subscribedStream[me.id]?.value?.[me.id]?.value {
-  id: 'co_zHELVqRmAN6YuGDpKqVrSXJ5qe1',
-  _type: 'CoStream',
-  perSession: undefined,
-  co_zURWEpvoH1e35FGHVxadgXKU8Ri: 'milk',
-  in: { co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_ziAMdGVstAxF: 'milk' }
-}
-subscribedStream[me.id]?.value?.[me.id]?.value?.[me.id]?.value milk
-subscribedStream[me.id] {
-  value: [Getter],
-  ref: [Getter],
-  by: [Getter],
-  madeAt: 2024-09-05T17:35:38.414Z,
-  tx: {
-    sessionID: 'co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_ziAMdGVstAxF',
-    txIndex: 0
-  }
-}
-subscribedStream[me.id]?.value?.[me.id]?.value {
-  id: 'co_zHELVqRmAN6YuGDpKqVrSXJ5qe1',
-  _type: 'CoStream',
-  perSession: undefined,
-  co_zURWEpvoH1e35FGHVxadgXKU8Ri: 'bread',
-  in: {
-    co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_ziAMdGVstAxF: 'milk',
-    co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_zgik2JjD86Qa: 'bread'
-  }
-}
-subscribedStream[me.id]?.value?.[me.id]?.value?.[me.id]?.value bread
-subscribedStream[me.id] {
-  value: [Getter],
-  ref: [Getter],
-  by: [Getter],
-  madeAt: 2024-09-05T17:35:38.424Z,
-  tx: {
-    sessionID: 'co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_zgik2JjD86Qa',
-    txIndex: 0
-  }
-}
-subscribedStream[me.id]?.value?.[me.id]?.value {
-  id: 'co_zJmdvJY15XJkWF3n3rwPgGfebxa',
-  _type: 'CoStream',
-  perSession: undefined,
-  co_zURWEpvoH1e35FGHVxadgXKU8Ri: 'butter',
-  in: { co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_zgik2JjD86Qa: 'butter' }
-}
-subscribedStream[me.id]?.value?.[me.id]?.value?.[me.id]?.value butter
-subscribedStream[me.id] {
-  value: [Getter],
-  ref: [Getter],
-  by: [Getter],
-  madeAt: 2024-09-05T17:35:38.424Z,
-  tx: {
-    sessionID: 'co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_zgik2JjD86Qa',
-    txIndex: 0
-  }
-}
-subscribedStream[me.id]?.value?.[me.id]?.value {
-  id: 'co_zJmdvJY15XJkWF3n3rwPgGfebxa',
-  _type: 'CoStream',
-  perSession: undefined,
-  co_zURWEpvoH1e35FGHVxadgXKU8Ri: 'jam',
-  in: { co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_zgik2JjD86Qa: 'jam' }
-}
-subscribedStream[me.id]?.value?.[me.id]?.value?.[me.id]?.value jam
-
- ✓ src/tests/coStream.test.ts  (10 tests) 205ms
-stdout | src/tests/coMap.test.ts > CoMap resolution > Subscription & auto-resolution
-subscribedMap.nested?.twiceNested?.taste undefined
-subscribedMap.nested?.twiceNested?.taste undefined
-subscribedMap.nested?.twiceNested?.taste sour
-subscribedMap.nested?.twiceNested?.taste sour
-subscribedMap.nested?.twiceNested?.taste sweet
-subscribedMap.nested?.twiceNested?.taste sweet
-subscribedMap.nested?.twiceNested?.taste salty
-subscribedMap.nested?.twiceNested?.taste umami
-
- ✓ src/tests/coMap.test.ts  (20 tests) 257ms
-
- Test Files  5 passed (5)
-      Tests  44 passed (44)
-   Start at  18:35:37
-   Duration  929ms (transform 419ms, setup 0ms, collect 2.29s, tests 799ms, environment 0ms, prepare 298ms)
-