npm - @legendapp/state - Versions diffs - 3.0.0-alpha.40 → 3.0.0-alpha.42 - Mend

@legendapp/state 3.0.0-alpha.40 → 3.0.0-alpha.42

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/state",
-  "version": "3.0.0-alpha.40",
+  "version": "3.0.0-alpha.42",
   "description": "legend-state",
   "sideEffects": false,
   "private": false,

package/sync-plugins/keel.js CHANGED Viewed

@@ -261,15 +261,17 @@ function syncedKeel(props) {
   if (realtime) {
     setupRealtime(props);
   }
-  const subscribe = subscribeParam || (realtime ? (params) => {
+  const subscribe = realtime ? (params) => {
     let unsubscribe = void 0;
     state.when(subscribeFnKey$, () => {
       unsubscribe = subscribeFn(params);
     });
+    const unsubscribeParam = subscribeParam == null ? void 0 : subscribeParam(params);
     return () => {
       unsubscribe == null ? void 0 : unsubscribe();
+      unsubscribeParam == null ? void 0 : unsubscribeParam();
     };
-  } : void 0);
+  } : subscribeParam;
   return crud.syncedCrud({
     ...rest,
     as: asType,

package/sync-plugins/keel.mjs CHANGED Viewed

@@ -255,15 +255,17 @@ function syncedKeel(props) {
   if (realtime) {
     setupRealtime(props);
   }
-  const subscribe = subscribeParam || (realtime ? (params) => {
+  const subscribe = realtime ? (params) => {
     let unsubscribe = void 0;
     when(subscribeFnKey$, () => {
       unsubscribe = subscribeFn(params);
     });
+    const unsubscribeParam = subscribeParam == null ? void 0 : subscribeParam(params);
     return () => {
       unsubscribe == null ? void 0 : unsubscribe();
+      unsubscribeParam == null ? void 0 : unsubscribeParam();
     };
-  } : void 0);
+  } : subscribeParam;
   return syncedCrud({
     ...rest,
     as: asType,

package/sync.js CHANGED Viewed

@@ -162,43 +162,47 @@ function createRetryTimeout(retryOptions, retryNum, fn) {
 }
 var mapRetryTimeouts = /* @__PURE__ */ new Map();
 function runWithRetry(state, retryOptions, fn, onError) {
-  let value = fn(state);
-  if (isPromise(value) && retryOptions) {
-    let timeoutRetry;
-    if (mapRetryTimeouts.has(state.node)) {
-      clearTimeout(mapRetryTimeouts.get(state.node));
-    }
-    return new Promise((resolve, reject) => {
-      const run = () => {
-        value.then((val) => {
-          resolve(val);
-        }).catch((error) => {
-          state.retryNum++;
-          if (timeoutRetry) {
-            clearTimeout(timeoutRetry);
-          }
-          if (onError) {
-            onError(error, state);
-          }
-          if (!state.cancelRetry) {
-            const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
-              value = fn(state);
-              run();
-            });
-            if (timeout === false) {
-              state.cancelRetry = true;
-              reject(error);
-            } else {
-              mapRetryTimeouts.set(state.node, timeout);
-              timeoutRetry = timeout;
+  try {
+    let value = fn(state);
+    if (isPromise(value) && retryOptions) {
+      let timeoutRetry;
+      if (mapRetryTimeouts.has(state.node)) {
+        clearTimeout(mapRetryTimeouts.get(state.node));
+      }
+      return new Promise((resolve, reject) => {
+        const run = () => {
+          value.then((val) => {
+            resolve(val);
+          }).catch((error) => {
+            state.retryNum++;
+            if (timeoutRetry) {
+              clearTimeout(timeoutRetry);
             }
-          }
-        });
-      };
-      run();
-    });
+            if (onError) {
+              onError(error, state);
+            }
+            if (!state.cancelRetry) {
+              const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
+                value = fn(state);
+                run();
+              });
+              if (timeout === false) {
+                state.cancelRetry = true;
+                reject(error);
+              } else {
+                mapRetryTimeouts.set(state.node, timeout);
+                timeoutRetry = timeout;
+              }
+            }
+          });
+        };
+        run();
+      });
+    }
+    return value;
+  } catch (error) {
+    return Promise.reject(error);
   }
-  return value;
 }
 async function waitForSet(waitForSet2, changes, value, params = {}) {
   const waitFn = state.isFunction(waitForSet2) ? waitForSet2({ changes, value, ...params }) : waitForSet2;
@@ -1051,7 +1055,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
               });
             };
             if (state.isPromise(got)) {
-              got.then(handle);
+              got.then(handle).catch(onError);
             } else {
               handle(got);
             }

package/sync.mjs CHANGED Viewed

@@ -160,43 +160,47 @@ function createRetryTimeout(retryOptions, retryNum, fn) {
 }
 var mapRetryTimeouts = /* @__PURE__ */ new Map();
 function runWithRetry(state, retryOptions, fn, onError) {
-  let value = fn(state);
-  if (isPromise(value) && retryOptions) {
-    let timeoutRetry;
-    if (mapRetryTimeouts.has(state.node)) {
-      clearTimeout(mapRetryTimeouts.get(state.node));
-    }
-    return new Promise((resolve, reject) => {
-      const run = () => {
-        value.then((val) => {
-          resolve(val);
-        }).catch((error) => {
-          state.retryNum++;
-          if (timeoutRetry) {
-            clearTimeout(timeoutRetry);
-          }
-          if (onError) {
-            onError(error, state);
-          }
-          if (!state.cancelRetry) {
-            const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
-              value = fn(state);
-              run();
-            });
-            if (timeout === false) {
-              state.cancelRetry = true;
-              reject(error);
-            } else {
-              mapRetryTimeouts.set(state.node, timeout);
-              timeoutRetry = timeout;
+  try {
+    let value = fn(state);
+    if (isPromise(value) && retryOptions) {
+      let timeoutRetry;
+      if (mapRetryTimeouts.has(state.node)) {
+        clearTimeout(mapRetryTimeouts.get(state.node));
+      }
+      return new Promise((resolve, reject) => {
+        const run = () => {
+          value.then((val) => {
+            resolve(val);
+          }).catch((error) => {
+            state.retryNum++;
+            if (timeoutRetry) {
+              clearTimeout(timeoutRetry);
             }
-          }
-        });
-      };
-      run();
-    });
+            if (onError) {
+              onError(error, state);
+            }
+            if (!state.cancelRetry) {
+              const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
+                value = fn(state);
+                run();
+              });
+              if (timeout === false) {
+                state.cancelRetry = true;
+                reject(error);
+              } else {
+                mapRetryTimeouts.set(state.node, timeout);
+                timeoutRetry = timeout;
+              }
+            }
+          });
+        };
+        run();
+      });
+    }
+    return value;
+  } catch (error) {
+    return Promise.reject(error);
   }
-  return value;
 }
 async function waitForSet(waitForSet2, changes, value, params = {}) {
   const waitFn = isFunction(waitForSet2) ? waitForSet2({ changes, value, ...params }) : waitForSet2;
@@ -1049,7 +1053,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
               });
             };
             if (isPromise$1(got)) {
-              got.then(handle);
+              got.then(handle).catch(onError);
             } else {
               handle(got);
             }