jazz-tools 0.15.0 → 0.15.2

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> jazz-tools@0.15.0 build /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.15.2 build /home/runner/_work/jazz/jazz/packages/jazz-tools
 > tsup && pnpm types && pnpm build:svelte
 
 CLI Building entry: {"index":"src/index.ts","testing":"src/testing.ts"}
@@ -107,85 +107,85 @@
 ESM Build start
 CLI Cleaning output folder
 ESM Build start
-ESM dist/browser-media-images/index.js     3.01 KB
-ESM dist/browser-media-images/index.js.map 5.68 KB
-ESM ⚡️ Build success in 24ms
 ESM dist/worker/index.js     2.34 KB
 ESM dist/worker/index.js.map 4.82 KB
-ESM ⚡️ Build success in 17ms
-ESM dist/react-native-media-images/index.js     6.19 KB
-ESM dist/react-native-media-images/index.js.map 10.96 KB
-ESM ⚡️ Build success in 19ms
+ESM ⚡️ Build success in 13ms
 ESM dist/tiptap/index.js     564.00 B
 ESM dist/tiptap/index.js.map 1.21 KB
-ESM ⚡️ Build success in 21ms
-ESM dist/react-native/index.js       2.53 KB
-ESM dist/react-native/testing.js     120.00 B
-ESM dist/react-native/crypto.js      117.00 B
-ESM dist/react-native/index.js.map   5.68 KB
-ESM dist/react-native/testing.js.map 176.00 B
-ESM dist/react-native/crypto.js.map  174.00 B
-ESM ⚡️ Build success in 26ms
+ESM ⚡️ Build success in 14ms
+ESM dist/browser-media-images/index.js     3.01 KB
+ESM dist/browser-media-images/index.js.map 5.68 KB
+ESM ⚡️ Build success in 19ms
+ESM dist/react-native-media-images/index.js     6.19 KB
+ESM dist/react-native-media-images/index.js.map 10.96 KB
+ESM ⚡️ Build success in 16ms
 ESM dist/react-core/index.js              8.37 KB
-ESM dist/react-core/testing.js            1.17 KB
 ESM dist/react-core/chunk-7DYMJ74I.js     279.00 B
-ESM dist/react-core/testing.js.map        1.82 KB
+ESM dist/react-core/testing.js            1.17 KB
 ESM dist/react-core/index.js.map          16.39 KB
 ESM dist/react-core/chunk-7DYMJ74I.js.map 533.00 B
-ESM ⚡️ Build success in 30ms
+ESM dist/react-core/testing.js.map        1.82 KB
+ESM ⚡️ Build success in 19ms
 ESM dist/expo/index.js       4.65 KB
 ESM dist/expo/testing.js     112.00 B
 ESM dist/expo/crypto.js      109.00 B
 ESM dist/expo/index.js.map   10.17 KB
-ESM dist/expo/testing.js.map 168.00 B
 ESM dist/expo/crypto.js.map  166.00 B
-ESM ⚡️ Build success in 47ms
+ESM dist/expo/testing.js.map 168.00 B
+ESM ⚡️ Build success in 24ms
+ESM dist/react-native/index.js       2.53 KB
+ESM dist/react-native/crypto.js      117.00 B
+ESM dist/react-native/testing.js     120.00 B
+ESM dist/react-native/index.js.map   5.68 KB
+ESM dist/react-native/crypto.js.map  174.00 B
+ESM dist/react-native/testing.js.map 176.00 B
+ESM ⚡️ Build success in 22ms
 ESM dist/browser/index.js     13.36 KB
 ESM dist/browser/index.js.map 28.57 KB
-ESM ⚡️ Build success in 51ms
+ESM ⚡️ Build success in 26ms
+ESM dist/react-native-core/index.js       17.42 KB
+ESM dist/react-native-core/crypto.js      2.10 KB
+ESM dist/react-native-core/testing.js     119.00 B
+ESM dist/react-native-core/index.js.map   34.49 KB
+ESM dist/react-native-core/crypto.js.map  4.25 KB
+ESM dist/react-native-core/testing.js.map 175.00 B
+ESM ⚡️ Build success in 34ms
 ESM dist/react/index.js       20.64 KB
-ESM dist/react/testing.js     107.00 B
 ESM dist/react/ssr.js         688.00 B
+ESM dist/react/testing.js     107.00 B
 ESM dist/react/index.js.map   34.07 KB
-ESM dist/react/testing.js.map 163.00 B
 ESM dist/react/ssr.js.map     1.12 KB
-ESM ⚡️ Build success in 48ms
-ESM dist/react-native-core/index.js       18.00 KB
-ESM dist/react-native-core/testing.js     119.00 B
-ESM dist/react-native-core/crypto.js      2.10 KB
-ESM dist/react-native-core/index.js.map   35.54 KB
-ESM dist/react-native-core/testing.js.map 175.00 B
-ESM dist/react-native-core/crypto.js.map  4.25 KB
-ESM ⚡️ Build success in 47ms
-ESM dist/react/testing.js     122.00 B
+ESM dist/react/testing.js.map 163.00 B
+ESM ⚡️ Build success in 35ms
+ESM dist/prosemirror/index.js     76.90 KB
+ESM dist/prosemirror/index.js.map 305.53 KB
+ESM ⚡️ Build success in 37ms
 ESM dist/react/index.js       20.66 KB
+ESM dist/react/testing.js     122.00 B
 ESM dist/react/testing.js.map 165.00 B
 ESM dist/react/index.js.map   34.07 KB
-ESM ⚡️ Build success in 49ms
-ESM dist/prosemirror/index.js     76.90 KB
-ESM dist/prosemirror/index.js.map 305.53 KB
-ESM ⚡️ Build success in 63ms
-ESM dist/inspector/index.js     58.92 KB
-ESM dist/inspector/index.js.map 105.21 KB
-ESM ⚡️ Build success in 75ms
-ESM dist/testing.js            6.32 KB
+ESM ⚡️ Build success in 36ms
+ESM dist/inspector/index.js     60.37 KB
+ESM dist/inspector/index.js.map 107.85 KB
+ESM ⚡️ Build success in 46ms
 ESM dist/index.js              16.19 KB
-ESM dist/chunk-FSIM7N33.js     137.52 KB
+ESM dist/testing.js            6.32 KB
+ESM dist/chunk-VBDJM6Z5.js     140.80 KB
 ESM dist/testing.js.map        12.22 KB
 ESM dist/index.js.map          29.03 KB
-ESM dist/chunk-FSIM7N33.js.map 314.21 KB
-ESM ⚡️ Build success in 96ms
+ESM dist/chunk-VBDJM6Z5.js.map 320.73 KB
+ESM ⚡️ Build success in 59ms
 ESM dist/inspector/register-custom-element.js     218.00 B
 ESM dist/inspector/register-custom-element.js.map 314.00 B
 ESM dist/inspector/custom-element-CWW72LEG.js     1.47 MB
 ESM dist/inspector/custom-element-CWW72LEG.js.map 2.26 MB
-ESM ⚡️ Build success in 132ms
+ESM ⚡️ Build success in 89ms
 
-> jazz-tools@0.15.0 types /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.15.2 types /home/runner/_work/jazz/jazz/packages/jazz-tools
 > tsc --outDir dist
 
 
-> jazz-tools@0.15.0 build:svelte /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.15.2 build:svelte /home/runner/_work/jazz/jazz/packages/jazz-tools
 > rm -rf dist/svelte && svelte-package -i src/svelte -o dist/svelte --tsconfig tsconfig.svelte.json
 
 src/svelte -> dist/svelte

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # jazz-tools
 
+## 0.15.2
+
+### Patch Changes
+
+- 0e7e532: inspector: improve CoPlainText view
+- Updated dependencies [4b964ed]
+  - cojson@0.15.2
+  - cojson-storage@0.15.2
+  - cojson-storage-indexeddb@0.15.2
+  - cojson-transport-ws@0.15.2
+
+## 0.15.1
+
+### Patch Changes
+
+- 0e3a4d2: Add FileStream.loadAsBase64 API
+- b110f00: Added `CoMap.upsertUnique` & `CoMap.loadUnique` methods (deprecating `CoMap.findUnique`) and added `skipRetry` option to `CoMap.load`
+- Updated dependencies [b110f00]
+  - cojson@0.15.1
+  - cojson-storage@0.15.1
+  - cojson-storage-indexeddb@0.15.1
+  - cojson-transport-ws@0.15.1
+
 ## 0.15.0
 
 ### Minor Changes

package/dist/{chunk-FSIM7N33.js → chunk-VBDJM6Z5.js}

@@ -287,16 +287,7 @@ var _CoMap = class _CoMap extends CoValueBase {
    **/
   static create(init, options) {
     const instance = new this();
-    const { owner, uniqueness } = parseCoValueCreateOptions(options);
-    const raw = instance.rawFromInit(init, owner, uniqueness);
-    Object.defineProperties(instance, {
-      id: {
-        value: raw.id,
-        enumerable: false
-      },
-      _raw: { value: raw, enumerable: false }
-    });
-    return instance;
+    return instance._createCoMap(init, options);
   }
   /**
    * Return a JSON representation of the `CoMap`
@@ -339,6 +330,18 @@ var _CoMap = class _CoMap extends CoValueBase {
   [inspect]() {
     return this.toJSON();
   }
+  _createCoMap(init, options) {
+    const { owner, uniqueness } = parseCoValueCreateOptions(options);
+    const raw = this.rawFromInit(init, owner, uniqueness);
+    Object.defineProperties(this, {
+      id: {
+        value: raw.id,
+        enumerable: false
+      },
+      _raw: { value: raw, enumerable: false }
+    });
+    return this;
+  }
   /**
    * Create a new `RawCoMap` from an initialization object
    * @internal
@@ -427,7 +430,12 @@ var _CoMap = class _CoMap extends CoValueBase {
     const { options, listener } = parseSubscribeRestArgs(args);
     return subscribeToCoValueWithoutMe(this, id, options, listener);
   }
+  /** @deprecated Use `CoMap.upsertUnique` and `CoMap.loadUnique` instead. */
   static findUnique(unique, ownerID, as) {
+    return _CoMap._findUnique(unique, ownerID, as);
+  }
+  /** @internal */
+  static _findUnique(unique, ownerID, as) {
     as ||= activeAccountContext.get();
     const header = {
       type: "comap",
@@ -441,6 +449,65 @@ var _CoMap = class _CoMap extends CoValueBase {
     const crypto = as._type === "Anonymous" ? as.node.crypto : as._raw.core.node.crypto;
     return cojsonInternals.idforHeader(header, crypto);
   }
+  /**
+   * Given some data, updates an existing CoMap or initialises a new one if none exists.
+   *
+   * Note: This method respects resolve options, and thus can return `null` if the references cannot be resolved.
+   *
+   * @example
+   * ```ts
+   * const activeEvent = await Event.upsertUnique(
+   *   sourceData.identifier,
+   *   workspace.id,
+   *   {
+   *     title: sourceData.title,
+   *     identifier: sourceData.identifier,
+   *     external_id: sourceData._id,
+   *   },
+   *   workspace
+   * );
+   * ```
+   *
+   * @param options The options for creating or loading the CoMap. This includes the intended state of the CoMap, its unique identifier, its owner, and the references to resolve.
+   * @returns Either an existing & modified CoMap, or a new initialised CoMap if none exists.
+   * @category Subscription & Loading
+   */
+  static async upsertUnique(options) {
+    let mapId = _CoMap._findUnique(options.unique, options.owner.id);
+    let map = await loadCoValueWithoutMe(this, mapId, {
+      ...options,
+      loadAs: options.owner._loadedAs,
+      skipRetry: true
+    });
+    if (!map) {
+      const instance = new this();
+      map = instance._createCoMap(options.value, {
+        owner: options.owner,
+        unique: options.unique
+      });
+    } else {
+      map.applyDiff(options.value);
+    }
+    return await loadCoValueWithoutMe(this, mapId, {
+      ...options,
+      loadAs: options.owner._loadedAs,
+      skipRetry: true
+    });
+  }
+  /**
+   * Loads a CoMap by its unique identifier and owner's ID.
+   * @param unique The unique identifier of the CoMap to load.
+   * @param ownerID The ID of the owner of the CoMap.
+   * @param options Additional options for loading the CoMap.
+   * @returns The loaded CoMap, or null if unavailable.
+   */
+  static loadUnique(unique, ownerID, options) {
+    return loadCoValueWithoutMe(
+      this,
+      _CoMap._findUnique(unique, ownerID, options?.loadAs),
+      { ...options, skipRetry: true }
+    );
+  }
   /**
    * Given an already loaded `CoMap`, ensure that the specified fields are loaded to the specified depth.
    *
@@ -1448,6 +1515,25 @@ var FileStream = class extends CoValueBase {
       allowUnfinished: options?.allowUnfinished
     });
   }
+  static async loadAsBase64(id, options) {
+    const stream = await this.load(id, options);
+    return stream?.asBase64(options);
+  }
+  asBase64(options) {
+    const chunks = this.getChunks(options);
+    if (!chunks) return void 0;
+    const output = [];
+    for (const chunk of chunks.chunks) {
+      for (const byte of chunk) {
+        output.push(String.fromCharCode(byte));
+      }
+    }
+    const base642 = btoa(output.join(""));
+    if (options?.dataURL) {
+      return `data:${chunks.mimeType};base64,${base642}`;
+    }
+    return base642;
+  }
   /**
    * Create a `FileStream` from a `Blob` or `File`
    *
@@ -2778,10 +2864,11 @@ function applyCoValueMigrations(instance) {
 
 // src/tools/subscribe/CoValueCoreSubscription.ts
 var CoValueCoreSubscription = class {
-  constructor(node, id, listener) {
+  constructor(node, id, listener, skipRetry) {
     this.node = node;
     this.id = id;
     this.listener = listener;
+    this.skipRetry = skipRetry;
     this._unsubscribe = () => {
     };
     this.unsubscribed = false;
@@ -2789,13 +2876,13 @@ var CoValueCoreSubscription = class {
     if (entry?.isAvailable()) {
       this.subscribe(entry.getCurrentContent());
     } else {
-      this.node.loadCoValueCore(this.id).then((value) => {
+      this.node.loadCoValueCore(this.id, void 0, skipRetry).then((value) => {
         if (this.unsubscribed) return;
         if (value.isAvailable()) {
           this.subscribe(value.getCurrentContent());
         } else {
-          this.listener("unavailable");
           this.subscribeToState();
+          this.listener("unavailable");
         }
       });
     }
@@ -2890,10 +2977,11 @@ function createCoValue(ref2, raw, subscriptionScope) {
 
 // src/tools/subscribe/SubscriptionScope.ts
 var SubscriptionScope = class _SubscriptionScope {
-  constructor(node, resolve, id, schema) {
+  constructor(node, resolve, id, schema, skipRetry) {
     this.node = node;
     this.id = id;
     this.schema = schema;
+    this.skipRetry = skipRetry;
     this.childNodes = /* @__PURE__ */ new Map();
     this.childValues = /* @__PURE__ */ new Map();
     this.childErrors = /* @__PURE__ */ new Map();
@@ -2932,20 +3020,30 @@ var SubscriptionScope = class _SubscriptionScope {
     this.resolve = resolve;
     this.value = { type: "unloaded", id };
     let lastUpdate;
-    this.subscription = new CoValueCoreSubscription(node, id, (value) => {
-      lastUpdate = value;
-      if (!this.migrated && value !== "unavailable") {
-        if (this.migrating) {
+    this.subscription = new CoValueCoreSubscription(
+      node,
+      id,
+      (value) => {
+        lastUpdate = value;
+        if (skipRetry && value === "unavailable") {
+          this.handleUpdate(value);
+          this.destroy();
           return;
         }
-        this.migrating = true;
-        applyCoValueMigrations(instantiateRefEncoded(this.schema, value));
-        this.migrated = true;
-        this.handleUpdate(lastUpdate);
-        return;
-      }
-      this.handleUpdate(value);
-    });
+        if (!this.migrated && value !== "unavailable") {
+          if (this.migrating) {
+            return;
+          }
+          this.migrating = true;
+          applyCoValueMigrations(instantiateRefEncoded(this.schema, value));
+          this.migrated = true;
+          this.handleUpdate(lastUpdate);
+          return;
+        }
+        this.handleUpdate(value);
+      },
+      skipRetry
+    );
   }
   updateValue(value) {
     this.value = value;
@@ -3554,6 +3652,12 @@ function enrichCoMapSchema(schema) {
     findUnique: (...args) => {
       return coSchema.findUnique(...args);
     },
+    upsertUnique: (...args) => {
+      return coSchema.upsertUnique(...args);
+    },
+    loadUnique: (...args) => {
+      return coSchema.loadUnique(...args);
+    },
     catchall: (index) => {
       return enrichCoMapSchema(baseCatchall(index));
     },
@@ -4603,6 +4707,7 @@ function loadCoValue(cls, id, options) {
         resolve: options.resolve,
         loadAs: options.loadAs,
         syncResolution: true,
+        skipRetry: options.skipRetry,
         onUnavailable: () => {
           resolve(null);
         },
@@ -4670,10 +4775,16 @@ function subscribeToCoValue(cls, id, options, listener) {
   const node = "node" in loadAs ? loadAs.node : loadAs._raw.core.node;
   const resolve = options.resolve ?? true;
   let unsubscribed = false;
-  const rootNode = new SubscriptionScope(node, resolve, id, {
-    ref: cls,
-    optional: false
-  });
+  const rootNode = new SubscriptionScope(
+    node,
+    resolve,
+    id,
+    {
+      ref: cls,
+      optional: false
+    },
+    options.skipRetry
+  );
   const handleUpdate = (value) => {
     if (unsubscribed) return;
     if (value.type === "unavailable") {
@@ -4824,4 +4935,4 @@ export {
   JazzContextManager
 };
 /* istanbul ignore file -- @preserve */
-//# sourceMappingURL=chunk-FSIM7N33.js.map
+//# sourceMappingURL=chunk-VBDJM6Z5.js.map