@legendapp/state 3.0.0-beta.43 → 3.0.0-beta.44

package/config/enableReactComponents.d.mts

@@ -1,4 +1,5 @@
 import { FCReactiveObject } from '@legendapp/state/react';
+import { JSX } from 'react';
 
 declare function enableReactComponents(): void;
 declare module '@legendapp/state/react' {

package/config/enableReactComponents.d.ts

@@ -1,4 +1,5 @@
 import { FCReactiveObject } from '@legendapp/state/react';
+import { JSX } from 'react';
 
 declare function enableReactComponents(): void;
 declare module '@legendapp/state/react' {

package/config/enableReactNativeComponents.d.mts

@@ -1,3 +1,4 @@
+import { JSX } from 'react';
 import { FCReactiveObject, FCReactive } from '@legendapp/state/react';
 import { ActivityIndicator, ActivityIndicatorProps, Button, ButtonProps, FlatList, FlatListProps, Image, ImageProps, Pressable, PressableProps, ScrollView, ScrollViewProps, SectionList, SectionListProps, Switch, SwitchProps, Text, TextProps, TextInput, TextInputProps, TouchableWithoutFeedback, TouchableWithoutFeedbackProps, View, ViewProps } from 'react-native';
 

package/config/enableReactNativeComponents.d.ts

@@ -1,3 +1,4 @@
+import { JSX } from 'react';
 import { FCReactiveObject, FCReactive } from '@legendapp/state/react';
 import { ActivityIndicator, ActivityIndicatorProps, Button, ButtonProps, FlatList, FlatListProps, Image, ImageProps, Pressable, PressableProps, ScrollView, ScrollViewProps, SectionList, SectionListProps, Switch, SwitchProps, Text, TextProps, TextInput, TextInputProps, TouchableWithoutFeedback, TouchableWithoutFeedbackProps, View, ViewProps } from 'react-native';
 

package/package.json

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

package/react-hooks/createObservableHook.js

@@ -29,7 +29,7 @@ function createObservableHook(fn) {
   const _useState = React__default.default.useState;
   const _useReducer = React__default.default.useReducer;
   return function(...args) {
-    const refObs = React__default.default.useRef();
+    const refObs = React__default.default.useRef(void 0);
     overrideHooks(refObs);
     fn(...args);
     React__default.default.useState = _useState;

package/react-hooks/createObservableHook.mjs

@@ -23,7 +23,7 @@ function createObservableHook(fn) {
   const _useState = React.useState;
   const _useReducer = React.useReducer;
   return function(...args) {
-    const refObs = React.useRef();
+    const refObs = React.useRef(void 0);
     overrideHooks(refObs);
     fn(...args);
     React.useState = _useState;

package/react-reactive/enableReactComponents.d.mts

@@ -1,4 +1,5 @@
 import { FCReactiveObject, configureReactive } from '@legendapp/state/react';
+import { JSX } from 'react';
 
 declare function enableReactComponents_(config: typeof configureReactive): void;
 

package/react-reactive/enableReactComponents.d.ts

@@ -1,4 +1,5 @@
 import { FCReactiveObject, configureReactive } from '@legendapp/state/react';
+import { JSX } from 'react';
 
 declare function enableReactComponents_(config: typeof configureReactive): void;
 

package/react.d.mts

@@ -71,18 +71,20 @@ declare function Switch<T>({ value, children, }: {
     children: Partial<Record<'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+type ValueOfUnionKey$1<P, K extends PropertyKey> = P extends any ? (K extends keyof P ? P[K] : never) : never;
 type ShapeWithNew$<T> = Partial<Omit<T, 'children'>> & {
     [K in keyof T as K extends `$${string & K}` ? K : `$${string & K}`]?: Selector<T[K]>;
 } & {
     children?: Selector<ReactNode>;
 };
-interface BindKey<P, K extends keyof P = keyof P> {
+interface BindKey<P, K extends KeysOfUnion<P> = KeysOfUnion<P>> {
     handler?: K;
-    getValue?: P[K] extends infer T ? T extends (...args: any) => any ? (params: Parameters<T>[0]) => any : (e: any) => any : (e: any) => any;
+    getValue?: ValueOfUnionKey$1<P, K> extends infer T ? T extends (...args: any) => any ? (params: Parameters<T>[0]) => any : (e: any) => any : (e: any) => any;
     defaultValue?: any;
     selector?: (propsOut: Record<string, any>, p: Observable<any>) => any;
 }
-type BindKeys<P = any, K extends keyof P = keyof P> = Partial<Record<K, BindKey<P>>>;
+type BindKeys<P = any, K extends KeysOfUnion<P> = KeysOfUnion<P>> = Partial<Record<K, BindKey<P, K>>>;
 type FCReactiveObject<T> = {
     [K in keyof T]: FC<ShapeWithNew$<T[K]>>;
 };
@@ -109,23 +111,24 @@ type ShapeWith$<T> = WithSelectorChildren<Partial<T>> & {
 type ObjectShapeWith$<T> = {
     [K in keyof T]: T[K] extends FC<infer P> ? FC<ShapeWith$<P>> : T[K];
 };
-type ReactifyProps<T, K extends keyof T> = T & {
-    [P in K as `$${string & P}`]?: Selector<T[P]>;
+type ValueOfUnionKey<T, K extends PropertyKey> = T extends any ? (K extends keyof T ? T[K] : never) : never;
+type ReactifyProps<T, K extends KeysOfUnion<T>> = T & {
+    [P in K as `$${string & P}`]?: Selector<ValueOfUnionKey<T, P>>;
 };
 declare const hasSymbol: false | ((key: string) => symbol);
 declare function observer<P extends FC<any>>(component: P): P;
 declare function reactive<T extends object>(component: React.ComponentClass<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
 declare function reactive<T extends object>(component: React.FC<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
 declare function reactive<T extends object>(component: React.ForwardRefExoticComponent<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
-declare function reactive<T extends object, K extends keyof T>(component: React.FC<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
-declare function reactive<T extends object, K extends keyof T>(component: React.ForwardRefExoticComponent<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
+declare function reactive<T extends object, K extends KeysOfUnion<T>>(component: React.FC<T>, keys: K[] | KeysOfUnion<T>[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
+declare function reactive<T extends object, K extends KeysOfUnion<T>>(component: React.ForwardRefExoticComponent<T>, keys: K[] | KeysOfUnion<T>[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
 declare function reactive<T extends object>(component: React.ComponentClass<T>): React.ComponentClass<ShapeWith$<T>>;
 declare function reactive<T extends object>(component: React.FC<T>): React.FC<ShapeWith$<T>>;
 declare function reactive<T extends object>(component: React.ForwardRefExoticComponent<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
 declare function reactiveObserver<T extends object>(component: React.FC<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
 declare function reactiveObserver<T extends object>(component: React.ForwardRefExoticComponent<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
-declare function reactiveObserver<T extends object, K extends keyof T>(component: React.FC<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
-declare function reactiveObserver<T extends object, K extends keyof T>(component: React.ForwardRefExoticComponent<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
+declare function reactiveObserver<T extends object, K extends KeysOfUnion<T>>(component: React.FC<T>, keys: K[] | KeysOfUnion<T>[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
+declare function reactiveObserver<T extends object, K extends KeysOfUnion<T>>(component: React.ForwardRefExoticComponent<T>, keys: K[] | KeysOfUnion<T>[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
 declare function reactiveObserver<T extends object>(component: React.FC<T>): React.FC<ShapeWith$<T>>;
 declare function reactiveObserver<T extends object>(component: React.ForwardRefExoticComponent<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
 declare function reactiveComponents<P extends Record<string, any>>(components: P): ObjectShapeWith$<P>;
@@ -192,4 +195,4 @@ declare function configureReactive({ components, binders, }: {
     binders?: Record<string, BindKeys>;
 }): void;
 
-export { type BindKey, type BindKeys, Computed, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useObservable as useLocalObservable, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useSelector as useValue, useWhen, useWhenReady };
+export { type BindKey, type BindKeys, Computed, type FCReactive, type FCReactiveObject, For, type IReactive, type KeysOfUnion, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useObservable as useLocalObservable, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useSelector as useValue, useWhen, useWhenReady };

package/react.d.ts

@@ -71,18 +71,20 @@ declare function Switch<T>({ value, children, }: {
     children: Partial<Record<'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+type ValueOfUnionKey$1<P, K extends PropertyKey> = P extends any ? (K extends keyof P ? P[K] : never) : never;
 type ShapeWithNew$<T> = Partial<Omit<T, 'children'>> & {
     [K in keyof T as K extends `$${string & K}` ? K : `$${string & K}`]?: Selector<T[K]>;
 } & {
     children?: Selector<ReactNode>;
 };
-interface BindKey<P, K extends keyof P = keyof P> {
+interface BindKey<P, K extends KeysOfUnion<P> = KeysOfUnion<P>> {
     handler?: K;
-    getValue?: P[K] extends infer T ? T extends (...args: any) => any ? (params: Parameters<T>[0]) => any : (e: any) => any : (e: any) => any;
+    getValue?: ValueOfUnionKey$1<P, K> extends infer T ? T extends (...args: any) => any ? (params: Parameters<T>[0]) => any : (e: any) => any : (e: any) => any;
     defaultValue?: any;
     selector?: (propsOut: Record<string, any>, p: Observable<any>) => any;
 }
-type BindKeys<P = any, K extends keyof P = keyof P> = Partial<Record<K, BindKey<P>>>;
+type BindKeys<P = any, K extends KeysOfUnion<P> = KeysOfUnion<P>> = Partial<Record<K, BindKey<P, K>>>;
 type FCReactiveObject<T> = {
     [K in keyof T]: FC<ShapeWithNew$<T[K]>>;
 };
@@ -109,23 +111,24 @@ type ShapeWith$<T> = WithSelectorChildren<Partial<T>> & {
 type ObjectShapeWith$<T> = {
     [K in keyof T]: T[K] extends FC<infer P> ? FC<ShapeWith$<P>> : T[K];
 };
-type ReactifyProps<T, K extends keyof T> = T & {
-    [P in K as `$${string & P}`]?: Selector<T[P]>;
+type ValueOfUnionKey<T, K extends PropertyKey> = T extends any ? (K extends keyof T ? T[K] : never) : never;
+type ReactifyProps<T, K extends KeysOfUnion<T>> = T & {
+    [P in K as `$${string & P}`]?: Selector<ValueOfUnionKey<T, P>>;
 };
 declare const hasSymbol: false | ((key: string) => symbol);
 declare function observer<P extends FC<any>>(component: P): P;
 declare function reactive<T extends object>(component: React.ComponentClass<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
 declare function reactive<T extends object>(component: React.FC<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
 declare function reactive<T extends object>(component: React.ForwardRefExoticComponent<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
-declare function reactive<T extends object, K extends keyof T>(component: React.FC<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
-declare function reactive<T extends object, K extends keyof T>(component: React.ForwardRefExoticComponent<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
+declare function reactive<T extends object, K extends KeysOfUnion<T>>(component: React.FC<T>, keys: K[] | KeysOfUnion<T>[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
+declare function reactive<T extends object, K extends KeysOfUnion<T>>(component: React.ForwardRefExoticComponent<T>, keys: K[] | KeysOfUnion<T>[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
 declare function reactive<T extends object>(component: React.ComponentClass<T>): React.ComponentClass<ShapeWith$<T>>;
 declare function reactive<T extends object>(component: React.FC<T>): React.FC<ShapeWith$<T>>;
 declare function reactive<T extends object>(component: React.ForwardRefExoticComponent<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
 declare function reactiveObserver<T extends object>(component: React.FC<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
 declare function reactiveObserver<T extends object>(component: React.ForwardRefExoticComponent<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
-declare function reactiveObserver<T extends object, K extends keyof T>(component: React.FC<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
-declare function reactiveObserver<T extends object, K extends keyof T>(component: React.ForwardRefExoticComponent<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
+declare function reactiveObserver<T extends object, K extends KeysOfUnion<T>>(component: React.FC<T>, keys: K[] | KeysOfUnion<T>[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
+declare function reactiveObserver<T extends object, K extends KeysOfUnion<T>>(component: React.ForwardRefExoticComponent<T>, keys: K[] | KeysOfUnion<T>[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
 declare function reactiveObserver<T extends object>(component: React.FC<T>): React.FC<ShapeWith$<T>>;
 declare function reactiveObserver<T extends object>(component: React.ForwardRefExoticComponent<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
 declare function reactiveComponents<P extends Record<string, any>>(components: P): ObjectShapeWith$<P>;
@@ -192,4 +195,4 @@ declare function configureReactive({ components, binders, }: {
     binders?: Record<string, BindKeys>;
 }): void;
 
-export { type BindKey, type BindKeys, Computed, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useObservable as useLocalObservable, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useSelector as useValue, useWhen, useWhenReady };
+export { type BindKey, type BindKeys, Computed, type FCReactive, type FCReactiveObject, For, type IReactive, type KeysOfUnion, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useObservable as useLocalObservable, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useSelector as useValue, useWhen, useWhenReady };

package/react.js

@@ -286,7 +286,9 @@ function For({
     return null;
   const value = useSelector(() => each.get(isOptimized ? optimized : true));
   if (!item && children) {
-    const refChildren = React.useRef();
+    const refChildren = React.useRef(
+      void 0
+    );
     refChildren.current = children;
     item = React.useMemo(() => observer(({ item$, id }) => refChildren.current(item$, id)), []);
   } else {

package/react.mjs

@@ -280,7 +280,9 @@ function For({
     return null;
   const value = useSelector(() => each.get(isOptimized ? optimized : true));
   if (!item && children) {
-    const refChildren = useRef();
+    const refChildren = useRef(
+      void 0
+    );
     refChildren.current = children;
     item = useMemo(() => observer(({ item$, id }) => refChildren.current(item$, id)), []);
   } else {

package/sync-plugins/crud.js

@@ -18,11 +18,21 @@ function ensureId(obj, fieldId, generateId, node) {
   }
 }
 function computeLastSync(data, fieldUpdatedAt, fieldCreatedAt) {
+  if (!state.isArray(data) || data.length === 0) {
+    return 0;
+  }
   let newLastSync = 0;
   for (let i = 0; i < data.length; i++) {
-    const updated = (fieldUpdatedAt ? data[i][fieldUpdatedAt] : 0) || (fieldCreatedAt ? data[i][fieldCreatedAt] : 0);
+    const row = data[i];
+    if (!row || typeof row !== "object") {
+      continue;
+    }
+    const updated = (fieldUpdatedAt ? row[fieldUpdatedAt] : 0) || (fieldCreatedAt ? row[fieldCreatedAt] : 0);
     if (updated) {
-      newLastSync = Math.max(newLastSync, +new Date(updated));
+      const updatedTime = +new Date(updated);
+      if (!Number.isNaN(updatedTime)) {
+        newLastSync = Math.max(newLastSync, updatedTime);
+      }
     }
   }
   return newLastSync;

package/sync-plugins/crud.mjs

@@ -16,11 +16,21 @@ function ensureId(obj, fieldId, generateId, node) {
   }
 }
 function computeLastSync(data, fieldUpdatedAt, fieldCreatedAt) {
+  if (!isArray(data) || data.length === 0) {
+    return 0;
+  }
   let newLastSync = 0;
   for (let i = 0; i < data.length; i++) {
-    const updated = (fieldUpdatedAt ? data[i][fieldUpdatedAt] : 0) || (fieldCreatedAt ? data[i][fieldCreatedAt] : 0);
+    const row = data[i];
+    if (!row || typeof row !== "object") {
+      continue;
+    }
+    const updated = (fieldUpdatedAt ? row[fieldUpdatedAt] : 0) || (fieldCreatedAt ? row[fieldCreatedAt] : 0);
     if (updated) {
-      newLastSync = Math.max(newLastSync, +new Date(updated));
+      const updatedTime = +new Date(updated);
+      if (!Number.isNaN(updatedTime)) {
+        newLastSync = Math.max(newLastSync, updatedTime);
+      }
     }
   }
   return newLastSync;

package/sync-plugins/keel.js

@@ -81,7 +81,7 @@ function setupRealtime(props) {
     modifiedClients.add(client);
     const originalRawRequest = client.client.rawRequest;
     client.client.rawRequest = (action, body) => {
-      if (action.startsWith("list")) {
+      if (action.startsWith("list") || action.startsWith("get")) {
         realtimeState.current = {
           lastAction: action,
           lastParams: body

package/sync-plugins/keel.mjs

@@ -79,7 +79,7 @@ function setupRealtime(props) {
     modifiedClients.add(client);
     const originalRawRequest = client.client.rawRequest;
     client.client.rawRequest = (action, body) => {
-      if (action.startsWith("list")) {
+      if (action.startsWith("list") || action.startsWith("get")) {
         realtimeState.current = {
           lastAction: action,
           lastParams: body

package/sync.d.mts

@@ -46,6 +46,7 @@ interface SyncedSubscribeParams<T = any> extends SyncedGetSetSubscribeBaseParams
     onError: (error: Error) => void;
 }
 interface SyncedErrorParams {
+    syncOptions?: Readonly<SyncedOptions<any>>;
     source: 'get' | 'set' | 'subscribe';
     type: 'get' | 'set';
     retry: OnErrorRetryParams;

package/sync.d.ts

@@ -46,6 +46,7 @@ interface SyncedSubscribeParams<T = any> extends SyncedGetSetSubscribeBaseParams
     onError: (error: Error) => void;
 }
 interface SyncedErrorParams {
+    syncOptions?: Readonly<SyncedOptions<any>>;
     source: 'get' | 'set' | 'subscribe';
     type: 'get' | 'set';
     retry: OnErrorRetryParams;

package/sync.js

@@ -685,6 +685,7 @@ async function doChangeRemote(changeInfo) {
         if (lastErrorHandled !== error) {
           if (!params) {
             params = {
+              syncOptions,
               setParams,
               source: "set",
               type: "set",
@@ -692,6 +693,11 @@ async function doChangeRemote(changeInfo) {
               retry: setParams,
               revert: createRevertChanges(setParams.value$, setParams.changes)
             };
+          } else if (!params.syncOptions) {
+            params = {
+              ...params,
+              syncOptions
+            };
           }
           state$.error.set(error);
           (_a2 = syncOptions.onError) == null ? void 0 : _a2.call(syncOptions, error, params);
@@ -1017,9 +1023,15 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     if (lastErrorHandled !== error) {
       if (!params) {
         params = {
+          syncOptions,
           source: "get",
           type: "get",
-          retry: params
+          retry: { retryNum: 0, cancelRetry: false }
+        };
+      } else if (!params.syncOptions) {
+        params = {
+          ...params,
+          syncOptions
         };
       }
       syncState$.error.set(error);
@@ -1211,6 +1223,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
               refresh: () => state.when(syncState$.isLoaded, callSync),
               onError: (error) => onGetError(error, {
                 source: "subscribe",
+                syncOptions,
                 subscribeParams,
                 type: "get",
                 retry: {}
@@ -1309,7 +1322,11 @@ function syncObservable(obs$, syncOptionsOrSynced) {
             };
             if (state.isPromise(got)) {
               got.then(handle).catch((error) => {
-                onGetError(error, { getParams, source: "get", type: "get", retry: getParams }, true);
+                onGetError(
+                  error,
+                  { getParams, syncOptions, source: "get", type: "get", retry: getParams },
+                  true
+                );
               });
             } else {
               handle(got);

package/sync.mjs

@@ -683,6 +683,7 @@ async function doChangeRemote(changeInfo) {
         if (lastErrorHandled !== error) {
           if (!params) {
             params = {
+              syncOptions,
               setParams,
               source: "set",
               type: "set",
@@ -690,6 +691,11 @@ async function doChangeRemote(changeInfo) {
               retry: setParams,
               revert: createRevertChanges(setParams.value$, setParams.changes)
             };
+          } else if (!params.syncOptions) {
+            params = {
+              ...params,
+              syncOptions
+            };
           }
           state$.error.set(error);
           (_a2 = syncOptions.onError) == null ? void 0 : _a2.call(syncOptions, error, params);
@@ -1015,9 +1021,15 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     if (lastErrorHandled !== error) {
       if (!params) {
         params = {
+          syncOptions,
           source: "get",
           type: "get",
-          retry: params
+          retry: { retryNum: 0, cancelRetry: false }
+        };
+      } else if (!params.syncOptions) {
+        params = {
+          ...params,
+          syncOptions
         };
       }
       syncState$.error.set(error);
@@ -1209,6 +1221,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
               refresh: () => when(syncState$.isLoaded, callSync),
               onError: (error) => onGetError(error, {
                 source: "subscribe",
+                syncOptions,
                 subscribeParams,
                 type: "get",
                 retry: {}
@@ -1307,7 +1320,11 @@ function syncObservable(obs$, syncOptionsOrSynced) {
             };
             if (isPromise$1(got)) {
               got.then(handle).catch((error) => {
-                onGetError(error, { getParams, source: "get", type: "get", retry: getParams }, true);
+                onGetError(
+                  error,
+                  { getParams, syncOptions, source: "get", type: "get", retry: getParams },
+                  true
+                );
               });
             } else {
               handle(got);

package/types/reactive-web.d.ts

@@ -1,5 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import type { IReactive, FCReactiveObject } from '@legendapp/state/react';
+import type { JSX } from 'react';
 
 declare module '@legendapp/state/react' {
     // eslint-disable-next-line @typescript-eslint/no-empty-interface