@faasjs/react 0.0.2-beta.352 → 0.0.2-beta.356

package/dist/index.d.ts

@@ -1,8 +1,10 @@
-import { Options, ResponseError, Response } from '@faasjs/browser';
+import { Response, Options, ResponseError } from '@faasjs/browser';
 export { FaasBrowserClient, Options, Response, ResponseError, ResponseHeaders } from '@faasjs/browser';
-import { FaasAction, FaasParams, FaasData } from '@faasjs/types';
+import { FaasAction, FaasData, FaasParams } from '@faasjs/types';
 
 declare type FaasDataInjection<Data = any> = {
+    action: string | any;
+    params: Record<string, any>;
     loading: boolean;
     data: Data;
     error: any;
@@ -13,17 +15,21 @@ declare type FaasDataInjection<Data = any> = {
     setPromise: React.Dispatch<React.SetStateAction<Promise<Response<Data>>>>;
     setError: React.Dispatch<React.SetStateAction<any>>;
 };
-declare type FaasDataProps<PathOrData extends FaasAction> = {
-    element(args: FaasDataInjection<FaasData<PathOrData>>): JSX.Element;
+declare type FaasDataWrapperProps<PathOrData extends FaasAction> = {
+    render?(args: FaasDataInjection<FaasData<PathOrData>>): JSX.Element;
     fallback?: JSX.Element | false;
     action: string;
     params?: FaasParams<PathOrData>;
     onDataChange?(args: FaasDataInjection<FaasData<PathOrData>>): void;
+    /** use custom data, should work with setData */
+    data?: FaasData<PathOrData>;
+    /** use custom setData, should work with data */
+    setData?: React.Dispatch<React.SetStateAction<FaasData<PathOrData>>>;
 };
 declare type FaasReactClientInstance = {
     faas: <PathOrData extends FaasAction>(action: string | PathOrData, params: FaasParams<PathOrData>) => Promise<Response<FaasData<PathOrData>>>;
     useFaas: <PathOrData extends FaasAction>(action: string | PathOrData, defaultParams: FaasParams<PathOrData>) => FaasDataInjection<FaasData<PathOrData>>;
-    FaasData<PathOrData extends FaasAction>(props: FaasDataProps<PathOrData>): JSX.Element;
+    FaasDataWrapper<PathOrData extends FaasAction>(props: FaasDataWrapperProps<PathOrData>): JSX.Element;
 };
 declare function FaasReactClient({ domain, options, onError }: {
     domain: string;
@@ -31,5 +37,8 @@ declare function FaasReactClient({ domain, options, onError }: {
     onError?: (action: string, params: Record<string, any>) => (res: ResponseError) => Promise<void>;
 }): FaasReactClientInstance;
 declare function getClient(domain?: string): FaasReactClientInstance;
+declare function FaasDataWrapper<PathOrData extends FaasAction>(props: FaasDataWrapperProps<PathOrData> & {
+    client?: FaasReactClientInstance;
+}): JSX.Element;
 
-export { FaasReactClient, getClient };
+export { FaasDataInjection, FaasDataWrapper, FaasDataWrapperProps, FaasReactClient, FaasReactClientInstance, getClient };

package/dist/index.js

@@ -1,7 +1,21 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __export = (target, all) => {
   for (var name in all)
@@ -21,9 +35,10 @@ var __toCommonJS = /* @__PURE__ */ ((cache) => {
   };
 })(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
 
-// src/index.ts
+// src/index.tsx
 var src_exports = {};
 __export(src_exports, {
+  FaasDataWrapper: () => FaasDataWrapper,
   FaasReactClient: () => FaasReactClient,
   getClient: () => getClient
 });
@@ -44,7 +59,9 @@ function FaasReactClient({
       });
     return client.action(action, params);
   }
-  function useFaas(action, defaultParams) {
+  function useFaas(action, defaultParams, options2) {
+    if (!options2)
+      options2 = {};
     const [loading, setLoading] = (0, import_react.useState)(true);
     const [data, setData] = (0, import_react.useState)();
     const [error, setError] = (0, import_react.useState)();
@@ -60,7 +77,7 @@ function FaasReactClient({
       setLoading(true);
       const request = client.action(action, params);
       setPromise(request);
-      request.then((r) => setData(r.data)).catch(async (e) => {
+      request.then((r) => (options2 == null ? void 0 : options2.setData) ? options2.setData(r.data) : setData(r.data)).catch(async (e) => {
         if (onError)
           try {
             await onError(action, params)(e);
@@ -78,8 +95,10 @@ function FaasReactClient({
       reloadTimes
     ]);
     return {
+      action,
+      params,
       loading,
-      data,
+      data: (options2 == null ? void 0 : options2.data) || data,
       error,
       promise,
       async reload(params2) {
@@ -88,7 +107,7 @@ function FaasReactClient({
         setReloadTimes(reloadTimes + 1);
         return promise;
       },
-      setData,
+      setData: (options2 == null ? void 0 : options2.setData) || setData,
       setLoading,
       setPromise,
       setError
@@ -97,14 +116,19 @@ function FaasReactClient({
   const reactClient = {
     faas,
     useFaas,
-    FaasData({
+    FaasDataWrapper({
       action,
       params,
       fallback,
-      element,
-      onDataChange
+      render,
+      onDataChange,
+      data,
+      setData
     }) {
-      const request = useFaas(action, params);
+      const request = useFaas(action, params, {
+        data,
+        setData
+      });
       const [loaded, setLoaded] = (0, import_react.useState)(false);
       (0, import_react.useEffect)(function() {
         if (!loaded && !request.loading)
@@ -115,7 +139,7 @@ function FaasReactClient({
           onDataChange(request);
       }, [JSON.stringify(request.data)]);
       if (loaded)
-        return element(request);
+        return render(request);
       return fallback || null;
     }
   };
@@ -128,9 +152,21 @@ function getClient(domain) {
     throw Error("FaasReactClient is not initialized");
   return client;
 }
+function FaasDataWrapper(props) {
+  const [client, setClient] = (0, import_react.useState)(props.client);
+  (0, import_react.useEffect)(() => {
+    if (client)
+      return;
+    setClient(getClient());
+  }, []);
+  if (!client)
+    return props.fallback || null;
+  return /* @__PURE__ */ React.createElement(client.FaasDataWrapper, __spreadValues({}, props));
+}
 module.exports = __toCommonJS(src_exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  FaasDataWrapper,
   FaasReactClient,
   getClient
 });

package/dist/index.mjs

@@ -1,4 +1,21 @@
-// src/index.ts
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+
+// src/index.tsx
 import {
   FaasBrowserClient
 } from "@faasjs/browser";
@@ -18,7 +35,9 @@ function FaasReactClient({
       });
     return client.action(action, params);
   }
-  function useFaas(action, defaultParams) {
+  function useFaas(action, defaultParams, options2) {
+    if (!options2)
+      options2 = {};
     const [loading, setLoading] = useState(true);
     const [data, setData] = useState();
     const [error, setError] = useState();
@@ -34,7 +53,7 @@ function FaasReactClient({
       setLoading(true);
       const request = client.action(action, params);
       setPromise(request);
-      request.then((r) => setData(r.data)).catch(async (e) => {
+      request.then((r) => (options2 == null ? void 0 : options2.setData) ? options2.setData(r.data) : setData(r.data)).catch(async (e) => {
         if (onError)
           try {
             await onError(action, params)(e);
@@ -52,8 +71,10 @@ function FaasReactClient({
       reloadTimes
     ]);
     return {
+      action,
+      params,
       loading,
-      data,
+      data: (options2 == null ? void 0 : options2.data) || data,
       error,
       promise,
       async reload(params2) {
@@ -62,7 +83,7 @@ function FaasReactClient({
         setReloadTimes(reloadTimes + 1);
         return promise;
       },
-      setData,
+      setData: (options2 == null ? void 0 : options2.setData) || setData,
       setLoading,
       setPromise,
       setError
@@ -71,14 +92,19 @@ function FaasReactClient({
   const reactClient = {
     faas,
     useFaas,
-    FaasData({
+    FaasDataWrapper({
       action,
       params,
       fallback,
-      element,
-      onDataChange
+      render,
+      onDataChange,
+      data,
+      setData
     }) {
-      const request = useFaas(action, params);
+      const request = useFaas(action, params, {
+        data,
+        setData
+      });
       const [loaded, setLoaded] = useState(false);
       useEffect(function() {
         if (!loaded && !request.loading)
@@ -89,7 +115,7 @@ function FaasReactClient({
           onDataChange(request);
       }, [JSON.stringify(request.data)]);
       if (loaded)
-        return element(request);
+        return render(request);
       return fallback || null;
     }
   };
@@ -102,7 +128,19 @@ function getClient(domain) {
     throw Error("FaasReactClient is not initialized");
   return client;
 }
+function FaasDataWrapper(props) {
+  const [client, setClient] = useState(props.client);
+  useEffect(() => {
+    if (client)
+      return;
+    setClient(getClient());
+  }, []);
+  if (!client)
+    return props.fallback || null;
+  return /* @__PURE__ */ React.createElement(client.FaasDataWrapper, __spreadValues({}, props));
+}
 export {
+  FaasDataWrapper,
   FaasReactClient,
   getClient
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/react",
-  "version": "0.0.2-beta.352",
+  "version": "0.0.2-beta.356",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,15 +15,15 @@
   },
   "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
-    "build": "tsup src/index.ts --format esm,cjs",
-    "build:types": "tsup-node src/index.ts --dts-only"
+    "build": "tsup src/index.tsx --format esm,cjs",
+    "build:types": "tsup-node src/index.tsx --dts-only"
   },
   "files": [
     "dist"
   ],
   "peerDependencies": {
-    "@faasjs/browser": "^0.0.2-beta.352",
-    "@faasjs/types": "^0.0.2-beta.352",
+    "@faasjs/browser": "^0.0.2-beta.356",
+    "@faasjs/types": "^0.0.2-beta.356",
     "react": "*"
   },
   "devDependencies": {