@orpc/react 1.1.0 → 1.2.0

package/dist/hooks/index.mjs

@@ -1,6 +1,6 @@
 import { safe, createORPCErrorFromJson } from '@orpc/client';
 import { intercept, toArray } from '@orpc/shared';
-import { useState, useCallback, useMemo } from 'react';
+import { useState, useRef, useTransition, useCallback, useMemo } from 'react';
 
 const INITIAL_STATE = {
   data: void 0,
@@ -9,56 +9,68 @@ const INITIAL_STATE = {
   isPending: false,
   isSuccess: false,
   isError: false,
-  status: "idle",
-  executedAt: void 0,
-  input: void 0
+  status: "idle"
+};
+const PENDING_STATE = {
+  data: void 0,
+  error: null,
+  isIdle: false,
+  isPending: true,
+  isSuccess: false,
+  isError: false,
+  status: "pending"
 };
 function useServerAction(action, options = {}) {
   const [state, setState] = useState(INITIAL_STATE);
+  const executedAtRef = useRef(void 0);
+  const [input, setInput] = useState(void 0);
+  const [isPending, startTransition] = useTransition();
   const reset = useCallback(() => {
-    setState(INITIAL_STATE);
+    executedAtRef.current = void 0;
+    setInput(void 0);
+    setState({ ...INITIAL_STATE });
   }, []);
-  const execute = useCallback(async (input, executeOptions = {}) => {
+  const execute = useCallback(async (input2, executeOptions = {}) => {
     const executedAt = /* @__PURE__ */ new Date();
-    setState({
-      data: void 0,
-      error: null,
-      isIdle: false,
-      isPending: true,
-      isSuccess: false,
-      isError: false,
-      status: "pending",
-      executedAt,
-      input
-    });
-    const result2 = await safe(intercept(
-      [...toArray(options.interceptors), ...toArray(executeOptions.interceptors)],
-      { input },
-      ({ input: input2 }) => action(input2).then(([error, data]) => {
-        if (error) {
-          throw createORPCErrorFromJson(error);
+    executedAtRef.current = executedAt;
+    setInput(input2);
+    return new Promise((resolve) => {
+      startTransition(async () => {
+        const result2 = await safe(intercept(
+          [...toArray(options.interceptors), ...toArray(executeOptions.interceptors)],
+          { input: input2 },
+          ({ input: input3 }) => action(input3).then(([error, data]) => {
+            if (error) {
+              throw createORPCErrorFromJson(error);
+            }
+            return data;
+          })
+        ));
+        if (executedAtRef.current === executedAt) {
+          setState({
+            data: result2.data,
+            error: result2.error,
+            isIdle: false,
+            isPending: false,
+            isSuccess: !result2.error,
+            isError: !!result2.error,
+            status: !result2.error ? "success" : "error"
+          });
         }
-        return data;
-      })
-    ));
-    setState({
-      data: result2.data,
-      error: result2.error,
-      isIdle: false,
-      isPending: false,
-      isSuccess: !result2.error,
-      isError: !!result2.error,
-      status: !result2.error ? "success" : "error",
-      executedAt,
-      input
+        resolve(result2);
+      });
     });
-    return result2;
   }, [action, ...toArray(options.interceptors)]);
-  const result = useMemo(() => ({
-    ...state,
-    reset,
-    execute
-  }), [state, reset, execute]);
+  const result = useMemo(() => {
+    const currentState = isPending && executedAtRef.current !== void 0 ? PENDING_STATE : state;
+    return {
+      ...currentState,
+      executedAt: executedAtRef.current,
+      input,
+      reset,
+      execute
+    };
+  }, [isPending, state, input, reset, execute]);
   return result;
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/react",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -34,11 +34,11 @@
     "react": ">=18.0.0"
   },
   "dependencies": {
-    "@orpc/client": "1.1.0",
-    "@orpc/openapi-client": "1.1.0",
-    "@orpc/server": "1.1.0",
-    "@orpc/contract": "1.1.0",
-    "@orpc/shared": "1.1.0"
+    "@orpc/client": "1.2.0",
+    "@orpc/contract": "1.2.0",
+    "@orpc/openapi-client": "1.2.0",
+    "@orpc/shared": "1.2.0",
+    "@orpc/server": "1.2.0"
   },
   "devDependencies": {
     "react": "^19.1.0",