jazz-tools 0.13.10 → 0.13.12

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> jazz-tools@0.13.10 build /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.13.12 build /home/runner/_work/jazz/jazz/packages/jazz-tools
 > tsup && pnpm types
 
 CLI Building entry: {"index":"src/index.ts","testing":"src/testing.ts"}
@@ -9,14 +9,14 @@
 CLI Target: es2021
 CLI Cleaning output folder
 ESM Build start
-ESM dist/index.js              1.50 KB
+ESM dist/index.js              1.48 KB
 ESM dist/testing.js            6.26 KB
-ESM dist/chunk-NFVKGXSH.js     128.03 KB
-ESM dist/index.js.map          259.00 B
+ESM dist/chunk-GIZWJXSR.js     118.19 KB
+ESM dist/index.js.map          258.00 B
 ESM dist/testing.js.map        12.37 KB
-ESM dist/chunk-NFVKGXSH.js.map 301.60 KB
-ESM ⚡️ Build success in 48ms
+ESM dist/chunk-GIZWJXSR.js.map 277.09 KB
+ESM ⚡️ Build success in 64ms
 
-> jazz-tools@0.13.10 types /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.13.12 types /home/runner/_work/jazz/jazz/packages/jazz-tools
 > tsc --outDir dist
 

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # jazz-tools
 
+## 0.13.12
+
+### Patch Changes
+
+- 4547525: Skip non-schema related keys when calling CoMap.toJSON
+- Updated dependencies [65719f2]
+  - cojson@0.13.12
+
+## 0.13.11
+
+### Patch Changes
+
+- 17273a6: CoRichText released
+- Updated dependencies [17273a6]
+- Updated dependencies [3396ed4]
+- Updated dependencies [267ea4c]
+  - cojson@0.13.11
+
 ## 0.13.10
 
 ### Patch Changes

package/dist/{chunk-NFVKGXSH.js → chunk-GIZWJXSR.js}

@@ -323,7 +323,7 @@ var Ref = class _Ref {
     const entry = node.coValuesStore.get(
       this.id
     );
-    if (entry.state.type === "available") {
+    if (entry.highLevelState === "available") {
       return new _Ref(this.id, this.controlledAccount, this.schema).value;
     }
     return void 0;
@@ -592,8 +592,8 @@ var SubscriptionScope = class {
 };
 function loadCoValue(node, id, callback, syncResolution) {
   const entry = node.coValuesStore.get(id);
-  if (entry.state.type === "available" && syncResolution) {
-    callback(entry.state.coValue);
+  if (entry.isAvailable() && syncResolution) {
+    callback(entry.core);
   } else {
     void node.loadCoValueCore(id).then((core) => {
       callback(core);
@@ -1525,30 +1525,38 @@ var _CoMap = class _CoMap extends CoValueBase {
    * @category Content
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  toJSON(_key, seenAbove) {
-    const jsonedFields = this._raw.keys().map((key) => {
+  toJSON(_key, processedValues) {
+    const result = {
+      id: this.id,
+      _type: this._type
+    };
+    for (const key of this._raw.keys()) {
       const tKey = key;
       const descriptor = this._schema[tKey] || this._schema[ItemsSym];
+      if (!descriptor) {
+        continue;
+      }
       if (descriptor == "json" || "encoded" in descriptor) {
-        return [key, this._raw.get(key)];
+        result[key] = this._raw.get(key);
       } else if (isRefEncoded(descriptor)) {
-        if (seenAbove?.includes(this[tKey]?.id)) {
-          return [key, { _circular: this[tKey]?.id }];
+        const id = this._raw.get(key);
+        if (processedValues?.includes(id) || id === this.id) {
+          result[key] = { _circular: id };
+          continue;
+        }
+        const ref2 = this[tKey];
+        if (ref2 && typeof ref2 === "object" && "toJSON" in ref2 && typeof ref2.toJSON === "function") {
+          const jsonedRef = ref2.toJSON(tKey, [
+            ...processedValues || [],
+            this.id
+          ]);
+          result[key] = jsonedRef;
         }
-        const jsonedRef = this[tKey]?.toJSON(tKey, [
-          ...seenAbove || [],
-          this.id
-        ]);
-        return [key, jsonedRef];
       } else {
-        return [key, void 0];
+        result[key] = void 0;
       }
-    });
-    return {
-      id: this.id,
-      _type: this._type,
-      ...Object.fromEntries(jsonedFields)
-    };
+    }
+    return result;
   }
   [inspect]() {
     return this.toJSON();
@@ -3215,6 +3223,7 @@ import {
   RawAccount as RawAccount7,
   stringifyOpID
 } from "cojson";
+import { calcPatch as calcPatch2 } from "fast-myers-diff";
 var CoPlainText = class extends String {
   get _owner() {
     return this._raw.group instanceof RawAccount7 ? Account.fromRaw(this._raw.group) : Group.fromRaw(this._raw.group);
@@ -3223,7 +3232,7 @@ var CoPlainText = class extends String {
     return Account.fromNode(this._raw.core.node);
   }
   constructor(options) {
-    super();
+    super("fromRaw" in options ? options.fromRaw.toString() : options.text);
     let raw;
     if ("fromRaw" in options) {
       raw = options.fromRaw;
@@ -3254,6 +3263,9 @@ var CoPlainText = class extends String {
   [inspect]() {
     return this.toJSON();
   }
+  insertBefore(idx, text) {
+    this._raw.insertBefore(idx, text);
+  }
   insertAfter(idx, text) {
     this._raw.insertAfter(idx, text);
   }
@@ -3275,6 +3287,22 @@ var CoPlainText = class extends String {
   static fromRaw(raw) {
     return new this({ fromRaw: raw });
   }
+  /**
+   * Apply text, modifying the text in place. Calculates the diff and applies it to the CoValue.
+   *
+   * @category Mutation
+   */
+  applyDiff(other) {
+    const current = this._raw.toString();
+    for (const [from, to, insert] of [...calcPatch2(current, other)].reverse()) {
+      if (to > from) {
+        this.deleteRange({ from, to });
+      }
+      if (insert.length > 0) {
+        this.insertBefore(from, insert);
+      }
+    }
+  }
   /**
    * Load a `CoPlainText` with a given ID, as a given account.
    *
@@ -3302,401 +3330,7 @@ var CoPlainText = class extends String {
 };
 
 // src/coValues/coRichText.ts
-var Mark = class extends CoMap {
-  constructor() {
-    super(...arguments);
-    this.startAfter = co.json();
-    this.startBefore = co.json();
-    this.endAfter = co.json();
-    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() {
-    super(...arguments);
-    this.text = co.ref(CoPlainText);
-    this.marks = co.ref(CoList.Of(co.ref(Mark)));
-  }
-  /**
-   * Create a CoRichText from plain text.
-   */
-  static createFromPlainText(text, options) {
-    return this.create(
-      {
-        text: CoPlainText.create(text, { owner: options.owner }),
-        marks: CoList.Of(co.ref(Mark)).create([], {
-          owner: options.owner
-        })
-      },
-      { owner: options.owner }
-    );
-  }
-  /**
-   * Create a CoRichText from plain text and a mark.
-   */
-  static createFromPlainTextAndMark(text, WrapIn, extraArgs, options) {
-    const richtext = this.createFromPlainText(text, options);
-    richtext.insertMark(0, text.length, WrapIn, extraArgs);
-    return richtext;
-  }
-  /**
-   * Insert text at a specific index.
-   */
-  insertAfter(idx, text) {
-    if (!this.text)
-      throw new Error("Cannot insert into a CoRichText without loaded text");
-    this.text.insertAfter(idx, text);
-  }
-  /**
-   * Delete a range of text.
-   */
-  deleteRange(range) {
-    if (!this.text)
-      throw new Error("Cannot delete from a CoRichText without loaded text");
-    this.text.deleteRange(range);
-  }
-  /**
-   * Get the position of a specific index.
-   */
-  posBefore(idx) {
-    if (!this.text)
-      throw new Error(
-        "Cannot get posBefore in a CoRichText without loaded text"
-      );
-    return this.text.posBefore(idx);
-  }
-  /**
-   * Get the position of a specific index.
-   */
-  posAfter(idx) {
-    if (!this.text)
-      throw new Error(
-        "Cannot get posAfter in a CoRichText without loaded text"
-      );
-    return this.text.posAfter(idx);
-  }
-  /**
-   * Get the index of a specific position.
-   */
-  idxBefore(pos) {
-    if (!this.text)
-      throw new Error(
-        "Cannot get idxBefore in a CoRichText without loaded text"
-      );
-    return this.text.idxBefore(pos);
-  }
-  /**
-   * Get the index of a specific position.
-   */
-  idxAfter(pos) {
-    if (!this.text)
-      throw new Error(
-        "Cannot get idxAfter in a CoRichText without loaded text"
-      );
-    return this.text.idxAfter(pos);
-  }
-  /**
-   * Insert a mark at a specific range.
-   */
-  insertMark(start, end, RangeClass, extraArgs, options) {
-    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,
-        startAfter: this.posBefore(start),
-        startBefore: this.posAfter(start),
-        endAfter: this.posBefore(end),
-        endBefore: this.posAfter(end)
-      },
-      { 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,
-          // @ts-ignore Some Typescript versions flag this as an error
-          {},
-          {
-            markOwner: mark.sourceMark._owner || this._owner
-          }
-        );
-        continue;
-      }
-    }
-  }
-  /**
-   * Resolve the positions of all marks.
-   */
-  resolveMarks() {
-    if (!this.text || !this.marks) {
-      throw new Error("Cannot resolve ranges without loaded text and ranges");
-    }
-    const textLength = this.length;
-    return this.marks.flatMap((mark) => {
-      if (!mark) return [];
-      const positions = mark.validatePositions(
-        textLength,
-        (pos) => this.idxAfter(pos),
-        (pos) => this.idxBefore(pos)
-      );
-      if (!positions) return [];
-      return [
-        {
-          sourceMark: mark,
-          ...positions,
-          tag: mark.tag
-        }
-      ];
-    });
-  }
-  /**
-   * Resolve and diffuse the positions of all marks.
-   */
-  resolveAndDiffuseMarks() {
-    return this.resolveMarks().flatMap((range) => [
-      ...range.startAfter < range.startBefore - 1 ? [
-        {
-          start: range.startAfter,
-          end: range.startBefore - 1,
-          side: "uncertainStart",
-          sourceMark: range.sourceMark
-        }
-      ] : [],
-      {
-        start: range.startBefore - 1,
-        end: range.endAfter + 1,
-        side: "certainMiddle",
-        sourceMark: range.sourceMark
-      },
-      ...range.endAfter + 1 < range.endBefore ? [
-        {
-          start: range.endAfter + 1,
-          end: range.endBefore,
-          side: "uncertainEnd",
-          sourceMark: range.sourceMark
-        }
-      ] : []
-    ]);
-  }
-  /**
-   * Resolve, diffuse, and focus the positions of all marks.
-   */
-  resolveAndDiffuseAndFocusMarks() {
-    return this.resolveAndDiffuseMarks().filter(
-      (range) => range.side === "certainMiddle"
-    );
-  }
-  /**
-   * Convert a CoRichText to a tree structure useful for client libraries.
-   */
-  toTree(tagPrecedence) {
-    const ranges = this.resolveAndDiffuseAndFocusMarks();
-    const text = this.text?.toString() || "";
-    let currentNodes = [
-      {
-        type: "leaf",
-        start: 0,
-        end: text.length
-      }
-    ];
-    const rangesSortedLowToHighPrecedence = ranges.sort((a, b) => {
-      const aPrecedence = tagPrecedence.indexOf(a.sourceMark.tag);
-      const bPrecedence = tagPrecedence.indexOf(b.sourceMark.tag);
-      return bPrecedence - aPrecedence;
-    });
-    for (const range of rangesSortedLowToHighPrecedence) {
-      const newNodes = currentNodes.flatMap((node) => {
-        const [before, inOrAfter] = splitNode(node, range.start);
-        const [inside, after] = inOrAfter ? splitNode(inOrAfter, range.end) : [void 0, void 0];
-        return [
-          ...before ? [before] : [],
-          ...inside ? [
-            {
-              type: "node",
-              tag: range.sourceMark.tag,
-              start: inside.start,
-              end: inside.end,
-              children: [inside]
-            }
-          ] : [],
-          ...after ? [after] : []
-        ];
-      });
-      currentNodes = newNodes;
-    }
-    return {
-      type: "node",
-      tag: "root",
-      start: 0,
-      end: text.length,
-      children: currentNodes
-    };
-  }
-  get length() {
-    return this.text?.toString().length || 0;
-  }
-  /**
-   * Convert a CoRichText to plain text.
-   */
-  toString() {
-    if (!this.text) return "";
-    return this.text.toString();
-  }
-};
-function splitNode(node, at) {
-  if (node.type === "leaf") {
-    return [
-      at > node.start ? {
-        type: "leaf",
-        start: node.start,
-        end: Math.min(at, node.end)
-      } : void 0,
-      at < node.end ? {
-        type: "leaf",
-        start: Math.max(at, node.start),
-        end: node.end
-      } : void 0
-    ];
-  } else {
-    const children = node.children;
-    return [
-      at > node.start ? {
-        type: "node",
-        tag: node.tag,
-        start: node.start,
-        end: Math.min(at, node.end),
-        children: children.map((child) => splitNode(child, at)[0]).filter((c) => !!c)
-      } : void 0,
-      at < node.end ? {
-        type: "node",
-        tag: node.tag,
-        start: Math.max(at, node.start),
-        end: node.end,
-        children: children.map((child) => splitNode(child, at)[1]).filter((c) => !!c)
-      } : void 0
-    ];
-  }
-}
-var Heading = class extends Mark {
-  constructor() {
-    super(...arguments);
-    this.tag = co.literal("heading");
-    this.level = co.number;
-  }
-};
-var Paragraph = class extends Mark {
-  constructor() {
-    super(...arguments);
-    this.tag = co.literal("paragraph");
-  }
-};
-var Link = class extends Mark {
-  constructor() {
-    super(...arguments);
-    this.tag = co.literal("link");
-    this.url = co.string;
-  }
-};
-var Strong = class extends Mark {
-  constructor() {
-    super(...arguments);
-    this.tag = co.literal("strong");
-  }
-};
-var Em = class extends Mark {
-  constructor() {
-    super(...arguments);
-    this.tag = co.literal("em");
-  }
-};
-var Marks = {
-  Heading,
-  Paragraph,
-  Link,
-  Strong,
-  Em
+var CoRichText = class extends CoPlainText {
 };
 
 // src/coValues/extensions/imageDef.ts
@@ -4442,7 +4076,6 @@ export {
   Group,
   CoPlainText,
   CoRichText,
-  Marks,
   ImageDefinition,
   SchemaUnion,
   KvStoreContext,
@@ -4456,4 +4089,4 @@ export {
   consumeInviteLink
 };
 /* istanbul ignore file -- @preserve */
-//# sourceMappingURL=chunk-NFVKGXSH.js.map
+//# sourceMappingURL=chunk-GIZWJXSR.js.map