jazz-tools 0.8.50 → 0.9.0

package/.turbo/turbo-build.log

@@ -1,8 +1,8 @@
 
-> jazz-tools@0.8.50 build /home/runner/work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.9.0 build /home/runner/work/jazz/jazz/packages/jazz-tools
 > tsup
 
-CLI Building entry: {"index.web":"src/index.web.ts","index.native":"src/index.native.ts"}
+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
@@ -10,9 +10,11 @@
 CLI Cleaning output folder
 ESM Build start
 ESM dist/index.web.js          1.08 KB
+ESM dist/testing.js            2.10 KB
 ESM dist/index.native.js       1.07 KB
-ESM dist/chunk-6OHBW32Q.js     81.76 KB
+ESM dist/chunk-EK2I4C5W.js     82.83 KB
 ESM dist/index.web.js.map      270.00 B
+ESM dist/testing.js.map        4.48 KB
+ESM dist/chunk-EK2I4C5W.js.map 190.92 KB
 ESM dist/index.native.js.map   280.00 B
-ESM dist/chunk-6OHBW32Q.js.map 188.47 KB
-ESM ⚡️ Build success in 81ms
+ESM ⚡️ Build success in 92ms

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # jazz-tools
 
+## 0.9.0
+
+### Patch Changes
+
+- 8eda792: Optimize the subscribe to resolve the CoValues stored in memory synchronously
+- Updated dependencies [8eda792]
+- Updated dependencies [1ef3226]
+  - cojson@0.9.0
+
+## 0.8.51
+
+### Patch Changes
+
+- dc62b95: Return field name on \_edits
+- 1de26f8: Simplify the .create calls by accepting directly "Account | Group" as second param
+
 ## 0.8.50
 
 ### Patch Changes

package/dist/{chunk-6OHBW32Q.js → chunk-EK2I4C5W.js}

@@ -63,6 +63,16 @@ var Ref = class _Ref {
       return new _Ref(this.id, this.controlledAccount, this.schema).value;
     }
   }
+  syncLoad() {
+    const node = "node" in this.controlledAccount ? this.controlledAccount.node : this.controlledAccount._raw.core.node;
+    const entry = node.coValuesStore.get(
+      this.id
+    );
+    if (entry.state.type === "available") {
+      return new _Ref(this.id, this.controlledAccount, this.schema).value;
+    }
+    return void 0;
+  }
   async load() {
     const result = await this.loadHelper();
     if (result === "unavailable") {
@@ -240,6 +250,16 @@ var SubscriptionScope = class {
     this.scheduledUpdate = false;
     this.cachedValues = {};
     this.parents = {};
+    this.unsubscribeAll = () => {
+      for (const entry of this.entries.values()) {
+        if (entry.state === "loaded") {
+          entry.rawUnsub();
+        } else {
+          entry.immediatelyUnsub = true;
+        }
+      }
+      this.entries.clear();
+    };
     this.rootEntry = {
       state: "loaded",
       value: root._raw,
@@ -253,7 +273,7 @@ var SubscriptionScope = class {
     this.scheduleUpdate = () => {
       const value = rootSchema.fromRaw(this.rootEntry.value);
       subscriptionsScopes.set(value, this);
-      onUpdate(value);
+      onUpdate(value, this);
     };
     this.rootEntry.rawUnsub = root._raw.core.subscribe(
       (rawUpdate) => {
@@ -307,16 +327,6 @@ var SubscriptionScope = class {
       this.invalidate(parent, id, seen);
     }
   }
-  unsubscribeAll() {
-    for (const entry of this.entries.values()) {
-      if (entry.state === "loaded") {
-        entry.rawUnsub();
-      } else {
-        entry.immediatelyUnsub = true;
-      }
-    }
-    this.entries.clear();
-  }
 };
 
 // src/coValues/deepLoading.ts
@@ -677,18 +687,17 @@ var CoValueBase = class {
 };
 function loadCoValue(cls, id, as, depth) {
   return new Promise((resolve) => {
-    const unsubscribe = subscribeToCoValue(
+    subscribeToCoValue(
       cls,
       id,
       as,
       depth,
-      (value) => {
+      (value, unsubscribe) => {
         resolve(value);
         unsubscribe();
       },
       () => {
         resolve(void 0);
-        unsubscribe();
       }
     );
   });
@@ -701,11 +710,11 @@ function ensureCoValueLoaded(existing, depth) {
     depth
   );
 }
-function subscribeToCoValue(cls, id, as, depth, listener, onUnavailable) {
+function subscribeToCoValue(cls, id, as, depth, listener, onUnavailable, syncResolution) {
   const ref2 = new Ref(id, as, { ref: cls, optional: false });
   let unsubscribed = false;
   let unsubscribe;
-  ref2.load().then((value) => {
+  function subscribe(value) {
     if (!value) {
       onUnavailable && onUnavailable();
       return;
@@ -714,22 +723,31 @@ function subscribeToCoValue(cls, id, as, depth, listener, onUnavailable) {
     const subscription = new SubscriptionScope(
       value,
       cls,
-      (update) => {
+      (update, subscription2) => {
         if (fulfillsDepth(depth, update)) {
-          listener(update);
+          listener(
+            update,
+            subscription2.unsubscribeAll
+          );
         }
       }
     );
-    unsubscribe = () => subscription.unsubscribeAll();
-  }).catch((e) => {
-    console.error("Failed to load / subscribe to CoValue", e);
-  });
+    unsubscribe = subscription.unsubscribeAll;
+  }
+  const sync = syncResolution ? ref2.syncLoad() : void 0;
+  if (sync) {
+    subscribe(sync);
+  } else {
+    ref2.load().then((value) => subscribe(value)).catch((e) => {
+      console.error("Failed to load / subscribe to CoValue", e);
+    });
+  }
   return function unsubscribeAtAnyPoint() {
     unsubscribed = true;
     unsubscribe && unsubscribe();
   };
 }
-function createCoValueObservable() {
+function createCoValueObservable(options) {
   let currentValue = void 0;
   let subscriberCount = 0;
   function subscribe(cls, id, as, depth, listener, onUnavailable) {
@@ -743,7 +761,8 @@ function createCoValueObservable() {
         currentValue = value;
         listener();
       },
-      onUnavailable
+      onUnavailable,
+      options?.syncResolution
     );
     return () => {
       unsubscribe();
@@ -768,6 +787,12 @@ function subscribeToExistingCoValue(existing, depth, listener) {
     listener
   );
 }
+function parseCoValueCreateOptions(options) {
+  return "_type" in options && (options._type === "Account" || options._type === "Group") ? { owner: options, uniqueness: void 0 } : {
+    owner: options.owner,
+    uniqueness: options.unique ? { uniqueness: options.unique } : void 0
+  };
+}
 
 // src/coValues/inbox.ts
 import {
@@ -1050,7 +1075,8 @@ var _CoMap = class _CoMap extends CoValueBase {
         ref: RegisteredSchemas["Account"],
         optional: false
       }).accessFrom(target, "_edits." + key + ".by"),
-      madeAt: rawEdit.at
+      madeAt: rawEdit.at,
+      key
     };
   }
   /** @category Collaboration */
@@ -1124,11 +1150,8 @@ var _CoMap = class _CoMap extends CoValueBase {
    **/
   static create(init, options) {
     const instance = new this();
-    const raw = instance.rawFromInit(
-      init,
-      options.owner,
-      options.unique === void 0 ? void 0 : { uniqueness: options.unique }
-    );
+    const { owner, uniqueness } = parseCoValueCreateOptions(options);
+    const raw = instance.rawFromInit(init, owner, uniqueness);
     Object.defineProperties(instance, {
       id: {
         value: raw.id,
@@ -1761,7 +1784,7 @@ var _Group = class _Group extends CoValueBase {
     return new Proxy(this, AccountAndGroupProxyHandler);
   }
   static create(options) {
-    return new this(options);
+    return new this(parseCoValueCreateOptions(options));
   }
   myRole() {
     return this._raw.myRole();
@@ -1911,8 +1934,9 @@ var _CoFeed = class _CoFeed extends CoValueBase {
    * @category Creation
    */
   static create(init, options) {
-    const instance = new this({ init, owner: options.owner });
-    const raw = options.owner._raw.createStream();
+    const { owner } = parseCoValueCreateOptions(options);
+    const instance = new this({ init, owner });
+    const raw = owner._raw.createStream();
     Object.defineProperties(instance, {
       id: {
         value: raw.id,
@@ -2224,7 +2248,7 @@ var FileStream = class extends CoValueBase {
     });
   }
   static create(options) {
-    return new this(options);
+    return new this(parseCoValueCreateOptions(options));
   }
   getChunks(options) {
     return this._raw.getBinaryChunks(options?.allowUnfinished);
@@ -2259,7 +2283,7 @@ var FileStream = class extends CoValueBase {
     let stream = await this.load(id, as, []);
     if (!options?.allowUnfinished && !stream?.isBinaryStreamEnded()) {
       stream = await new Promise((resolve) => {
-        const unsubscribe = subscribeToCoValue(this, id, as, [], (value) => {
+        subscribeToCoValue(this, id, as, [], (value, unsubscribe) => {
           if (value.isBinaryStreamEnded()) {
             unsubscribe();
             resolve(value);
@@ -2283,7 +2307,8 @@ var FileStream = class extends CoValueBase {
    * @category Content
    */
   static async createFromBlob(blob, options) {
-    const stream = this.create({ owner: options.owner });
+    const stream = this.create(options);
+    const onProgress = "onProgress" in options ? options.onProgress : void 0;
     const start = Date.now();
     const data = new Uint8Array(await blob.arrayBuffer());
     stream.start({
@@ -2296,7 +2321,7 @@ var FileStream = class extends CoValueBase {
     for (let idx = 0; idx < data.length; idx += chunkSize) {
       stream.push(data.slice(idx, idx + chunkSize));
       if (Date.now() - lastProgressUpdate > 100) {
-        options.onProgress?.(idx / data.length);
+        onProgress?.(idx / data.length);
         lastProgressUpdate = Date.now();
       }
       await new Promise((resolve) => setTimeout(resolve, 0));
@@ -2309,7 +2334,7 @@ var FileStream = class extends CoValueBase {
       "s - Throughput in MB/s",
       1e3 * (blob.size / (end - start)) / (1024 * 1024)
     );
-    options.onProgress?.(1);
+    onProgress?.(1);
     return stream;
   }
   /**
@@ -2482,8 +2507,9 @@ var _CoList = class _CoList extends Array {
    * @category Creation
    **/
   static create(items, options) {
-    const instance = new this({ init: items, owner: options.owner });
-    const raw = options.owner._raw.createList(
+    const { owner } = parseCoValueCreateOptions(options);
+    const instance = new this({ init: items, owner });
+    const raw = owner._raw.createList(
       toRawItems(items, instance._schema[ItemsSym])
     );
     Object.defineProperties(instance, {
@@ -2496,9 +2522,11 @@ var _CoList = class _CoList extends Array {
     return instance;
   }
   push(...items) {
-    for (const item of toRawItems(items, this._schema[ItemsSym])) {
-      this._raw.append(item);
-    }
+    this._raw.appendItems(
+      toRawItems(items, this._schema[ItemsSym]),
+      void 0,
+      "private"
+    );
     return this._raw.entries().length;
   }
   unshift(...items) {
@@ -2850,4 +2878,4 @@ export {
   SchemaUnion
 };
 /* istanbul ignore file -- @preserve */
-//# sourceMappingURL=chunk-6OHBW32Q.js.map
+//# sourceMappingURL=chunk-EK2I4C5W.js.map