jazz-tools 0.18.3 → 0.18.4

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> jazz-tools@0.18.3 build /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.18.4 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,22 +107,15 @@
 ESM Build start
 CLI Cleaning output folder
 ESM Build start
-ESM dist/worker/index.js     2.33 KB
-ESM dist/worker/index.js.map 4.79 KB
-ESM ⚡️ Build success in 17ms
 ESM dist/tiptap/index.js     564.00 B
 ESM dist/tiptap/index.js.map 1.21 KB
-ESM ⚡️ Build success in 19ms
+ESM ⚡️ Build success in 23ms
 ESM dist/react/ssr.js     688.00 B
 ESM dist/react/ssr.js.map 1.12 KB
-ESM ⚡️ Build success in 21ms
-ESM dist/better-auth/auth/client.js     4.36 KB
-ESM dist/better-auth/auth/server.js     5.94 KB
-ESM dist/better-auth/auth/react.js      1.19 KB
-ESM dist/better-auth/auth/client.js.map 8.12 KB
-ESM dist/better-auth/auth/server.js.map 10.66 KB
-ESM dist/better-auth/auth/react.js.map  3.37 KB
-ESM ⚡️ Build success in 19ms
+ESM ⚡️ Build success in 26ms
+ESM dist/worker/index.js     2.33 KB
+ESM dist/worker/index.js.map 4.79 KB
+ESM ⚡️ Build success in 24ms
 ESM dist/media/index.js              236.00 B
 ESM dist/media/index.browser.js      2.79 KB
 ESM dist/media/index.native.js       2.90 KB
@@ -133,67 +126,74 @@
 ESM dist/media/index.native.js.map   6.09 KB
 ESM dist/media/index.server.js.map   6.37 KB
 ESM dist/media/chunk-W3S526L3.js.map 16.57 KB
-ESM ⚡️ Build success in 28ms
+ESM ⚡️ Build success in 30ms
+ESM dist/better-auth/auth/react.js      1.19 KB
+ESM dist/better-auth/auth/server.js     5.94 KB
+ESM dist/better-auth/auth/client.js     4.36 KB
+ESM dist/better-auth/auth/react.js.map  3.37 KB
+ESM dist/better-auth/auth/server.js.map 10.66 KB
+ESM dist/better-auth/auth/client.js.map 8.12 KB
+ESM ⚡️ Build success in 24ms
 ESM dist/react-native/index.js       2.53 KB
 ESM dist/react-native/testing.js     120.00 B
 ESM dist/react-native/crypto.js      161.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  197.00 B
-ESM ⚡️ Build success in 29ms
+ESM ⚡️ Build success in 35ms
 ESM dist/browser/index.js     13.44 KB
 ESM dist/browser/index.js.map 28.70 KB
-ESM ⚡️ Build success in 36ms
+ESM ⚡️ Build success in 39ms
 ESM dist/expo/index.js       4.68 KB
 ESM dist/expo/testing.js     112.00 B
 ESM dist/expo/crypto.js      153.00 B
 ESM dist/expo/index.js.map   10.23 KB
 ESM dist/expo/testing.js.map 168.00 B
 ESM dist/expo/crypto.js.map  189.00 B
-ESM ⚡️ Build success in 36ms
-ESM dist/react-native-core/index.js       17.90 KB
+ESM ⚡️ Build success in 38ms
 ESM dist/react-native-core/testing.js     119.00 B
+ESM dist/react-native-core/index.js       17.90 KB
 ESM dist/react-native-core/crypto.js      2.10 KB
+ESM dist/react-native-core/testing.js.map 175.00 B
 ESM dist/react-native-core/index.js.map   36.66 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 37ms
-ESM dist/react/testing.js     122.00 B
+ESM ⚡️ Build success in 45ms
 ESM dist/react/index.js       24.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   53.43 KB
-ESM ⚡️ Build success in 42ms
+ESM ⚡️ Build success in 48ms
 ESM dist/prosemirror/index.js     77.63 KB
 ESM dist/prosemirror/index.js.map 306.98 KB
-ESM ⚡️ Build success in 47ms
+ESM ⚡️ Build success in 50ms
 ESM dist/inspector/index.js     61.52 KB
 ESM dist/inspector/index.js.map 109.98 KB
-ESM ⚡️ Build success in 57ms
+ESM ⚡️ Build success in 70ms
 ESM dist/testing.js            7.17 KB
 ESM dist/index.js              26.13 KB
-ESM dist/chunk-IERUTUXB.js     163.90 KB
+ESM dist/chunk-LHQQZH7I.js     166.47 KB
 ESM dist/testing.js.map        14.10 KB
 ESM dist/index.js.map          52.92 KB
-ESM dist/chunk-IERUTUXB.js.map 389.03 KB
-ESM ⚡️ Build success in 79ms
-ESM dist/react-core/index.js              141.07 KB
-ESM dist/react-core/testing.js            1.17 KB
+ESM dist/chunk-LHQQZH7I.js.map 395.85 KB
+ESM ⚡️ Build success in 90ms
 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              143.63 KB
 ESM dist/react-core/chunk-7DYMJ74I.js.map 533.00 B
-ESM dist/react-core/index.js.map          383.45 KB
-ESM ⚡️ Build success in 78ms
+ESM dist/react-core/testing.js.map        1.82 KB
+ESM dist/react-core/index.js.map          390.27 KB
+ESM ⚡️ Build success in 92ms
 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-WCY6D3QJ.js     1.53 MB
 ESM dist/inspector/custom-element-WCY6D3QJ.js.map 2.35 MB
-ESM ⚡️ Build success in 112ms
+ESM ⚡️ Build success in 125ms
 
-> jazz-tools@0.18.3 types /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.18.4 types /home/runner/_work/jazz/jazz/packages/jazz-tools
 > tsc --outDir dist
 
 
-> jazz-tools@0.18.3 build:svelte /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.18.4 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,15 @@
 # jazz-tools
 
+## 0.18.4
+
+### Patch Changes
+
+- 84313aa: Add `$jazz.id` to `toJSON` in Account, CoMap, CoFeed & FileStream
+- 89aab7b: Deprecate `co.map().catchall`. Use a `co.record` nested inside a `co.map` if you need to store key-value properties.
+  - cojson@0.18.4
+  - cojson-storage-indexeddb@0.18.4
+  - cojson-transport-ws@0.18.4
+
 ## 0.18.3
 
 ### Patch Changes

package/dist/{chunk-IERUTUXB.js → chunk-LHQQZH7I.js}

@@ -228,7 +228,9 @@ var _CoMap = class _CoMap extends CoValueBase {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   toJSON(_key, processedValues) {
-    const result = {};
+    const result = {
+      $jazz: { id: this.$jazz.id }
+    };
     for (const key of this.$jazz.raw.keys()) {
       const tKey = key;
       const descriptor = this.$jazz.getDescriptor(tKey);
@@ -1557,6 +1559,7 @@ var _CoFeed = class _CoFeed extends CoValueBase {
     const itemDescriptor = this.$jazz.schema[ItemsSym];
     const mapper = itemDescriptor === "json" ? (v) => v : "encoded" in itemDescriptor ? itemDescriptor.encoded.encode : (v) => v && v.$jazz.id;
     return {
+      $jazz: { id: this.$jazz.id },
       ...Object.fromEntries(
         Object.entries(this).map(([account, entry]) => [
           account,
@@ -2005,6 +2008,7 @@ var FileStream = class extends CoValueBase {
    */
   toJSON() {
     return {
+      $jazz: { id: this.$jazz.id },
       ...this.getChunks()
     };
   }
@@ -2216,7 +2220,9 @@ var Account = class extends CoValueBase {
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   toJSON() {
-    return {};
+    return {
+      $jazz: { id: this.$jazz.id }
+    };
   }
   [inspect]() {
     return this.toJSON();
@@ -3416,56 +3422,135 @@ function applyCoValueMigrations(instance) {
 
 // src/tools/subscribe/CoValueCoreSubscription.ts
 var CoValueCoreSubscription = class {
-  constructor(node, id, listener, skipRetry) {
-    this.node = node;
-    this.id = id;
-    this.listener = listener;
-    this.skipRetry = skipRetry;
+  constructor(localNode, id, listener, skipRetry, branch) {
     this._unsubscribe = () => {
     };
     this.unsubscribed = false;
-    const entry = this.node.getCoValue(this.id);
-    if (entry?.isAvailable()) {
-      this.subscribe(entry.getCurrentContent());
+    this.localNode = localNode;
+    this.listener = listener;
+    this.skipRetry = skipRetry;
+    this.branchName = branch?.name;
+    this.branchOwnerId = branch?.owner?.$jazz.raw.id;
+    this.source = localNode.getCoValue(id);
+    this.initializeSubscription();
+  }
+  /**
+   * Main entry point for subscription initialization.
+   * Determines the subscription strategy based on current availability and branch requirements.
+   */
+  initializeSubscription() {
+    const source = this.source;
+    if (source.isAvailable()) {
+      this.handleAvailableSource(source);
+      return;
+    }
+    if (this.branchName) {
+      this.handleBranchCheckout();
+      return;
+    }
+    this.loadCoValue();
+  }
+  /**
+   * Handles the case where the CoValue source is immediately available.
+   * Either subscribes directly or attempts to get the requested branch.
+   */
+  handleAvailableSource(source) {
+    if (!this.branchName) {
+      this.subscribe(source.getCurrentContent());
+      return;
+    }
+    const branch = source.getBranch(this.branchName, this.branchOwnerId);
+    if (branch.isAvailable()) {
+      this.subscribe(branch.getCurrentContent());
+      return;
     } else {
-      this.node.loadCoValueCore(this.id, void 0, skipRetry).then((value) => {
-        if (this.unsubscribed) return;
-        if (value.isAvailable()) {
-          this.subscribe(value.getCurrentContent());
-        } else {
-          this.subscribeToState();
-          this.listener("unavailable");
-        }
-      }).catch((error) => {
-        console.error("Unexpected error loading CoValue: ", error);
-        this.listener("unavailable");
-      });
+      this.handleBranchCheckout();
     }
   }
-  subscribeToState() {
-    const entry = this.node.getCoValue(this.id);
-    const handleStateChange = (core2, unsubFromStateChange2) => {
-      if (this.unsubscribed) {
-        unsubFromStateChange2();
-        return;
+  /**
+   * Attempts to checkout a specific branch of the CoValue.
+   * This is called when the source isn't available but a branch is requested.
+   */
+  handleBranchCheckout() {
+    this.localNode.checkoutBranch(this.source.id, this.branchName, this.branchOwnerId).then((value) => {
+      if (this.unsubscribed) return;
+      if (value !== "unavailable") {
+        this.subscribe(value);
+      } else {
+        this.handleUnavailableBranch();
       }
-      if (core2.isAvailable()) {
-        this.subscribe(core2.getCurrentContent());
-        unsubFromStateChange2();
+    }).catch((error) => {
+      console.error(error);
+      this.emit("unavailable");
+    });
+  }
+  /**
+   * Handles the case where a branch checkout fails.
+   * Determines whether to retry or report unavailability.
+   */
+  handleUnavailableBranch() {
+    const source = this.source;
+    if (source.isAvailable()) {
+      throw new Error("Branch is unavailable");
+    }
+    this.subscribeToUnavailableSource();
+    this.emit("unavailable");
+  }
+  /**
+   * Loads the CoValue core from the network/storage.
+   * This is the fallback strategy when immediate availability fails.
+   */
+  loadCoValue() {
+    this.localNode.loadCoValueCore(this.source.id, void 0, this.skipRetry).then((value) => {
+      if (this.unsubscribed) return;
+      if (value.isAvailable()) {
+        this.subscribe(value.getCurrentContent());
+      } else {
+        this.subscribeToUnavailableSource();
+        this.emit("unavailable");
+      }
+    }).catch((error) => {
+      console.error(error);
+      this.emit("unavailable");
+    });
+  }
+  /**
+   * Subscribes to state changes of an unavailable CoValue source.
+   * This allows the subscription to become active when the source becomes available after a first loading attempt.
+   */
+  subscribeToUnavailableSource() {
+    const source = this.source;
+    const handleStateChange = (_, unsubFromStateChange) => {
+      if (!source.isAvailable()) {
+        return;
       }
-    };
-    const unsubFromStateChange = entry.subscribe(handleStateChange);
-    this._unsubscribe = () => {
       unsubFromStateChange();
+      if (this.branchName) {
+        this.handleBranchCheckout();
+      } else {
+        this.subscribe(source.getCurrentContent());
+      }
     };
+    this._unsubscribe = source.subscribe(handleStateChange);
   }
+  /**
+   * Subscribes to a specific CoValue and notifies the listener.
+   * This is the final step where we actually start receiving updates.
+   */
   subscribe(value) {
     if (this.unsubscribed) return;
     this._unsubscribe = value.subscribe((value2) => {
-      this.listener(value2);
+      this.emit(value2);
     });
+  }
+  emit(value) {
+    if (this.unsubscribed) return;
     this.listener(value);
   }
+  /**
+   * Unsubscribes from all active subscriptions and marks the instance as unsubscribed.
+   * This prevents any further operations and ensures proper cleanup.
+   */
   unsubscribe() {
     if (this.unsubscribed) return;
     this.unsubscribed = true;
@@ -5731,4 +5816,4 @@ export {
   JazzContextManager
 };
 /* istanbul ignore file -- @preserve */
-//# sourceMappingURL=chunk-IERUTUXB.js.map
+//# sourceMappingURL=chunk-LHQQZH7I.js.map