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

package/.turbo/turbo-build.log

@@ -1,20 +1,20 @@
 
-> jazz-tools@0.9.8 build /home/runner/work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.9.9 build /vercel/path0/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: /home/runner/work/jazz/jazz/packages/jazz-tools/tsup.config.ts
+CLI Using tsup config: /vercel/path0/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-YD32FKHW.js     93.48 KB
+ESM dist/chunk-VQZOWIPU.js     96.39 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-YD32FKHW.js.map 231.35 KB
-ESM ⚡️ Build success in 115ms
+ESM dist/chunk-VQZOWIPU.js.map 238.27 KB
+ESM ⚡️ Build success in 90ms

package/.turbo/turbo-lint.log

@@ -0,0 +1,4 @@
+
+> 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

@@ -0,0 +1,144 @@
+
+> 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)
+

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # jazz-tools
 
+## 0.9.10-jazz-bridge-preview.0
+
+### Patch Changes
+
+- 5f43fbf: Implement applyDiff for CoLists
+
+## 0.9.9
+
+### Patch Changes
+
+- 8eb9247: Add CoRichText support
+- Updated dependencies [8eb9247]
+  - cojson@0.9.9
+
 ## 0.9.8
 
 ### Patch Changes

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

@@ -36,13 +36,61 @@ var AnonymousJazzAgent = class {
 // src/coValues/interfaces.ts
 import { RawAccount as RawAccount2 } from "cojson";
 
+// src/implementation/inspect.ts
+var inspect = Symbol.for("nodejs.util.inspect.custom");
+
 // src/implementation/symbols.ts
 var SchemaInit = Symbol.for("SchemaInit");
 var ItemsSym = Symbol.for("items");
 var MembersSym = Symbol.for("members");
 
-// src/implementation/inspect.ts
-var inspect = Symbol.for("nodejs.util.inspect.custom");
+// src/coValues/deepLoading.ts
+function fulfillsDepth(depth, value) {
+  if (value._type === "CoMap" || value._type === "Group" || value._type === "Account") {
+    if (Array.isArray(depth) && depth.length === 1) {
+      return Object.entries(value).every(([key, item]) => {
+        return value._refs[key] ? item && fulfillsDepth(depth[0], item) : value._schema[ItemsSym].optional;
+      });
+    } else {
+      for (const key of Object.keys(depth)) {
+        const map = value;
+        if (!map._refs[key] && map._schema[key].optional) {
+          continue;
+        }
+        if (!map[key]) {
+          return false;
+        }
+        if (!fulfillsDepth(depth[key], map[key])) {
+          return false;
+        }
+      }
+      return true;
+    }
+  } else if (value._type === "CoList") {
+    if (depth.length === 0) {
+      return true;
+    } else {
+      const itemDepth = depth[0];
+      return value.every(
+        (item, i) => value._refs[i] ? item && fulfillsDepth(itemDepth, item) : value._schema[ItemsSym].optional
+      );
+    }
+  } else if (value._type === "CoStream") {
+    if (depth.length === 0) {
+      return true;
+    } else {
+      const itemDepth = depth[0];
+      return Object.values(value.perSession).every(
+        (entry) => entry.ref ? entry.value && fulfillsDepth(itemDepth, entry.value) : value._schema[ItemsSym].optional
+      );
+    }
+  } else if (value._type === "BinaryCoStream" || value._type === "CoPlainText") {
+    return true;
+  } else {
+    console.error(value);
+    throw new Error("Unexpected value type: " + value._type);
+  }
+}
 
 // src/lib/cache.ts
 var weakMap = /* @__PURE__ */ new WeakMap();
@@ -356,54 +404,6 @@ var SubscriptionScope = class {
   }
 };
 
-// src/coValues/deepLoading.ts
-function fulfillsDepth(depth, value) {
-  if (value._type === "CoMap" || value._type === "Group" || value._type === "Account") {
-    if (Array.isArray(depth) && depth.length === 1) {
-      return Object.entries(value).every(([key, item]) => {
-        return value._refs[key] ? item && fulfillsDepth(depth[0], item) : value._schema[ItemsSym].optional;
-      });
-    } else {
-      for (const key of Object.keys(depth)) {
-        const map = value;
-        if (!map._refs[key] && map._schema[key].optional) {
-          continue;
-        }
-        if (!map[key]) {
-          return false;
-        }
-        if (!fulfillsDepth(depth[key], map[key])) {
-          return false;
-        }
-      }
-      return true;
-    }
-  } else if (value._type === "CoList") {
-    if (depth.length === 0) {
-      return true;
-    } else {
-      const itemDepth = depth[0];
-      return value.every(
-        (item, i) => value._refs[i] ? item && fulfillsDepth(itemDepth, item) : value._schema[ItemsSym].optional
-      );
-    }
-  } else if (value._type === "CoStream") {
-    if (depth.length === 0) {
-      return true;
-    } else {
-      const itemDepth = depth[0];
-      return Object.values(value.perSession).every(
-        (entry) => entry.ref ? entry.value && fulfillsDepth(itemDepth, entry.value) : value._schema[ItemsSym].optional
-      );
-    }
-  } else if (value._type === "BinaryCoStream" || value._type === "CoPlainText") {
-    return true;
-  } else {
-    console.error(value);
-    throw new Error("Unexpected value type: " + value._type);
-  }
-}
-
 // src/implementation/createContext.ts
 import {
   ControlledAgent,
@@ -1121,6 +1121,7 @@ function getAccountIDfromSessionID(sessionID) {
 
 // src/coValues/coMap.ts
 import {
+  CoValueCore,
   cojsonInternals
 } from "cojson";
 var _CoMap = class _CoMap extends CoValueBase {
@@ -1375,6 +1376,43 @@ 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.
    *
@@ -2314,6 +2352,7 @@ 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`.
@@ -2478,12 +2517,20 @@ 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];
@@ -2798,6 +2845,9 @@ var CoPlainText = class extends String {
   static create(text, options) {
     return new this({ text, owner: options.owner });
   }
+  get length() {
+    return this._raw.toString().length;
+  }
   toString() {
     return this._raw.toString();
   }
@@ -2834,22 +2884,6 @@ var CoPlainText = class extends String {
   /**
    * 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(id, as) {
@@ -2881,9 +2915,9 @@ var CoPlainText = class extends String {
   //     return subscribeToCoValueEf(this, id, []);
   //   }
   /**
-   * Given an already loaded `CoMap`, subscribe to updates to the `CoMap` and ensure that the specified fields are loaded to the specified depth.
+   * Given an already loaded `CoPlainText`, subscribe to updates to the `CoPlainText` and ensure that the specified fields are loaded to the specified depth.
    *
-   * Works like `CoMap.subscribe()`, but you don't need to pass the ID or the account to load as again.
+   * Works like `CoPlainText.subscribe()`, but you don't need to pass the ID or the account to load as again.
    *
    * Returns an unsubscribe function that you should call when you no longer need updates.
    *
@@ -2904,6 +2938,28 @@ var Mark = class extends CoMap {
     this.endBefore = co.json();
     this.tag = co.string;
   }
+  /**
+   * Validates and clamps mark positions to ensure they are in the correct order
+   * @returns Normalized positions or null if invalid
+   */
+  validatePositions(textLength, idxAfter, idxBefore) {
+    if (!textLength) {
+      console.error("Cannot validate positions for empty text");
+      return null;
+    }
+    const positions = {
+      startAfter: this.startAfter ? idxBefore(this.startAfter) ?? 0 : 0,
+      startBefore: this.startBefore ? idxAfter(this.startBefore) ?? 0 : 0,
+      endAfter: this.endAfter ? idxBefore(this.endAfter) ?? textLength : textLength,
+      endBefore: this.endBefore ? idxAfter(this.endBefore) ?? textLength : textLength
+    };
+    return {
+      startAfter: Math.max(0, positions.startAfter),
+      startBefore: Math.max(positions.startAfter + 1, positions.startBefore),
+      endAfter: Math.min(textLength - 1, positions.endAfter),
+      endBefore: Math.min(textLength, positions.endBefore)
+    };
+  }
 };
 var CoRichText = class extends CoMap {
   constructor() {
@@ -2993,9 +3049,16 @@ var CoRichText = class extends CoMap {
    * Insert a mark at a specific range.
    */
   insertMark(start, end, RangeClass, extraArgs, options) {
-    if (!this.marks) {
+    if (!this.text || !this.marks) {
       throw new Error("Cannot insert a range without loaded ranges");
     }
+    const textLength = this.length;
+    start = Math.max(start, 0);
+    end = Math.min(end, textLength);
+    const owner = options?.markOwner || this._owner;
+    if (!owner) {
+      throw new Error("No owner specified for mark");
+    }
     const range = RangeClass.create(
       {
         ...extraArgs,
@@ -3004,10 +3067,71 @@ var CoRichText = class extends CoMap {
         endAfter: this.posBefore(end),
         endBefore: this.posAfter(end)
       },
-      { owner: options?.markOwner || this._owner }
+      { owner }
     );
     this.marks.push(range);
   }
+  /**
+   * Remove a mark at a specific range.
+   */
+  removeMark(start, end, RangeClass, options) {
+    if (!this.marks) {
+      throw new Error("Cannot remove marks without loaded marks");
+    }
+    const resolvedMarks = this.resolveMarks();
+    for (const mark of resolvedMarks) {
+      if (mark.endBefore < start || mark.startAfter > end) {
+        continue;
+      }
+      if (options.tag && mark.sourceMark.tag !== options.tag) {
+        continue;
+      }
+      const markIndex = this.marks.findIndex((m) => m === mark.sourceMark);
+      if (markIndex === -1) {
+        continue;
+      }
+      if (mark.startBefore >= start && mark.endAfter <= end) {
+        this.marks.splice(markIndex, 1);
+        continue;
+      }
+      if (mark.startBefore < start && mark.endAfter >= start && mark.endAfter <= end) {
+        const endAfterPos = this.posBefore(start);
+        const endBeforePos = this.posBefore(start);
+        if (endAfterPos && endBeforePos) {
+          mark.sourceMark.endAfter = endAfterPos;
+          mark.sourceMark.endBefore = endBeforePos;
+        }
+        continue;
+      }
+      if (mark.startBefore >= start && mark.startBefore <= end && mark.endAfter > end) {
+        const startAfterPos = this.posAfter(end);
+        const startBeforePos = this.posAfter(end);
+        if (startAfterPos && startBeforePos) {
+          mark.sourceMark.startAfter = startAfterPos;
+          mark.sourceMark.startBefore = startBeforePos;
+        }
+        continue;
+      }
+      if (mark.startBefore <= start && mark.endAfter >= end) {
+        const endAfterPos = this.posBefore(start);
+        const endBeforePos = this.posBefore(start);
+        if (endAfterPos && endBeforePos) {
+          mark.sourceMark.endAfter = endAfterPos;
+          mark.sourceMark.endBefore = endBeforePos;
+        }
+        this.insertMark(
+          end + 1,
+          mark.endBefore,
+          RangeClass,
+          {},
+          {
+            markOwner: mark.sourceMark._owner || this._owner
+          }
+        );
+        continue;
+      }
+    }
+  }
   /**
    * Resolve the positions of all marks.
    */
@@ -3015,31 +3139,23 @@ var CoRichText = class extends CoMap {
     if (!this.text || !this.marks) {
       throw new Error("Cannot resolve ranges without loaded text and ranges");
     }
-    const ranges = this.marks.flatMap((mark) => {
+    const textLength = this.length;
+    return this.marks.flatMap((mark) => {
       if (!mark) return [];
-      const startBefore = this.idxAfter(mark.startBefore);
-      const endAfter = this.idxAfter(mark.endAfter);
-      if (startBefore === void 0 || endAfter === void 0) {
-        return [];
-      }
-      const startAfter = mark.startAfter ? this.idxAfter(mark.startAfter) : startBefore - 1;
-      const endBefore = mark.endBefore ? this.idxAfter(mark.endBefore) : endAfter + 1;
-      if (startAfter === void 0 || endBefore === void 0) {
-        return [];
-      }
+      const positions = mark.validatePositions(
+        textLength,
+        (pos) => this.idxAfter(pos),
+        (pos) => this.idxBefore(pos)
+      );
+      if (!positions) return [];
       return [
         {
           sourceMark: mark,
-          startAfter,
-          startBefore,
-          endAfter,
-          endBefore,
-          tag: mark.tag,
-          from: mark
+          ...positions,
+          tag: mark.tag
         }
       ];
     });
-    return ranges;
   }
   /**
    * Resolve and diffuse the positions of all marks.
@@ -3124,6 +3240,9 @@ var CoRichText = class extends CoMap {
       children: currentNodes
     };
   }
+  get length() {
+    return this.text?.toString().length || 0;
+  }
   /**
    * Convert a CoRichText to plain text.
    */
@@ -3329,4 +3448,4 @@ export {
   SchemaUnion
 };
 /* istanbul ignore file -- @preserve */
-//# sourceMappingURL=chunk-YD32FKHW.js.map
+//# sourceMappingURL=chunk-YWGGIF2U.js.map