@legendapp/state 3.0.0-alpha.3 → 3.0.0-alpha.5

package/index.d.mts

@@ -1,5 +1,5 @@
 type Primitive$1 = string | number | boolean | symbol | bigint | undefined | null | Date;
-type ArrayOverrideFnNames = 'find' | 'every' | 'some' | 'filter' | 'reduce' | 'reduceRight' | 'forEach' | 'map' | 'sort';
+type ArrayOverrideFnNames = 'find' | 'findIndex' | 'every' | 'some' | 'filter' | 'reduce' | 'reduceRight' | 'forEach' | 'map' | 'sort';
 type RemoveIndex<T> = {
     [K in keyof T as string extends K ? never : number extends K ? never : K]: T[K];
 };

package/index.d.ts

@@ -1,5 +1,5 @@
 type Primitive$1 = string | number | boolean | symbol | bigint | undefined | null | Date;
-type ArrayOverrideFnNames = 'find' | 'every' | 'some' | 'filter' | 'reduce' | 'reduceRight' | 'forEach' | 'map' | 'sort';
+type ArrayOverrideFnNames = 'find' | 'findIndex' | 'every' | 'some' | 'filter' | 'reduce' | 'reduceRight' | 'forEach' | 'map' | 'sort';
 type RemoveIndex<T> = {
     [K in keyof T as string extends K ? never : number extends K ? never : K]: T[K];
 };

package/package.json

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

package/react.d.mts

@@ -1,5 +1,5 @@
 import * as react from 'react';
-import { ReactNode, ReactElement, FC, LegacyRef, ComponentClass, ReducerWithoutAction, ReducerStateWithoutAction, DispatchWithoutAction, Reducer, ReducerState, Dispatch, ReducerAction } from 'react';
+import { ReactNode, ReactElement, FC, LegacyRef, ComponentClass, DependencyList, ReducerWithoutAction, ReducerStateWithoutAction, DispatchWithoutAction, Reducer, ReducerState, Dispatch, ReducerAction } from 'react';
 import { ObservableParam, Observable, ObservableBoolean, Selector, RecursiveValueOrFunction, ObserveEvent, ObserveOptions, ObserveEventCallback } from '@legendapp/state';
 
 declare function Computed({ children }: {
@@ -110,10 +110,10 @@ declare function reactiveObserver<T extends FC<any>>(component: T, bindKeys?: Bi
 declare function reactiveObserver<T extends FC<any>, T2 extends keyof ExtractFCPropsType<T>>(component: T, bindKeys?: BindKeys<ExtractFCPropsType<T>>): T | FC<ShapeWithPick$<ExtractFCPropsType<T>, T2>>;
 declare function reactiveComponents<P extends Record<string, FC>>(components: P): ObjectShapeWith$<P>;
 
-declare function useComputed<T>(compute: () => T | Promise<T>): Observable<T>;
-declare function useComputed<T>(compute: () => T | Promise<T>, deps: any[]): Observable<T>;
-declare function useComputed<T, T2 = T>(compute: (() => T | Promise<T>) | ObservableParam<T>, set: (value: T2) => void): Observable<T>;
-declare function useComputed<T, T2 = T>(compute: (() => T | Promise<T>) | ObservableParam<T>, set: (value: T2) => void, deps: any[]): Observable<T>;
+declare function useComputed<T>(get: () => T | Promise<T>): Observable<T>;
+declare function useComputed<T>(get: () => T | Promise<T>, deps: any[]): Observable<T>;
+declare function useComputed<T, T2 = T>(get: (() => T | Promise<T>) | ObservableParam<T>, set: (value: T2) => void): Observable<T>;
+declare function useComputed<T, T2 = T>(get: (() => T | Promise<T>) | ObservableParam<T>, set: (value: T2) => void, deps: any[]): Observable<T>;
 
 declare const useEffectOnce: (effect: () => void | (() => void), deps: any[]) => void;
 
@@ -130,9 +130,9 @@ declare const useMountOnce: typeof useMount;
  * @see https://www.legendapp.com/dev/state/react/#useObservable
  */
 declare function useObservable<T>(): Observable<T | undefined>;
-declare function useObservable<T>(value: Promise<RecursiveValueOrFunction<T>> | (() => RecursiveValueOrFunction<T>) | RecursiveValueOrFunction<T>): Observable<T>;
-declare function useObservable<T>(value: T): Observable<T>;
-declare function useObservable<T>(value?: T): Observable<any>;
+declare function useObservable<T>(value: Promise<RecursiveValueOrFunction<T>> | (() => RecursiveValueOrFunction<T>) | RecursiveValueOrFunction<T>, deps?: DependencyList): Observable<T>;
+declare function useObservable<T>(value: T, deps?: DependencyList): Observable<T>;
+declare function useObservable<T>(value?: T, deps?: DependencyList): Observable<any>;
 
 declare function useObservableReducer<R extends ReducerWithoutAction<any>, I>(reducer: R, initializerArg: I, initializer: (arg: I) => ReducerStateWithoutAction<R>): [Observable<ReducerStateWithoutAction<R>>, DispatchWithoutAction];
 declare function useObservableReducer<R extends ReducerWithoutAction<any>>(reducer: R, initializerArg: ReducerStateWithoutAction<R>, initializer?: undefined): [Observable<ReducerStateWithoutAction<R>>, DispatchWithoutAction];

package/react.d.ts

@@ -1,5 +1,5 @@
 import * as react from 'react';
-import { ReactNode, ReactElement, FC, LegacyRef, ComponentClass, ReducerWithoutAction, ReducerStateWithoutAction, DispatchWithoutAction, Reducer, ReducerState, Dispatch, ReducerAction } from 'react';
+import { ReactNode, ReactElement, FC, LegacyRef, ComponentClass, DependencyList, ReducerWithoutAction, ReducerStateWithoutAction, DispatchWithoutAction, Reducer, ReducerState, Dispatch, ReducerAction } from 'react';
 import { ObservableParam, Observable, ObservableBoolean, Selector, RecursiveValueOrFunction, ObserveEvent, ObserveOptions, ObserveEventCallback } from '@legendapp/state';
 
 declare function Computed({ children }: {
@@ -110,10 +110,10 @@ declare function reactiveObserver<T extends FC<any>>(component: T, bindKeys?: Bi
 declare function reactiveObserver<T extends FC<any>, T2 extends keyof ExtractFCPropsType<T>>(component: T, bindKeys?: BindKeys<ExtractFCPropsType<T>>): T | FC<ShapeWithPick$<ExtractFCPropsType<T>, T2>>;
 declare function reactiveComponents<P extends Record<string, FC>>(components: P): ObjectShapeWith$<P>;
 
-declare function useComputed<T>(compute: () => T | Promise<T>): Observable<T>;
-declare function useComputed<T>(compute: () => T | Promise<T>, deps: any[]): Observable<T>;
-declare function useComputed<T, T2 = T>(compute: (() => T | Promise<T>) | ObservableParam<T>, set: (value: T2) => void): Observable<T>;
-declare function useComputed<T, T2 = T>(compute: (() => T | Promise<T>) | ObservableParam<T>, set: (value: T2) => void, deps: any[]): Observable<T>;
+declare function useComputed<T>(get: () => T | Promise<T>): Observable<T>;
+declare function useComputed<T>(get: () => T | Promise<T>, deps: any[]): Observable<T>;
+declare function useComputed<T, T2 = T>(get: (() => T | Promise<T>) | ObservableParam<T>, set: (value: T2) => void): Observable<T>;
+declare function useComputed<T, T2 = T>(get: (() => T | Promise<T>) | ObservableParam<T>, set: (value: T2) => void, deps: any[]): Observable<T>;
 
 declare const useEffectOnce: (effect: () => void | (() => void), deps: any[]) => void;
 
@@ -130,9 +130,9 @@ declare const useMountOnce: typeof useMount;
  * @see https://www.legendapp.com/dev/state/react/#useObservable
  */
 declare function useObservable<T>(): Observable<T | undefined>;
-declare function useObservable<T>(value: Promise<RecursiveValueOrFunction<T>> | (() => RecursiveValueOrFunction<T>) | RecursiveValueOrFunction<T>): Observable<T>;
-declare function useObservable<T>(value: T): Observable<T>;
-declare function useObservable<T>(value?: T): Observable<any>;
+declare function useObservable<T>(value: Promise<RecursiveValueOrFunction<T>> | (() => RecursiveValueOrFunction<T>) | RecursiveValueOrFunction<T>, deps?: DependencyList): Observable<T>;
+declare function useObservable<T>(value: T, deps?: DependencyList): Observable<T>;
+declare function useObservable<T>(value?: T, deps?: DependencyList): Observable<any>;
 
 declare function useObservableReducer<R extends ReducerWithoutAction<any>, I>(reducer: R, initializerArg: I, initializer: (arg: I) => ReducerStateWithoutAction<R>): [Observable<ReducerStateWithoutAction<R>>, DispatchWithoutAction];
 declare function useObservableReducer<R extends ReducerWithoutAction<any>>(reducer: R, initializerArg: ReducerStateWithoutAction<R>, initializer?: undefined): [Observable<ReducerStateWithoutAction<R>>, DispatchWithoutAction];

package/react.js

@@ -111,15 +111,6 @@ function useSelector(selector, options) {
     const { subscribe, getVersion, run } = selectorFn;
     value = run(selector);
     index_js.useSyncExternalStore(subscribe, getVersion, getVersion);
-    if (options == null ? void 0 : options.suspense) {
-      if (state.isPromise(value) || !value && state.isObservable(selector) && state.syncState(selector).isLoaded.get() === false) {
-        if (React__default.default.use) {
-          React__default.default.use(value);
-        } else {
-          throw value;
-        }
-      }
-    }
   } catch (err) {
     if ((process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") && ((_a = err == null ? void 0 : err.message) == null ? void 0 : _a.includes("Rendered more"))) {
       console.warn(
@@ -128,6 +119,17 @@ function useSelector(selector, options) {
     }
     throw err;
   }
+  if (options == null ? void 0 : options.suspense) {
+    const isProm = state.isPromise(value);
+    if (state.isPromise(value) || !value && state.isObservable(selector)) {
+      const vProm = isProm ? value : state.when(selector);
+      if (React__default.default.use) {
+        React__default.default.use(vProm);
+      } else {
+        throw vProm;
+      }
+    }
+  }
   return value;
 }
 
@@ -149,10 +151,10 @@ function createReactiveComponent(component, observe3, reactive2, bindKeys) {
   if (component["__legend_proxied"])
     return component;
   let useForwardRef = false;
-  let useMemo5 = false;
+  let useMemo4 = false;
   let render = component;
   if (ReactMemoSymbol && render["$$typeof"] === ReactMemoSymbol && render["type"]) {
-    useMemo5 = true;
+    useMemo4 = true;
     render = render["type"];
   }
   if (ReactForwardRefSymbol && render["$$typeof"] === ReactForwardRefSymbol) {
@@ -233,7 +235,7 @@ function createReactiveComponent(component, observe3, reactive2, bindKeys) {
   } else {
     ret = proxy;
   }
-  return observe3 || useMemo5 ? React.memo(ret) : ret;
+  return observe3 || useMemo4 ? React.memo(ret) : ret;
 }
 function observer(component) {
   return createReactiveComponent(component, true);
@@ -389,20 +391,33 @@ function Switch({
   const child = children[useSelector(value)];
   return (_b = child ? child() : (_a = children["default"]) == null ? void 0 : _a.call(children)) != null ? _b : null;
 }
-function useComputed(compute, set, deps) {
+function useObservable(initialValue, deps) {
+  var _a;
+  const ref = React.useRef({});
+  ref.current.value = initialValue;
+  const depsObs$ = deps ? useObservable(deps) : void 0;
+  if (!((_a = ref.current) == null ? void 0 : _a.obs$)) {
+    const value = depsObs$ ? () => {
+      depsObs$.get();
+      return state.computeSelector(ref.current.value);
+    } : initialValue;
+    ref.current.obs$ = state.observable(value);
+  }
+  if (depsObs$) {
+    depsObs$.set(deps);
+  }
+  return ref.current.obs$;
+}
+
+// src/react/useComputed.ts
+function useComputed(get, set, deps) {
   if (!deps && state.isArray(set)) {
     deps = set;
     set = void 0;
   }
-  const ref = React.useRef({});
-  ref.current.compute = compute;
-  ref.current.set = set;
-  return React.useMemo(
-    () => state.computed(
-      () => state.isFunction(ref.current.compute) ? ref.current.compute() : ref.current.compute,
-      set ? (value) => ref.current.set(value) : void 0
-    ),
-    deps || []
+  return useObservable(
+    set ? state.linked({ get, set: ({ value }) => set(value) }) : get,
+    deps
   );
 }
 var useEffectOnce = (effect, deps) => {
@@ -442,13 +457,6 @@ function useMount(fn) {
   }, []);
 }
 var useMountOnce = useMount;
-function useObservable(initialValue) {
-  const ref = React.useRef();
-  if (!ref.current) {
-    ref.current = state.observable(initialValue);
-  }
-  return ref.current;
-}
 
 // src/react/useIsMounted.ts
 function useIsMounted() {

package/react.mjs

@@ -1,4 +1,4 @@
-import { isFunction, isEmpty, observable, isPromise, isObservable, syncState, computeSelector, isArray, isMap, isObservableValueReady, computed, observe, when, whenReady, internal, trackSelector, isPrimitive } from '@legendapp/state';
+import { isFunction, isEmpty, observable, isPromise, isObservable, when, computeSelector, isArray, isMap, isObservableValueReady, linked, observe, whenReady, internal, trackSelector, isPrimitive } from '@legendapp/state';
 import React, { memo, forwardRef, createElement, useState, useContext, useMemo, useRef, useEffect, createContext, useCallback } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim/index.js';
 
@@ -105,15 +105,6 @@ function useSelector(selector, options) {
     const { subscribe, getVersion, run } = selectorFn;
     value = run(selector);
     useSyncExternalStore(subscribe, getVersion, getVersion);
-    if (options == null ? void 0 : options.suspense) {
-      if (isPromise(value) || !value && isObservable(selector) && syncState(selector).isLoaded.get() === false) {
-        if (React.use) {
-          React.use(value);
-        } else {
-          throw value;
-        }
-      }
-    }
   } catch (err) {
     if ((process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") && ((_a = err == null ? void 0 : err.message) == null ? void 0 : _a.includes("Rendered more"))) {
       console.warn(
@@ -122,6 +113,17 @@ function useSelector(selector, options) {
     }
     throw err;
   }
+  if (options == null ? void 0 : options.suspense) {
+    const isProm = isPromise(value);
+    if (isPromise(value) || !value && isObservable(selector)) {
+      const vProm = isProm ? value : when(selector);
+      if (React.use) {
+        React.use(vProm);
+      } else {
+        throw vProm;
+      }
+    }
+  }
   return value;
 }
 
@@ -143,10 +145,10 @@ function createReactiveComponent(component, observe3, reactive2, bindKeys) {
   if (component["__legend_proxied"])
     return component;
   let useForwardRef = false;
-  let useMemo5 = false;
+  let useMemo4 = false;
   let render = component;
   if (ReactMemoSymbol && render["$$typeof"] === ReactMemoSymbol && render["type"]) {
-    useMemo5 = true;
+    useMemo4 = true;
     render = render["type"];
   }
   if (ReactForwardRefSymbol && render["$$typeof"] === ReactForwardRefSymbol) {
@@ -227,7 +229,7 @@ function createReactiveComponent(component, observe3, reactive2, bindKeys) {
   } else {
     ret = proxy;
   }
-  return observe3 || useMemo5 ? memo(ret) : ret;
+  return observe3 || useMemo4 ? memo(ret) : ret;
 }
 function observer(component) {
   return createReactiveComponent(component, true);
@@ -383,20 +385,33 @@ function Switch({
   const child = children[useSelector(value)];
   return (_b = child ? child() : (_a = children["default"]) == null ? void 0 : _a.call(children)) != null ? _b : null;
 }
-function useComputed(compute, set, deps) {
+function useObservable(initialValue, deps) {
+  var _a;
+  const ref = useRef({});
+  ref.current.value = initialValue;
+  const depsObs$ = deps ? useObservable(deps) : void 0;
+  if (!((_a = ref.current) == null ? void 0 : _a.obs$)) {
+    const value = depsObs$ ? () => {
+      depsObs$.get();
+      return computeSelector(ref.current.value);
+    } : initialValue;
+    ref.current.obs$ = observable(value);
+  }
+  if (depsObs$) {
+    depsObs$.set(deps);
+  }
+  return ref.current.obs$;
+}
+
+// src/react/useComputed.ts
+function useComputed(get, set, deps) {
   if (!deps && isArray(set)) {
     deps = set;
     set = void 0;
   }
-  const ref = useRef({});
-  ref.current.compute = compute;
-  ref.current.set = set;
-  return useMemo(
-    () => computed(
-      () => isFunction(ref.current.compute) ? ref.current.compute() : ref.current.compute,
-      set ? (value) => ref.current.set(value) : void 0
-    ),
-    deps || []
+  return useObservable(
+    set ? linked({ get, set: ({ value }) => set(value) }) : get,
+    deps
   );
 }
 var useEffectOnce = (effect, deps) => {
@@ -436,13 +451,6 @@ function useMount(fn) {
   }, []);
 }
 var useMountOnce = useMount;
-function useObservable(initialValue) {
-  const ref = useRef();
-  if (!ref.current) {
-    ref.current = observable(initialValue);
-  }
-  return ref.current;
-}
 
 // src/react/useIsMounted.ts
 function useIsMounted() {