@legendapp/state 3.0.0-beta.14 → 3.0.0-beta.16

package/index.d.mts

@@ -248,6 +248,7 @@ interface UpdateFnParams<T = any> {
     value: T;
     mode?: GetMode;
     lastSync?: number | undefined;
+    changes?: Change[];
 }
 interface UpdateSetFnParams<T = any> extends UpdateFnParams<T> {
     lastSync?: never;

package/index.d.ts

@@ -248,6 +248,7 @@ interface UpdateFnParams<T = any> {
     value: T;
     mode?: GetMode;
     lastSync?: number | undefined;
+    changes?: Change[];
 }
 interface UpdateSetFnParams<T = any> extends UpdateFnParams<T> {
     lastSync?: never;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/state",
-  "version": "3.0.0-beta.14",
+  "version": "3.0.0-beta.16",
   "description": "legend-state",
   "sideEffects": false,
   "private": false,

package/sync-plugins/crud.js

@@ -30,7 +30,7 @@ var queuedRetries = {
   update: /* @__PURE__ */ new Map(),
   delete: /* @__PURE__ */ new Map()
 };
-function retrySet(params, retry, action, itemKey, itemValue, actionFn, saveResult) {
+function retrySet(params, retry, action, itemKey, itemValue, change, actionFn, saveResult) {
   if (action === "delete") {
     if (queuedRetries.create.has(itemKey)) {
       queuedRetries.create.delete(itemKey);
@@ -48,13 +48,14 @@ function retrySet(params, retry, action, itemKey, itemValue, actionFn, saveResul
     itemValue = Object.assign(queuedRetry, itemValue);
   }
   queuedRetries[action].set(itemKey, itemValue);
+  const paramsWithChanges = { ...params, changes: [change] };
   return runWithRetry(
-    params,
+    paramsWithChanges,
     retry,
     "create_" + itemKey,
-    () => actionFn(itemValue, params).then((result) => {
+    () => actionFn(itemValue, paramsWithChanges).then((result) => {
       queuedRetries[action].delete(itemKey);
-      return saveResult(itemKey, itemValue, result, true);
+      return saveResult(itemKey, itemValue, result, true, change);
     })
   );
 }
@@ -179,6 +180,7 @@ function syncedCrud(props) {
     const creates = /* @__PURE__ */ new Map();
     const updates = /* @__PURE__ */ new Map();
     const deletes = /* @__PURE__ */ new Set();
+    const changesById = /* @__PURE__ */ new Map();
     const getUpdateValue = (itemValue, prev) => {
       return updatePartial ? Object.assign(
         sync.diffObjects(
@@ -200,6 +202,7 @@ function syncedCrud(props) {
             id = ensureId(value, fieldId, generateId);
           }
           if (id) {
+            changesById.set(id, change);
             if (pendingCreates.has(id)) {
               isCreate = false;
             }
@@ -229,6 +232,7 @@ function syncedCrud(props) {
           }
         } else if (path.length === 0) {
           deletes.add(prevAtPath);
+          changesById.set(prevAtPath[fieldId], change);
         }
       } else {
         let itemsChanged = [];
@@ -253,6 +257,7 @@ function syncedCrud(props) {
           if (!itemValue) {
             if (path.length === 1 && prevAtPath) {
               deletes.add(prevAtPath);
+              changesById.set(prevAtPath[fieldId], change);
             }
           } else {
             const previous = state.setAtPath(
@@ -274,17 +279,18 @@ function syncedCrud(props) {
               console.error("[legend-state]: added item without an id");
             }
             if (createFn) {
-              pendingCreates.add(item[fieldId]);
-              creates.set(item[fieldId], item);
+              const id = item[fieldId];
+              changesById.set(id, change);
+              pendingCreates.add(id);
+              creates.set(id, item);
             } else {
               console.warn("[legend-state] missing create function");
             }
           } else {
             if (updateFn) {
-              updates.set(
-                item[fieldId],
-                updates.has(item[fieldId]) ? Object.assign(updates.get(item[fieldId]), item) : item
-              );
+              const id = item[fieldId];
+              changesById.set(id, change);
+              updates.set(id, updates.has(id) ? Object.assign(updates.get(id), item) : item);
             } else {
               console.warn("[legend-state] missing update function");
             }
@@ -292,7 +298,7 @@ function syncedCrud(props) {
         });
       }
     });
-    const saveResult = async (itemKey, input, data, isCreate) => {
+    const saveResult = async (itemKey, input, data, isCreate, change) => {
       var _a;
       if (data) {
         let saved = (transform == null ? void 0 : transform.load) ? await transform.load(data, "set") : data;
@@ -319,7 +325,7 @@ function syncedCrud(props) {
             if (
               // value is already the new value, can ignore
               saved[key] === c || // user has changed local value
-              key !== fieldId && i !== c
+              key !== fieldId && i !== void 0 && i !== c
             ) {
               delete saved[key];
             }
@@ -340,7 +346,8 @@ function syncedCrud(props) {
           if (value2 !== void 0) {
             update({
               value: value2,
-              mode: "merge"
+              mode: "merge",
+              changes: [change]
             });
           }
         }
@@ -353,11 +360,18 @@ function syncedCrud(props) {
           await waitForSet(waitForSetParam, changes, itemValue, { type: "create" });
         }
         const createObj = await transformOut(itemValue, transform == null ? void 0 : transform.save);
-        return retrySet(params, retry, "create", itemKey, createObj, createFn, saveResult).then(
-          () => {
-            pendingCreates.delete(itemKey);
-          }
-        );
+        return retrySet(
+          params,
+          retry,
+          "create",
+          itemKey,
+          createObj,
+          changesById.get(itemKey),
+          createFn,
+          saveResult
+        ).then(() => {
+          pendingCreates.delete(itemKey);
+        });
       }),
       // Handle updates
       ...Array.from(updates).map(async ([itemKey, itemValue]) => {
@@ -366,7 +380,16 @@ function syncedCrud(props) {
         }
         const changed = await transformOut(itemValue, transform == null ? void 0 : transform.save);
         if (Object.keys(changed).length > 0) {
-          return retrySet(params, retry, "update", itemKey, changed, updateFn, saveResult);
+          return retrySet(
+            params,
+            retry,
+            "update",
+            itemKey,
+            changed,
+            changesById.get(itemKey),
+            updateFn,
+            saveResult
+          );
         }
       }),
       // Handle deletes
@@ -374,8 +397,8 @@ function syncedCrud(props) {
         if (waitForSetParam) {
           await waitForSet(waitForSetParam, changes, valuePrevious, { type: "delete" });
         }
-        const valueId = valuePrevious[fieldId];
-        if (!valueId) {
+        const itemKey = valuePrevious[fieldId];
+        if (!itemKey) {
           console.error("[legend-state]: deleting item without an id");
           return;
         }
@@ -384,8 +407,9 @@ function syncedCrud(props) {
             params,
             retry,
             "delete",
-            valueId,
+            itemKey,
             valuePrevious,
+            changesById.get(itemKey),
             deleteFn,
             saveResult
           );
@@ -395,8 +419,9 @@ function syncedCrud(props) {
             params,
             retry,
             "delete",
-            valueId,
-            { [fieldId]: valueId, [fieldDeleted]: true },
+            itemKey,
+            { [fieldId]: itemKey, [fieldDeleted]: true },
+            changesById.get(itemKey),
             updateFn,
             saveResult
           );

package/sync-plugins/crud.mjs

@@ -28,7 +28,7 @@ var queuedRetries = {
   update: /* @__PURE__ */ new Map(),
   delete: /* @__PURE__ */ new Map()
 };
-function retrySet(params, retry, action, itemKey, itemValue, actionFn, saveResult) {
+function retrySet(params, retry, action, itemKey, itemValue, change, actionFn, saveResult) {
   if (action === "delete") {
     if (queuedRetries.create.has(itemKey)) {
       queuedRetries.create.delete(itemKey);
@@ -46,13 +46,14 @@ function retrySet(params, retry, action, itemKey, itemValue, actionFn, saveResul
     itemValue = Object.assign(queuedRetry, itemValue);
   }
   queuedRetries[action].set(itemKey, itemValue);
+  const paramsWithChanges = { ...params, changes: [change] };
   return runWithRetry(
-    params,
+    paramsWithChanges,
     retry,
     "create_" + itemKey,
-    () => actionFn(itemValue, params).then((result) => {
+    () => actionFn(itemValue, paramsWithChanges).then((result) => {
       queuedRetries[action].delete(itemKey);
-      return saveResult(itemKey, itemValue, result, true);
+      return saveResult(itemKey, itemValue, result, true, change);
     })
   );
 }
@@ -177,6 +178,7 @@ function syncedCrud(props) {
     const creates = /* @__PURE__ */ new Map();
     const updates = /* @__PURE__ */ new Map();
     const deletes = /* @__PURE__ */ new Set();
+    const changesById = /* @__PURE__ */ new Map();
     const getUpdateValue = (itemValue, prev) => {
       return updatePartial ? Object.assign(
         diffObjects(
@@ -198,6 +200,7 @@ function syncedCrud(props) {
             id = ensureId(value, fieldId, generateId);
           }
           if (id) {
+            changesById.set(id, change);
             if (pendingCreates.has(id)) {
               isCreate = false;
             }
@@ -227,6 +230,7 @@ function syncedCrud(props) {
           }
         } else if (path.length === 0) {
           deletes.add(prevAtPath);
+          changesById.set(prevAtPath[fieldId], change);
         }
       } else {
         let itemsChanged = [];
@@ -251,6 +255,7 @@ function syncedCrud(props) {
           if (!itemValue) {
             if (path.length === 1 && prevAtPath) {
               deletes.add(prevAtPath);
+              changesById.set(prevAtPath[fieldId], change);
             }
           } else {
             const previous = setAtPath(
@@ -272,17 +277,18 @@ function syncedCrud(props) {
               console.error("[legend-state]: added item without an id");
             }
             if (createFn) {
-              pendingCreates.add(item[fieldId]);
-              creates.set(item[fieldId], item);
+              const id = item[fieldId];
+              changesById.set(id, change);
+              pendingCreates.add(id);
+              creates.set(id, item);
             } else {
               console.warn("[legend-state] missing create function");
             }
           } else {
             if (updateFn) {
-              updates.set(
-                item[fieldId],
-                updates.has(item[fieldId]) ? Object.assign(updates.get(item[fieldId]), item) : item
-              );
+              const id = item[fieldId];
+              changesById.set(id, change);
+              updates.set(id, updates.has(id) ? Object.assign(updates.get(id), item) : item);
             } else {
               console.warn("[legend-state] missing update function");
             }
@@ -290,7 +296,7 @@ function syncedCrud(props) {
         });
       }
     });
-    const saveResult = async (itemKey, input, data, isCreate) => {
+    const saveResult = async (itemKey, input, data, isCreate, change) => {
       var _a;
       if (data) {
         let saved = (transform == null ? void 0 : transform.load) ? await transform.load(data, "set") : data;
@@ -317,7 +323,7 @@ function syncedCrud(props) {
             if (
               // value is already the new value, can ignore
               saved[key] === c || // user has changed local value
-              key !== fieldId && i !== c
+              key !== fieldId && i !== void 0 && i !== c
             ) {
               delete saved[key];
             }
@@ -338,7 +344,8 @@ function syncedCrud(props) {
           if (value2 !== void 0) {
             update({
               value: value2,
-              mode: "merge"
+              mode: "merge",
+              changes: [change]
             });
           }
         }
@@ -351,11 +358,18 @@ function syncedCrud(props) {
           await waitForSet(waitForSetParam, changes, itemValue, { type: "create" });
         }
         const createObj = await transformOut(itemValue, transform == null ? void 0 : transform.save);
-        return retrySet(params, retry, "create", itemKey, createObj, createFn, saveResult).then(
-          () => {
-            pendingCreates.delete(itemKey);
-          }
-        );
+        return retrySet(
+          params,
+          retry,
+          "create",
+          itemKey,
+          createObj,
+          changesById.get(itemKey),
+          createFn,
+          saveResult
+        ).then(() => {
+          pendingCreates.delete(itemKey);
+        });
       }),
       // Handle updates
       ...Array.from(updates).map(async ([itemKey, itemValue]) => {
@@ -364,7 +378,16 @@ function syncedCrud(props) {
         }
         const changed = await transformOut(itemValue, transform == null ? void 0 : transform.save);
         if (Object.keys(changed).length > 0) {
-          return retrySet(params, retry, "update", itemKey, changed, updateFn, saveResult);
+          return retrySet(
+            params,
+            retry,
+            "update",
+            itemKey,
+            changed,
+            changesById.get(itemKey),
+            updateFn,
+            saveResult
+          );
         }
       }),
       // Handle deletes
@@ -372,8 +395,8 @@ function syncedCrud(props) {
         if (waitForSetParam) {
           await waitForSet(waitForSetParam, changes, valuePrevious, { type: "delete" });
         }
-        const valueId = valuePrevious[fieldId];
-        if (!valueId) {
+        const itemKey = valuePrevious[fieldId];
+        if (!itemKey) {
           console.error("[legend-state]: deleting item without an id");
           return;
         }
@@ -382,8 +405,9 @@ function syncedCrud(props) {
             params,
             retry,
             "delete",
-            valueId,
+            itemKey,
             valuePrevious,
+            changesById.get(itemKey),
             deleteFn,
             saveResult
           );
@@ -393,8 +417,9 @@ function syncedCrud(props) {
             params,
             retry,
             "delete",
-            valueId,
-            { [fieldId]: valueId, [fieldDeleted]: true },
+            itemKey,
+            { [fieldId]: itemKey, [fieldDeleted]: true },
+            changesById.get(itemKey),
             updateFn,
             saveResult
           );

package/sync-plugins/keel.d.mts

@@ -13,6 +13,7 @@ type APIError = {
     type: string;
     message: string;
     requestId?: string;
+    error?: Error;
 };
 type APIResult<T> = Result<T, APIError>;
 type Data<T> = {

package/sync-plugins/keel.d.ts

@@ -13,6 +13,7 @@ type APIError = {
     type: string;
     message: string;
     requestId?: string;
+    error?: Error;
 };
 type APIResult<T> = Result<T, APIError>;
 type Data<T> = {

package/sync-plugins/keel.js

@@ -54,11 +54,14 @@ async function ensureAuthToken(props, force) {
   return isAuthed;
 }
 async function handleApiError(props, error) {
+  var _a;
   if (error.type === "unauthorized" || error.type === "forbidden") {
     console.warn("Keel token expired, refreshing...");
     isAuthed$.set(false);
     await ensureAuthToken(props);
     return true;
+  } else if (((_a = error.error) == null ? void 0 : _a.message) === "Failed to fetch") {
+    throw error.error;
   }
   return false;
 }

package/sync-plugins/keel.mjs

@@ -48,11 +48,14 @@ async function ensureAuthToken(props, force) {
   return isAuthed;
 }
 async function handleApiError(props, error) {
+  var _a;
   if (error.type === "unauthorized" || error.type === "forbidden") {
     console.warn("Keel token expired, refreshing...");
     isAuthed$.set(false);
     await ensureAuthToken(props);
     return true;
+  } else if (((_a = error.error) == null ? void 0 : _a.message) === "Failed to fetch") {
+    throw error.error;
   }
   return false;
 }

package/sync-plugins/supabase.js

@@ -33,6 +33,14 @@ function wrapSupabaseFn(fn, source) {
     return data;
   };
 }
+function handleSupabaseError(error, onError, params) {
+  var _a;
+  if ((_a = error.message) == null ? void 0 : _a.includes("Failed to fetch")) {
+    throw error;
+  } else {
+    onError(new Error(error.message), params);
+  }
+}
 function syncedSupabase(props) {
   props = { ...supabaseConfig, ...props };
   const {
@@ -87,7 +95,7 @@ function syncedSupabase(props) {
     if (data) {
       return data || [];
     } else if (error) {
-      onError(new Error(error.message), {
+      handleSupabaseError(error, onError, {
         getParams: params,
         source: "list",
         type: "get",
@@ -104,7 +112,7 @@ function syncedSupabase(props) {
       const created = data[0];
       return created;
     } else if (error) {
-      onError(new Error(error.message), {
+      handleSupabaseError(error, onError, {
         setParams: params,
         source: "create",
         type: "set",
@@ -122,7 +130,7 @@ function syncedSupabase(props) {
       const created = data[0];
       return created;
     } else if (error) {
-      onError(new Error(error.message), {
+      handleSupabaseError(error, onError, {
         setParams: params,
         source: "update",
         type: "set",
@@ -141,7 +149,7 @@ function syncedSupabase(props) {
       const created = data[0];
       return created;
     } else if (error) {
-      onError(new Error(error.message), {
+      handleSupabaseError(error, onError, {
         setParams: params,
         source: "delete",
         type: "set",

package/sync-plugins/supabase.mjs

@@ -31,6 +31,14 @@ function wrapSupabaseFn(fn, source) {
     return data;
   };
 }
+function handleSupabaseError(error, onError, params) {
+  var _a;
+  if ((_a = error.message) == null ? void 0 : _a.includes("Failed to fetch")) {
+    throw error;
+  } else {
+    onError(new Error(error.message), params);
+  }
+}
 function syncedSupabase(props) {
   props = { ...supabaseConfig, ...props };
   const {
@@ -85,7 +93,7 @@ function syncedSupabase(props) {
     if (data) {
       return data || [];
     } else if (error) {
-      onError(new Error(error.message), {
+      handleSupabaseError(error, onError, {
         getParams: params,
         source: "list",
         type: "get",
@@ -102,7 +110,7 @@ function syncedSupabase(props) {
       const created = data[0];
       return created;
     } else if (error) {
-      onError(new Error(error.message), {
+      handleSupabaseError(error, onError, {
         setParams: params,
         source: "create",
         type: "set",
@@ -120,7 +128,7 @@ function syncedSupabase(props) {
       const created = data[0];
       return created;
     } else if (error) {
-      onError(new Error(error.message), {
+      handleSupabaseError(error, onError, {
         setParams: params,
         source: "update",
         type: "set",
@@ -139,7 +147,7 @@ function syncedSupabase(props) {
       const created = data[0];
       return created;
     } else if (error) {
-      onError(new Error(error.message), {
+      handleSupabaseError(error, onError, {
         setParams: params,
         source: "delete",
         type: "set",

package/sync.js

@@ -287,10 +287,10 @@ function updateMetadata(value$, localState, syncState2, syncOptions, newMetadata
   if (localState.timeoutSaveMetadata) {
     clearTimeout(localState.timeoutSaveMetadata);
   }
-  localState.timeoutSaveMetadata = setTimeout(
-    () => updateMetadataImmediate(value$, localState, syncState2, syncOptions, newMetadata),
-    0
-  );
+  metadatas.set(value$, { ...metadatas.get(value$) || {}, ...newMetadata });
+  localState.timeoutSaveMetadata = setTimeout(() => {
+    updateMetadataImmediate(value$, localState, syncState2, syncOptions, metadatas.get(value$));
+  }, 0);
 }
 var _queuedChanges = [];
 var _queuedRemoteChanges = /* @__PURE__ */ new Map();
@@ -635,10 +635,11 @@ async function doChangeRemote(changeInfo) {
         onError: onSetError,
         update: (params) => {
           if (updateResult) {
-            const { value: value2, mode } = params;
+            const { value: value2, mode, changes } = params;
             updateResult = {
               value: deepMerge(updateResult.value, value2),
-              mode
+              mode,
+              changes: changes ? [...updateResult.changes || [], ...changes] : updateResult.changes
             };
           } else {
             updateResult = params;
@@ -660,9 +661,11 @@ async function doChangeRemote(changeInfo) {
           }
         });
       }
-      if (!didError) {
-        const pathStrs = Array.from(new Set(changesRemote.map((change) => change.pathStr)));
-        const { value: changes } = updateResult || {};
+      if (!didError || (updateResult == null ? void 0 : updateResult.changes)) {
+        const { value: updateValue, changes: updateChanges = changesRemote } = updateResult || {};
+        const pathStrs = Array.from(
+          new Set(updateChanges.map((change) => change.pathStr))
+        );
         if (pathStrs.length > 0) {
           let transformedChanges = void 0;
           const metadata = {};
@@ -680,8 +683,8 @@ async function doChangeRemote(changeInfo) {
               }
             }
           }
-          if (changes && !state.isEmpty(changes)) {
-            transformedChanges = transformLoadData(changes, syncOptions, false, "set");
+          if (updateValue && !state.isEmpty(updateValue)) {
+            transformedChanges = transformLoadData(updateValue, syncOptions, false, "set");
           }
           if (transformedChanges !== void 0) {
             if (state.isPromise(transformedChanges)) {

package/sync.mjs

@@ -285,10 +285,10 @@ function updateMetadata(value$, localState, syncState2, syncOptions, newMetadata
   if (localState.timeoutSaveMetadata) {
     clearTimeout(localState.timeoutSaveMetadata);
   }
-  localState.timeoutSaveMetadata = setTimeout(
-    () => updateMetadataImmediate(value$, localState, syncState2, syncOptions, newMetadata),
-    0
-  );
+  metadatas.set(value$, { ...metadatas.get(value$) || {}, ...newMetadata });
+  localState.timeoutSaveMetadata = setTimeout(() => {
+    updateMetadataImmediate(value$, localState, syncState2, syncOptions, metadatas.get(value$));
+  }, 0);
 }
 var _queuedChanges = [];
 var _queuedRemoteChanges = /* @__PURE__ */ new Map();
@@ -633,10 +633,11 @@ async function doChangeRemote(changeInfo) {
         onError: onSetError,
         update: (params) => {
           if (updateResult) {
-            const { value: value2, mode } = params;
+            const { value: value2, mode, changes } = params;
             updateResult = {
               value: deepMerge(updateResult.value, value2),
-              mode
+              mode,
+              changes: changes ? [...updateResult.changes || [], ...changes] : updateResult.changes
             };
           } else {
             updateResult = params;
@@ -658,9 +659,11 @@ async function doChangeRemote(changeInfo) {
           }
         });
       }
-      if (!didError) {
-        const pathStrs = Array.from(new Set(changesRemote.map((change) => change.pathStr)));
-        const { value: changes } = updateResult || {};
+      if (!didError || (updateResult == null ? void 0 : updateResult.changes)) {
+        const { value: updateValue, changes: updateChanges = changesRemote } = updateResult || {};
+        const pathStrs = Array.from(
+          new Set(updateChanges.map((change) => change.pathStr))
+        );
         if (pathStrs.length > 0) {
           let transformedChanges = void 0;
           const metadata = {};
@@ -678,8 +681,8 @@ async function doChangeRemote(changeInfo) {
               }
             }
           }
-          if (changes && !isEmpty(changes)) {
-            transformedChanges = transformLoadData(changes, syncOptions, false, "set");
+          if (updateValue && !isEmpty(updateValue)) {
+            transformedChanges = transformLoadData(updateValue, syncOptions, false, "set");
           }
           if (transformedChanges !== void 0) {
             if (isPromise$1(transformedChanges)) {