rask-ui 0.19.0 → 0.20.1

package/dist/component.d.ts

@@ -1,11 +1,12 @@
 import { VNode, Component, Props, InfernoNode } from "inferno";
-import { Observer } from "./observation";
+import { Observer, Signal } from "./observation";
 export type RaskStatelessFunctionComponent<P extends Props<any>> = (() => VNode) | ((props: P) => VNode);
 export declare class RaskStatelessComponent extends Component {
     renderFn: RaskStatelessFunctionComponent<any>;
     private isNotified;
     private isReconciling;
     observer: Observer;
+    propsSignals: Record<string, Signal>;
     private reactiveProps;
     shouldComponentUpdate(): boolean;
     componentWillMount(): void;
@@ -19,7 +20,8 @@ export type RaskStatefulFunctionComponent<P extends Props<any>> = (() => () => V
 export declare class RaskStatefulComponent<P extends Props<any>> extends Component<P> {
     setup: RaskStatefulFunctionComponent<P>;
     private renderFn?;
-    private reactiveProps?;
+    propsSignals: Record<string, Signal>;
+    private reactiveProps;
     private isNotified;
     private isReconciling;
     observer: Observer;

package/dist/component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../src/component.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EACL,SAAS,EACT,KAAK,EACL,WAAW,EACZ,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAsB,QAAQ,EAAU,MAAM,eAAe,CAAC;AAIrE,MAAM,MAAM,8BAA8B,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,IAC3D,CAAC,MAAM,KAAK,CAAC,GACb,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,KAAK,CAAC,CAAC;AAE1B,qBAAa,sBAAuB,SAAQ,SAAS;IAC3C,QAAQ,EAAE,8BAA8B,CAAC,GAAG,CAAC,CAAC;IACtD,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,aAAa,CAAS;IAC9B,QAAQ,WAML;IACH,OAAO,CAAC,aAAa,CAAc;IAEnC,qBAAqB,IAAI,OAAO;IAMhC,kBAAkB,IAAI,IAAI;IAG1B,yBAAyB,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI;IAe/C,MAAM;CAOP;AAID,wBAAgB,mBAAmB,2CAElC;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,IAAI,QAM5C;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,MAAM,IAAI,QAMxC;AAED,MAAM,MAAM,6BAA6B,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,IAC1D,CAAC,MAAM,MAAM,KAAK,CAAC,GACnB,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,KAAK,CAAC,CAAC;AAEhC,qBAAa,qBAAqB,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,CAAE,SAAQ,SAAS,CAAC,CAAC,CAAC;IACnE,KAAK,EAAE,6BAA6B,CAAC,CAAC,CAAC,CAAC;IAChD,OAAO,CAAC,QAAQ,CAAC,CAAc;IAC/B,OAAO,CAAC,aAAa,CAAC,CAAa;IAwBnC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,aAAa,CAAS;IAE9B,QAAQ,WAOL;IAEH,WAAW,UAAS;IACpB,OAAO,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,GAAG,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC,CAAM;IAC3D,QAAQ,gBAAa;IACrB,eAAe;IAUf,QAAQ,EAAE,KAAK,CAAC,MAAM,IAAI,CAAC,CAAM;IACjC,UAAU,EAAE,KAAK,CAAC,MAAM,IAAI,CAAC,CAAM;IAEnC,iBAAiB,IAAI,IAAI;IAGzB,oBAAoB,IAAI,IAAI;IAI5B,yBAAyB,CACvB,SAAS,EAAE,QAAQ,CAAC;QAAE,QAAQ,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,CAAC,CAAC,GAClD,IAAI;IAcP,qBAAqB,IAAI,OAAO;IAMhC,MAAM;CA6CP;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,SAO9D"}
+{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../src/component.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EACL,SAAS,EACT,KAAK,EACL,WAAW,EACZ,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAsB,QAAQ,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAIrE,MAAM,MAAM,8BAA8B,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,IAC3D,CAAC,MAAM,KAAK,CAAC,GACb,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,KAAK,CAAC,CAAC;AAE1B,qBAAa,sBAAuB,SAAQ,SAAS;IAC3C,QAAQ,EAAE,8BAA8B,CAAC,GAAG,CAAC,CAAC;IACtD,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,aAAa,CAAS;IAC9B,QAAQ,WAML;IACH,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAC1C,OAAO,CAAC,aAAa,CAAc;IAEnC,qBAAqB,IAAI,OAAO;IAMhC,kBAAkB,IAAI,IAAI;IAG1B,yBAAyB,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI;IAe/C,MAAM;CAOP;AAID,wBAAgB,mBAAmB,2CAElC;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,IAAI,QAM5C;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,MAAM,IAAI,QAMxC;AAED,MAAM,MAAM,6BAA6B,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,IAC1D,CAAC,MAAM,MAAM,KAAK,CAAC,GACnB,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,KAAK,CAAC,CAAC;AAEhC,qBAAa,qBAAqB,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,CAAE,SAAQ,SAAS,CAAC,CAAC,CAAC;IACnE,KAAK,EAAE,6BAA6B,CAAC,CAAC,CAAC,CAAC;IAChD,OAAO,CAAC,QAAQ,CAAC,CAAc;IAC/B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAC1C,OAAO,CAAC,aAAa,CAAc;IAwBnC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,aAAa,CAAS;IAE9B,QAAQ,WAOL;IAEH,WAAW,UAAS;IACpB,OAAO,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,GAAG,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC,CAAM;IAC3D,QAAQ,gBAAa;IACrB,eAAe;IAUf,QAAQ,EAAE,KAAK,CAAC,MAAM,IAAI,CAAC,CAAM;IACjC,UAAU,EAAE,KAAK,CAAC,MAAM,IAAI,CAAC,CAAM;IAEnC,iBAAiB,IAAI,IAAI;IAGzB,oBAAoB,IAAI,IAAI;IAI5B,yBAAyB,CACvB,SAAS,EAAE,QAAQ,CAAC;QAAE,QAAQ,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,CAAC,CAAC,GAClD,IAAI;IAcP,qBAAqB,IAAI,OAAO;IAMhC,MAAM;CA6CP;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,SAO9D"}

package/dist/component.js

@@ -12,6 +12,7 @@ export class RaskStatelessComponent extends Component {
         }
         this.forceUpdate();
     });
+    propsSignals = {};
     reactiveProps;
     shouldComponentUpdate() {
         const shouldRender = this.isNotified;
@@ -24,16 +25,17 @@ export class RaskStatelessComponent extends Component {
     }
     componentWillReceiveProps(nextProps) {
         this.isReconciling = true;
+        const prevProps = this.props;
+        this.props = nextProps;
         syncBatch(() => {
-            for (const prop in nextProps) {
-                if (this.props[prop] === nextProps[prop]) {
+            for (const prop in this.propsSignals) {
+                if (prevProps[prop] === nextProps[prop]) {
                     continue;
                 }
-                // @ts-ignore
-                this.reactiveProps[prop] = nextProps[prop];
+                // This just triggers the signal
+                this.propsSignals[prop].notify();
             }
         });
-        this.props = nextProps;
     }
     render() {
         const stopObserving = this.observer.observe();
@@ -60,6 +62,7 @@ export function useCleanup(cb) {
 }
 export class RaskStatefulComponent extends Component {
     renderFn;
+    propsSignals = {};
     reactiveProps;
     // RECONCILIATION FLAGS
     // --------------------
@@ -115,16 +118,16 @@ export class RaskStatefulComponent extends Component {
     }
     componentWillReceiveProps(nextProps) {
         this.isReconciling = true;
+        const prevProps = this.props;
+        this.props = nextProps;
         syncBatch(() => {
-            for (const prop in nextProps) {
-                if (this.props[prop] === nextProps[prop]) {
+            for (const prop in this.propsSignals) {
+                if (prevProps[prop] === nextProps[prop]) {
                     continue;
                 }
-                // @ts-ignore
-                this.reactiveProps[prop] = nextProps[prop];
+                this.propsSignals[prop].notify();
             }
         });
-        this.props = nextProps;
     }
     shouldComponentUpdate() {
         const shouldRender = this.isNotified;
@@ -176,40 +179,24 @@ export function createComponent(props, key) {
     return createComponentVNode(4 /* VNodeFlags.ComponentClass */, RaskStatefulComponent, props, key);
 }
 function createReactiveProps(comp) {
-    const reactiveProps = {};
-    const signals = new Map();
-    for (const prop in comp.props) {
-        const value = comp.props[prop];
-        // Skip known non-reactive props
-        if (prop === "key" || prop === "ref") {
-            reactiveProps[prop] = value;
-            continue;
-        }
-        // Only create reactive getters for primitives
-        Object.defineProperty(reactiveProps, prop, {
-            enumerable: true,
-            get() {
-                const observer = getCurrentObserver();
-                if (observer) {
-                    // Lazy create signal only when accessed in reactive context
-                    let signal = signals.get(prop);
-                    if (!signal) {
-                        signal = new Signal();
-                        signals.set(prop, signal);
-                    }
-                    observer.subscribeSignal(signal);
-                }
-                return comp.props[prop];
-            },
-            set(value) {
-                comp.props[prop] = value;
-                // Only notify if signal was created (i.e., prop was accessed reactively)
-                const signal = signals.get(prop);
-                if (signal) {
-                    signal.notify();
+    const props = new Proxy({}, {
+        get(_, prop) {
+            // Skip known non-reactive props
+            if (prop === "key" || prop === "ref") {
+                return;
+            }
+            const observer = getCurrentObserver();
+            if (observer) {
+                // Lazy create signal only when accessed in reactive context
+                let signal = comp.propsSignals[prop];
+                if (!signal) {
+                    signal = new Signal();
+                    comp.propsSignals[prop] = signal;
                 }
-            },
-        });
-    }
-    return reactiveProps;
+                observer.subscribeSignal(signal);
+            }
+            return comp.props[prop];
+        },
+    });
+    return props;
 }

package/dist/useAction.d.ts

@@ -1,18 +1,29 @@
-export type QueuedAction<P> = {
+export type ActionState<T, P> = {
+    isPending: false;
+    params: null;
+    result: null;
+    error: null;
+} | {
+    isPending: true;
     params: P;
-    error: Error | null;
-    retry(): void;
-    cancel(): void;
-};
-export type ActionState<P> = {
-    isPending: boolean;
-    queue: QueuedAction<P>[];
+    result: null;
+    error: null;
+} | {
+    isPending: false;
+    params: P;
+    result: T;
+    error: null;
+} | {
+    isPending: false;
+    params: P;
+    result: null;
+    error: Error;
 };
-export type Action<P = null> = [
-    ActionState<P>,
+export type Action<T, P = null> = [
+    ActionState<T, P>,
     [
         P
     ] extends [null] ? () => void : (params: P) => void
 ];
-export declare function useAction<P = null>(fn: [P] extends [null] ? () => Promise<void> : (params: P) => Promise<void>): Action<P>;
+export declare function useAction<T, P = null>(fn: [P] extends [null] ? () => Promise<T> : (params: P) => Promise<T>): Action<T, P>;
 //# sourceMappingURL=useAction.d.ts.map

package/dist/useAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAction.d.ts","sourceRoot":"","sources":["../src/useAction.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI;IAC5B,MAAM,EAAE,CAAC,CAAC;IACV,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,KAAK,IAAI,IAAI,CAAC;IACd,MAAM,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,MAAM,CAAC,CAAC,GAAG,IAAI,IAAI;IAC7B,WAAW,CAAC,CAAC,CAAC;IACd;QAAC,CAAC;KAAC,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI;CACtD,CAAC;AAEF,wBAAgB,SAAS,CAAC,CAAC,GAAG,IAAI,EAChC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAC1E,MAAM,CAAC,CAAC,CAAC,CAkDX"}
+{"version":3,"file":"useAction.d.ts","sourceRoot":"","sources":["../src/useAction.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,IACxB;IACE,SAAS,EAAE,KAAK,CAAC;IACjB,MAAM,EAAE,IAAI,CAAC;IACb,MAAM,EAAE,IAAI,CAAC;IACb,KAAK,EAAE,IAAI,CAAC;CACb,GACD;IACE,SAAS,EAAE,IAAI,CAAC;IAChB,MAAM,EAAE,CAAC,CAAC;IACV,MAAM,EAAE,IAAI,CAAC;IACb,KAAK,EAAE,IAAI,CAAC;CACb,GACD;IACE,SAAS,EAAE,KAAK,CAAC;IACjB,MAAM,EAAE,CAAC,CAAC;IACV,MAAM,EAAE,CAAC,CAAC;IACV,KAAK,EAAE,IAAI,CAAC;CACb,GACD;IACE,SAAS,EAAE,KAAK,CAAC;IACjB,MAAM,EAAE,CAAC,CAAC;IACV,MAAM,EAAE,IAAI,CAAC;IACb,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEN,MAAM,MAAM,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,IAAI;IAChC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC;IACjB;QAAC,CAAC;KAAC,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI;CACtD,CAAC;AAEF,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,EACnC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GACpE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAkDd"}

package/dist/useAction.js

@@ -1,43 +1,45 @@
-import { useState } from "./useState";
+import { assignState, useState } from "./useState";
 export function useAction(fn) {
     const state = useState({
         isPending: false,
-        queue: [],
+        error: null,
+        params: null,
+        result: null,
     });
-    const processQueue = () => {
-        const next = state.queue[0];
-        if (!next) {
-            state.isPending = false;
-            return;
-        }
-        state.isPending = true;
-        fn(next.params)
-            .then(() => {
-            state.queue.shift();
-            processQueue();
-        })
-            .catch((error) => {
-            next.error = error;
-        });
-    };
+    let abortController;
     const run = (params) => {
         params = (params || null);
-        let actionProxy;
-        const index = state.queue.push({
-            params,
+        abortController?.abort();
+        const currentAbortController = (abortController = new AbortController());
+        assignState(state, {
+            isPending: true,
             error: null,
-            retry() {
-                processQueue();
-            },
-            cancel() {
-                state.queue.splice(state.queue.indexOf(actionProxy), 1);
-                processQueue();
-            },
-        }) - 1;
-        actionProxy = state.queue[index];
-        if (index === 0) {
-            processQueue();
-        }
+            params,
+            result: null,
+        });
+        fn(params)
+            .then((result) => {
+            if (currentAbortController.signal.aborted) {
+                return;
+            }
+            assignState(state, {
+                isPending: false,
+                error: null,
+                params,
+                result,
+            });
+        })
+            .catch((error) => {
+            if (currentAbortController.signal.aborted) {
+                return;
+            }
+            assignState(state, {
+                isPending: false,
+                error,
+                params,
+                result: null,
+            });
+        });
     };
     return [state, run];
 }

package/dist/useSuspend.d.ts

@@ -1,40 +1,35 @@
 import { AsyncState } from "./useAsync";
-type SuspendState<T extends Record<string, () => any>> = {
+type SuspendState<T extends Record<string, () => any>> = ({
     error: Error;
     isLoading: true;
     isRefreshing: false;
-    values: {
-        [K in keyof T]: ReturnType<T[K]> extends AsyncState<any> ? ReturnType<T[K]>["value"] : ReturnType<T[K]>;
-    };
-} | {
+} & {
+    [K in keyof T]: ReturnType<T[K]> extends AsyncState<any> ? ReturnType<T[K]>["value"] : ReturnType<T[K]>;
+}) | ({
     error: Error;
     isLoading: false;
     isRefreshing: true;
-    values: {
-        [K in keyof T]: ReturnType<T[K]> extends AsyncState<any> ? NonNullable<ReturnType<T[K]>["value"]> : ReturnType<T[K]>;
-    };
-} | {
+} & {
+    [K in keyof T]: ReturnType<T[K]> extends AsyncState<any> ? NonNullable<ReturnType<T[K]>["value"]> : ReturnType<T[K]>;
+}) | ({
     error: null;
     isLoading: true;
     isRefreshing: false;
-    values: {
-        [K in keyof T]: ReturnType<T[K]> extends AsyncState<any> ? ReturnType<T[K]>["value"] : ReturnType<T[K]>;
-    };
-} | {
+} & {
+    [K in keyof T]: ReturnType<T[K]> extends AsyncState<any> ? ReturnType<T[K]>["value"] : ReturnType<T[K]>;
+}) | ({
     error: null;
     isLoading: false;
     isRefreshing: true;
-    values: {
-        [K in keyof T]: ReturnType<T[K]> extends AsyncState<any> ? NonNullable<ReturnType<T[K]>["value"]> : ReturnType<T[K]>;
-    };
-} | {
+} & {
+    [K in keyof T]: ReturnType<T[K]> extends AsyncState<any> ? NonNullable<ReturnType<T[K]>["value"]> : ReturnType<T[K]>;
+}) | ({
     error: null;
     isLoading: false;
     isRefreshing: false;
-    values: {
-        [K in keyof T]: ReturnType<T[K]> extends AsyncState<any> ? NonNullable<ReturnType<T[K]>["value"]> : ReturnType<T[K]>;
-    };
-};
+} & {
+    [K in keyof T]: ReturnType<T[K]> extends AsyncState<any> ? NonNullable<ReturnType<T[K]>["value"]> : ReturnType<T[K]>;
+});
 export declare function useSuspend<T extends Record<string, any>>(asyncs: T): SuspendState<T>;
 export {};
 //# sourceMappingURL=useSuspend.d.ts.map

package/dist/useSuspend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSuspend.d.ts","sourceRoot":"","sources":["../src/useSuspend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,YAAY,CAAC;AAIjD,KAAK,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,IACjD;IACE,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,IAAI,CAAC;IAChB,YAAY,EAAE,KAAK,CAAC;IACpB,MAAM,EAAE;SACL,CAAC,IAAI,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,GACpD,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GACzB,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrB,CAAC;CACH,GACD;IACE,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,KAAK,CAAC;IACjB,YAAY,EAAE,IAAI,CAAC;IACnB,MAAM,EAAE;SACL,CAAC,IAAI,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,GACpD,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GACtC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrB,CAAC;CACH,GACD;IACE,KAAK,EAAE,IAAI,CAAC;IACZ,SAAS,EAAE,IAAI,CAAC;IAChB,YAAY,EAAE,KAAK,CAAC;IACpB,MAAM,EAAE;SACL,CAAC,IAAI,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,GACpD,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GACzB,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrB,CAAC;CACH,GACD;IACE,KAAK,EAAE,IAAI,CAAC;IACZ,SAAS,EAAE,KAAK,CAAC;IACjB,YAAY,EAAE,IAAI,CAAC;IACnB,MAAM,EAAE;SACL,CAAC,IAAI,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,GACpD,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GACtC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrB,CAAC;CACH,GACD;IACE,KAAK,EAAE,IAAI,CAAC;IACZ,SAAS,EAAE,KAAK,CAAC;IACjB,YAAY,EAAE,KAAK,CAAC;IACpB,MAAM,EAAE;SACL,CAAC,IAAI,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,GACpD,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GACtC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrB,CAAC;CACH,CAAC;AAEN,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,mBAsDlE"}
+{"version":3,"file":"useSuspend.d.ts","sourceRoot":"","sources":["../src/useSuspend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAqB,MAAM,YAAY,CAAC;AAI3D,KAAK,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,IACjD,CAAC;IACC,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,IAAI,CAAC;IAChB,YAAY,EAAE,KAAK,CAAC;CACrB,GAAG;KACD,CAAC,IAAI,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,GACpD,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GACzB,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACrB,CAAC,GACF,CAAC;IACC,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,KAAK,CAAC;IACjB,YAAY,EAAE,IAAI,CAAC;CACpB,GAAG;KACD,CAAC,IAAI,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,GACpD,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GACtC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACrB,CAAC,GACF,CAAC;IACC,KAAK,EAAE,IAAI,CAAC;IACZ,SAAS,EAAE,IAAI,CAAC;IAChB,YAAY,EAAE,KAAK,CAAC;CACrB,GAAG;KACD,CAAC,IAAI,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,GACpD,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GACzB,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACrB,CAAC,GACF,CAAC;IACC,KAAK,EAAE,IAAI,CAAC;IACZ,SAAS,EAAE,KAAK,CAAC;IACjB,YAAY,EAAE,IAAI,CAAC;CACpB,GAAG;KACD,CAAC,IAAI,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,GACpD,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GACtC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACrB,CAAC,GACF,CAAC;IACC,KAAK,EAAE,IAAI,CAAC;IACZ,SAAS,EAAE,KAAK,CAAC;IACjB,YAAY,EAAE,KAAK,CAAC;CACrB,GAAG;KACD,CAAC,IAAI,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,GACpD,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GACtC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACrB,CAAC,CAAC;AAEP,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,mBA0DlE"}

package/dist/useSuspend.js

@@ -2,19 +2,18 @@ import { isAsync } from "./useAsync";
 import { useEffect } from "./useEffect";
 import { assignState, useState } from "./useState";
 export function useSuspend(asyncs) {
-    const state = useState({
+    const state = useState(Object.keys(asyncs).reduce((aggr, key) => {
+        let value = asyncs[key]();
+        if (isAsync(value)) {
+            value = value.value;
+        }
+        aggr[key] = value;
+        return aggr;
+    }, {
         isLoading: true,
         isRefreshing: false,
         error: null,
-        values: Object.keys(asyncs).reduce((aggr, key) => {
-            let value = asyncs[key]();
-            if (isAsync(value)) {
-                value = value.value;
-            }
-            aggr[key] = value;
-            return aggr;
-        }, {}),
-    });
+    }));
     useEffect(() => {
         let isLoading = false;
         let isRefreshing = false;
@@ -41,7 +40,7 @@ export function useSuspend(asyncs) {
         state.isRefreshing = isLoading ? false : isRefreshing;
         state.error = error || null;
         if (!state.isLoading && !state.isRefreshing && !error) {
-            assignState(state.values, values);
+            assignState(state, values);
         }
     });
     return state;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rask-ui",
-  "version": "0.19.0",
+  "version": "0.20.1",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",