@faasjs/react 0.0.2-beta.296 → 0.0.2-beta.304

package/README.md

@@ -2,7 +2,7 @@
 
 React 插件
 
-[![License: MIT](https://img.shields.io/npm/l/@faasjs/react.svg)](https://github.com/faasjs/faasjs/blob/master/packages/faasjs/react/LICENSE)
+[![License: MIT](https://img.shields.io/npm/l/@faasjs/react.svg)](https://github.com/faasjs/faasjs/blob/main/packages/faasjs/react/LICENSE)
 [![NPM Stable Version](https://img.shields.io/npm/v/@faasjs/react/stable.svg)](https://www.npmjs.com/package/@faasjs/react)
 [![NPM Beta Version](https://img.shields.io/npm/v/@faasjs/react/beta.svg)](https://www.npmjs.com/package/@faasjs/react)
 

package/lib/index.js

@@ -6,11 +6,13 @@
 
   function FaasReactClient({ domain, options, onError }) {
       const client = new browser.FaasBrowserClient(domain, options);
-      // async function faas<Path extends keyof FaasActions> (action: Path, params: FaasActions[Path]['request']): Promise<Response<FaasActions[Path]['response']>>
       async function faas(action, params) {
           if (onError)
               return client.action(action, params)
-                  .catch(onError(action, params));
+                  .catch(async (res) => {
+                  await onError(action, params)(res);
+                  return Promise.reject(res);
+              });
           return client.action(action, params);
       }
       function useFaas(action, defaultParams) {
@@ -30,23 +32,21 @@
               const request = client.action(action, params);
               setPromise(request);
               request
-                  .then(r => {
-                  setData(r === null || r === void 0 ? void 0 : r.data);
-              })
+                  .then(r => setData(r.data))
                   .catch(async (e) => {
                   if (onError)
                       try {
-                          setData(await onError(action, params)(e));
+                          await onError(action, params)(e);
                       }
                       catch (error) {
                           setError(error);
                       }
-                  setError(e);
+                  else
+                      setError(e);
+                  return Promise.reject(e);
               })
                   .finally(() => setLoading(false));
-              return () => {
-                  setLoading(false);
-              };
+              return () => setLoading(false);
           }, [
               action,
               JSON.stringify(params),
@@ -79,7 +79,7 @@
                   if (!loaded && !request.loading)
                       setLoaded(true);
               }, [request.loading]);
-              react.useEffect(() => {
+              react.useEffect(function () {
                   if (onDataChange)
                       onDataChange(request);
               }, [JSON.stringify(request.data)]);

package/lib/react/src/index.d.ts

@@ -1,30 +1,31 @@
 /// <reference types="react" />
-import { Options, Params, Response, ResponseError } from '@faasjs/browser';
-export type { FaasBrowserClient, Options, Params, Response, ResponseHeaders, ResponseError } from '@faasjs/browser';
-declare type FaasDataInjection<T = any> = {
+import { Options, Response, ResponseError } from '@faasjs/browser';
+import { FaasAction, FaasData, FaasParams } from '@faasjs/types';
+export type { FaasBrowserClient, Options, Response, ResponseHeaders, ResponseError } from '@faasjs/browser';
+declare type FaasDataInjection<Data = any> = {
     loading: boolean;
-    data: T;
+    data: Data;
     error: any;
-    promise: Promise<Response<T>>;
-    reload(params?: Params): Promise<Response<T>>;
-    setData: React.Dispatch<React.SetStateAction<T>>;
+    promise: Promise<Response<Data>>;
+    reload(params?: Record<string, any>): Promise<Response<Data>>;
+    setData: React.Dispatch<React.SetStateAction<Data>>;
     setLoading: React.Dispatch<React.SetStateAction<boolean>>;
-    setPromise: React.Dispatch<React.SetStateAction<Promise<Response<T>>>>;
+    setPromise: React.Dispatch<React.SetStateAction<Promise<Response<Data>>>>;
     setError: React.Dispatch<React.SetStateAction<any>>;
 };
-declare type FaasDataProps<T = any> = {
-    element(args: FaasDataInjection<T>): JSX.Element;
+declare type FaasDataProps<PathOrData extends FaasAction> = {
+    element(args: FaasDataInjection<FaasData<PathOrData>>): JSX.Element;
     fallback?: JSX.Element | false;
     action: string;
-    params?: Params;
-    onDataChange?(args: FaasDataInjection<T>): void;
+    params?: FaasParams<PathOrData>;
+    onDataChange?(args: FaasDataInjection<FaasData<PathOrData>>): void;
 };
 export declare function FaasReactClient({ domain, options, onError }: {
     domain: string;
     options?: Options;
-    onError?: (action: string, params: Params) => (res: ResponseError) => Promise<any>;
+    onError?: (action: string, params: Record<string, any>) => (res: ResponseError) => Promise<void>;
 }): {
-    faas: <T = any>(action: string, params: Params) => Promise<Response<T>>;
-    useFaas: <T_1 = any>(action: string, defaultParams: Params) => FaasDataInjection<T_1>;
-    FaasData<T_2 = any>({ action, params, fallback, element, onDataChange }: FaasDataProps<T_2>): JSX.Element;
+    faas: <PathOrData extends Record<string, any>>(action: string | PathOrData, params: FaasParams<PathOrData>) => Promise<Response<FaasData<PathOrData>>>;
+    useFaas: <PathOrData_1 extends Record<string, any>>(action: string | PathOrData_1, defaultParams: FaasParams<PathOrData_1>) => FaasDataInjection<FaasData<PathOrData_1>>;
+    FaasData<PathOrData_2 extends Record<string, any>>({ action, params, fallback, element, onDataChange }: FaasDataProps<PathOrData_2>): JSX.Element;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/react",
-  "version": "0.0.2-beta.296",
+  "version": "0.0.2-beta.304",
   "license": "MIT",
   "main": "lib/index.js",
   "types": "lib/react/src/index.d.ts",
@@ -10,6 +10,10 @@
     "url": "git+https://github.com/faasjs/faasjs.git",
     "directory": "packages/react"
   },
+  "bugs": {
+    "url": "https://github.com/faasjs/faasjs/issues"
+  },
+  "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
     "prepack": "rm -rf ./lib && rollup -c"
   },
@@ -27,5 +31,8 @@
     "rollup-plugin-typescript2": "*",
     "typescript": "*"
   },
-  "gitHead": "6df200b3b73c28613ada04fd15b24955f85ea7e3"
+  "engines": {
+    "npm": ">=8.0.0"
+  },
+  "gitHead": "39d192f58071b851ec483dfca81fa4458307e3a2"
 }