jazz-tools 0.11.5 → 0.11.7

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> jazz-tools@0.11.5 build /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.11.7 build /home/runner/_work/jazz/jazz/packages/jazz-tools
 > tsup && pnpm types
 
 CLI Building entry: {"index":"src/index.ts","testing":"src/testing.ts"}
@@ -11,12 +11,12 @@
 ESM Build start
 ESM dist/index.js              1.50 KB
 ESM dist/testing.js            6.18 KB
-ESM dist/chunk-IOK4K3XC.js     120.99 KB
+ESM dist/chunk-HH3Z4JSB.js     121.60 KB
 ESM dist/index.js.map          259.00 B
 ESM dist/testing.js.map        12.24 KB
-ESM dist/chunk-IOK4K3XC.js.map 287.57 KB
-ESM ⚡️ Build success in 51ms
+ESM dist/chunk-HH3Z4JSB.js.map 289.35 KB
+ESM ⚡️ Build success in 38ms
 
-> jazz-tools@0.11.5 types /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.11.7 types /home/runner/_work/jazz/jazz/packages/jazz-tools
 > tsc --outDir dist
 

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # jazz-tools
 
+## 0.11.7
+
+### Patch Changes
+
+- a140f55: Bugfix: Trigger a single update when loading a locally available list of items
+- 2b0d1b0: Export CoFeedEntry type
+- Updated dependencies [2b94bc8]
+- Updated dependencies [2957362]
+  - cojson@0.11.7
+
+## 0.11.6
+
+### Patch Changes
+
+- e7c85b7: Add targetWidth to highestResAvailable to add a way to fetch the next size up
+- Updated dependencies [8ed144e]
+  - cojson@0.11.6
+
 ## 0.11.5
 
 ### Patch Changes

package/dist/{chunk-IOK4K3XC.js → chunk-HH3Z4JSB.js}

@@ -343,7 +343,6 @@ function instantiateRefEncoded(schema, raw) {
 
 // src/implementation/subscriptionScope.ts
 var subscriptionsScopes = /* @__PURE__ */ new WeakMap();
-var TRACE_INVALIDATIONS = false;
 var SubscriptionScope = class {
   constructor(root, rootSchema, onUpdate) {
     this.scopeID = `scope-${Math.random().toString(36).slice(2)}`;
@@ -351,6 +350,7 @@ var SubscriptionScope = class {
     this.scheduledUpdate = false;
     this.cachedValues = {};
     this.parents = {};
+    this.syncResolution = false;
     this.unsubscribeAll = () => {
       for (const entry of this.entries.values()) {
         if (entry.state === "loaded") {
@@ -397,38 +397,52 @@ var SubscriptionScope = class {
       };
       this.entries.set(accessedOrSetId, loadingEntry);
       const node = this.subscriber._type === "Account" ? this.subscriber._raw.core.node : this.subscriber.node;
-      void node.loadCoValueCore(accessedOrSetId).then((core) => {
-        if (loadingEntry.state === "loading" && loadingEntry.immediatelyUnsub) {
-          return;
-        }
-        if (core !== "unavailable") {
-          const entry = {
-            state: "loaded",
-            rawUnsub: () => {
-            }
-            // placeholder
-          };
-          this.entries.set(accessedOrSetId, entry);
-          const rawUnsub = core.subscribe((rawUpdate) => {
-            if (!rawUpdate) return;
-            this.invalidate(accessedOrSetId);
-            this.scheduleUpdate();
-          });
-          entry.rawUnsub = rawUnsub;
-        }
-      });
+      loadCoValue(
+        node,
+        accessedOrSetId,
+        (core) => {
+          if (loadingEntry.state === "loading" && loadingEntry.immediatelyUnsub) {
+            return;
+          }
+          if (core !== "unavailable") {
+            const entry = {
+              state: "loaded",
+              rawUnsub: () => {
+              }
+              // placeholder
+            };
+            this.entries.set(accessedOrSetId, entry);
+            const rawUnsub = core.subscribe((rawUpdate) => {
+              if (!rawUpdate) return;
+              this.invalidate(accessedOrSetId);
+              this.scheduleUpdate();
+            });
+            entry.rawUnsub = rawUnsub;
+          }
+        },
+        this.syncResolution
+      );
     }
   }
-  invalidate(id, fromChild, seen = /* @__PURE__ */ new Set()) {
+  invalidate(id, seen = /* @__PURE__ */ new Set()) {
     if (seen.has(id)) return;
-    TRACE_INVALIDATIONS && console.log("invalidating", fromChild, "->", id, this.cachedValues[id]);
     delete this.cachedValues[id];
     seen.add(id);
     for (const parent of this.parents[id] || []) {
-      this.invalidate(parent, id, seen);
+      this.invalidate(parent, seen);
     }
   }
 };
+function loadCoValue(node, id, callback, syncResolution) {
+  const entry = node.coValuesStore.get(id);
+  if (entry.state.type === "available" && syncResolution) {
+    callback(entry.state.coValue);
+  } else {
+    void node.loadCoValueCore(id).then((core) => {
+      callback(core);
+    });
+  }
+}
 
 // src/implementation/createContext.ts
 import {
@@ -741,11 +755,11 @@ function loadCoValueWithoutMe(cls, id, asOrDepth, depth) {
         "Depth is required when loading a CoValue as an Account or AnonymousJazzAgent"
       );
     }
-    return loadCoValue(cls, id, asOrDepth, depth);
+    return loadCoValue2(cls, id, asOrDepth, depth);
   }
-  return loadCoValue(cls, id, activeAccountContext.get(), asOrDepth);
+  return loadCoValue2(cls, id, activeAccountContext.get(), asOrDepth);
 }
-function loadCoValue(cls, id, as, depth) {
+function loadCoValue2(cls, id, as, depth) {
   return new Promise((resolve) => {
     subscribeToCoValue(
       cls,
@@ -763,7 +777,7 @@ function loadCoValue(cls, id, as, depth) {
   });
 }
 async function ensureCoValueLoaded(existing, depth) {
-  const response = await loadCoValue(
+  const response = await loadCoValue2(
     existing.constructor,
     existing.id,
     existing._loadedAs,
@@ -812,7 +826,11 @@ function subscribeToCoValue(cls, id, as, depth, listener, onUnavailable, syncRes
       value,
       cls,
       (update, subscription2) => {
-        if (fulfillsDepth(depth, update)) {
+        if (subscription2.syncResolution) return false;
+        subscription2.syncResolution = true;
+        const isLoaded = fulfillsDepth(depth, update);
+        subscription2.syncResolution = false;
+        if (isLoaded) {
           listener(
             update,
             subscription2.unsubscribeAll
@@ -997,7 +1015,7 @@ var Inbox = class _Inbox {
                   new Error("Unable to load inbox message " + id)
                 );
               }
-              return loadCoValue(
+              return loadCoValue2(
                 Schema,
                 message.get("payload"),
                 account,
@@ -1711,7 +1729,7 @@ var _Account = class _Account extends CoValueBase {
       valueID,
       inviteSecret
     );
-    return loadCoValue(coValueClass, valueID, this, []);
+    return loadCoValue2(coValueClass, valueID, this, []);
   }
   /** @private */
   static async create(options) {
@@ -2909,7 +2927,7 @@ var _Group = class _Group extends CoValueBase {
     );
   }
   getParentGroups() {
-    return this._raw.getParentGroups().map(({ group }) => _Group.fromRaw(group));
+    return this._raw.getParentGroups().map((group) => _Group.fromRaw(group));
   }
   extend(parent, roleMapping) {
     this._raw.extend(parent._raw, roleMapping);
@@ -3034,7 +3052,7 @@ var CoPlainText = class extends String {
    * @category Subscription & Loading
    */
   static load(id, as) {
-    return loadCoValue(this, id, as ?? activeAccountContext.get(), []);
+    return loadCoValue2(this, id, as ?? activeAccountContext.get(), []);
   }
   static subscribe(id, asOrListener, listener) {
     if (isAccountInstance(asOrListener)) {
@@ -3489,22 +3507,26 @@ var ImageDefinition = class extends (_b = CoMap, _a = co.items, _b) {
       );
     }
     const resolutions = Object.keys(this).filter(
-      (key) => key.match(/^\d+x\d+$/) && (options?.maxWidth === void 0 || Number(key.split("x")[0]) <= options.maxWidth)
+      (key) => key.match(/^\d+x\d+$/)
+    );
+    let maxWidth = options?.maxWidth;
+    if (options?.targetWidth) {
+      const targetWidth = options.targetWidth;
+      const widths = resolutions.map((res) => Number(res.split("x")[0]));
+      maxWidth = Math.min(...widths.filter((w) => w >= targetWidth));
+    }
+    const validResolutions = resolutions.filter(
+      (key) => maxWidth === void 0 || Number(key.split("x")[0]) <= maxWidth
     );
-    resolutions.sort((a, b) => {
+    validResolutions.sort((a, b) => {
       const aWidth = Number(a.split("x")[0]);
       const bWidth = Number(b.split("x")[0]);
       return aWidth - bWidth;
     });
     let highestAvailableResolution;
-    for (const resolution of resolutions) {
+    for (const resolution of validResolutions) {
       if (this[resolution] && this[resolution]?.getChunks()) {
         highestAvailableResolution = resolution;
-      } else {
-        return highestAvailableResolution && {
-          res: highestAvailableResolution,
-          stream: this[highestAvailableResolution]
-        };
       }
     }
     return highestAvailableResolution && {
@@ -4182,7 +4204,7 @@ export {
   activeAccountContext,
   AnonymousJazzAgent,
   CoValueBase,
-  loadCoValue,
+  loadCoValue2 as loadCoValue,
   subscribeToCoValue,
   createCoValueObservable,
   Encoders,
@@ -4218,4 +4240,4 @@ export {
   consumeInviteLink
 };
 /* istanbul ignore file -- @preserve */
-//# sourceMappingURL=chunk-IOK4K3XC.js.map
+//# sourceMappingURL=chunk-HH3Z4JSB.js.map