@faasjs/react 0.0.2-beta.252 → 0.0.2-beta.280

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

@@ -1,16 +1,16 @@
-export interface Params {
+export declare type Params = {
     [key: string]: any;
-}
-export interface Options {
+};
+export declare type Options = {
     beforeRequest?: ({ action, params, xhr }: {
         action: string;
         params: Params;
         xhr: XMLHttpRequest;
-    }) => void;
-}
-export interface ResponseHeaders {
+    }) => Promise<void> | void;
+};
+export declare type ResponseHeaders = {
     [key: string]: string;
-}
+};
 export declare class Response<T = any> {
     readonly status: number;
     readonly headers: ResponseHeaders;

package/lib/index.js

@@ -1,301 +1,179 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
-    typeof define === 'function' && define.amd ? define(['exports'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.FaasReactClient = {}));
-}(this, (function (exports) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'react'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.FaasReactClient = {}, global.React));
+})(this, (function (exports, React) { 'use strict';
 
-    /*! *****************************************************************************
-    Copyright (c) Microsoft Corporation.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose with or without fee is hereby granted.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-    REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-    LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-    ***************************************************************************** */
-    /* global Reflect, Promise */
-
-    var extendStatics = function(d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-
-    function __extends(d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    }
-
-    var __assign = function() {
-        __assign = Object.assign || function __assign(t) {
-            for (var s, i = 1, n = arguments.length; i < n; i++) {
-                s = arguments[i];
-                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-            }
-            return t;
-        };
-        return __assign.apply(this, arguments);
-    };
-
-    function __awaiter(thisArg, _arguments, P, generator) {
-        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-        return new (P || (P = Promise))(function (resolve, reject) {
-            function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-            function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-            step((generator = generator.apply(thisArg, _arguments || [])).next());
-        });
-    }
-
-    function __generator(thisArg, body) {
-        var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-        return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-        function verb(n) { return function (v) { return step([n, v]); }; }
-        function step(op) {
-            if (f) throw new TypeError("Generator is already executing.");
-            while (_) try {
-                if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-                if (y = 0, t) op = [op[0] & 2, t.value];
-                switch (op[0]) {
-                    case 0: case 1: t = op; break;
-                    case 4: _.label++; return { value: op[1], done: false };
-                    case 5: _.label++; y = op[1]; op = [0]; continue;
-                    case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                    default:
-                        if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                        if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                        if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                        if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                        if (t[2]) _.ops.pop();
-                        _.trys.pop(); continue;
-                }
-                op = body.call(thisArg, _);
-            } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-            if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-        }
-    }
-
-    function __read(o, n) {
-        var m = typeof Symbol === "function" && o[Symbol.iterator];
-        if (!m) return o;
-        var i = m.call(o), r, ar = [], e;
-        try {
-            while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-        }
-        catch (error) { e = { error: error }; }
-        finally {
-            try {
-                if (r && !r.done && (m = i["return"])) m.call(i);
-            }
-            finally { if (e) throw e.error; }
-        }
-        return ar;
-    }
+  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-    var Response = /** @class */ (function () {
-        function Response(_a) {
-            var status = _a.status, headers = _a.headers, data = _a.data;
-            this.status = status;
-            this.headers = headers;
-            this.data = data;
-        }
-        return Response;
-    }());
-    var ResponseError = /** @class */ (function (_super) {
-        __extends(ResponseError, _super);
-        function ResponseError(_a) {
-            var message = _a.message, status = _a.status, headers = _a.headers, body = _a.body;
-            var _this = _super.call(this, message) || this;
-            _this.status = status;
-            _this.headers = headers;
-            _this.body = body;
-            return _this;
-        }
-        return ResponseError;
-    }(Error));
-    var FaasBrowserClient = /** @class */ (function () {
-        /**
-         * 创建 FaasJS 浏览器客户端
-         * @param baseUrl {string} 网关地址
-         * @param options {object} 默认配置项
-         */
-        function FaasBrowserClient(baseUrl, options) {
-            this.host = baseUrl[baseUrl.length - 1] === '/' ? baseUrl : baseUrl + '/';
-            this.defaultOptions = options || Object.create(null);
-            console.debug('[faas] baseUrl: ' + this.host);
-        }
-        /**
-         * 发起请求
-         * @param action {string} 动作名称
-         * @param params {any} 动作参数
-         * @param options {object} 默认配置项
-         */
-        FaasBrowserClient.prototype.action = function (action, params, options) {
-            if (options === void 0) { options = {}; }
-            return __awaiter(this, void 0, void 0, function () {
-                var url;
-                return __generator(this, function (_a) {
-                    url = this.host + action.toLowerCase() + '?_=' + new Date().getTime().toString();
-                    options = __assign(__assign({}, this.defaultOptions), options);
-                    return [2 /*return*/, new Promise(function (resolve, reject) {
-                            var xhr = new XMLHttpRequest();
-                            xhr.open('POST', url);
-                            xhr.withCredentials = true;
-                            xhr.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
-                            if (options.beforeRequest)
-                                options.beforeRequest({
-                                    action: action,
-                                    params: params,
-                                    xhr: xhr
-                                });
-                            xhr.onload = function () {
-                                var _a;
-                                var res = xhr.response;
-                                var headersList = xhr.getAllResponseHeaders().trim().split(/[\r\n]+/);
-                                var headers = {};
-                                headersList.forEach(function (line) {
-                                    var parts = line.split(': ');
-                                    var key = parts.shift();
-                                    var value = parts.join(': ');
-                                    if (key)
-                                        headers[key] = value;
-                                });
-                                if (xhr.response && ((_a = xhr.getResponseHeader('Content-Type')) === null || _a === void 0 ? void 0 : _a.includes('json')))
-                                    try {
-                                        res = JSON.parse(xhr.response);
-                                        if (res.error && res.error.message)
-                                            reject(new ResponseError({
-                                                message: res.error.message,
-                                                status: xhr.status,
-                                                headers: headers,
-                                                body: res
-                                            }));
-                                    }
-                                    catch (error) {
-                                        console.error(error);
-                                    }
-                                if (xhr.status >= 200 && xhr.status < 300)
-                                    resolve(new Response({
-                                        status: xhr.status,
-                                        headers: headers,
-                                        data: res.data
-                                    }));
-                                else {
-                                    console.error(xhr, res);
-                                    reject(new ResponseError({
-                                        message: xhr.statusText || xhr.status.toString(),
-                                        status: xhr.status,
-                                        headers: headers,
-                                        body: res
-                                    }));
-                                }
-                            };
-                            xhr.onerror = function () {
-                                reject(new ResponseError({
-                                    message: 'Network Error',
-                                    status: xhr.status,
-                                    headers: {},
-                                    body: null
-                                }));
-                            };
-                            xhr.send(JSON.stringify(params));
-                        })];
-                });
-            });
-        };
-        return FaasBrowserClient;
-    }());
+  var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-    function FaasReactClient(_a) {
-        var domain = _a.domain, options = _a.options, onError = _a.onError;
-        var client = new FaasBrowserClient(domain, options);
-        return {
-            faas: function (action, params) {
-                return __awaiter(this, void 0, void 0, function () {
-                    return __generator(this, function (_a) {
-                        if (onError)
-                            return [2 /*return*/, client.action(action, params).catch(onError(action, params))];
-                        return [2 /*return*/, client.action(action, params)];
-                    });
-                });
-            },
-            useFaas: function (action, defaultParams) {
-                var _a = __read(React.useState(false), 2), loading = _a[0], setLoading = _a[1];
-                var _b = __read(React.useState(), 2), data = _b[0], setData = _b[1];
-                var _c = __read(React.useState(), 2), error = _c[0], setError = _c[1];
-                var _d = __read(React.useState(), 2), promise = _d[0], setPromise = _d[1];
-                var _e = __read(React.useState(defaultParams), 2), params = _e[0], setParams = _e[1];
-                var _f = __read(React.useState(0), 2), reloadTimes = _f[0], setReloadTimes = _f[1];
-                React.useEffect(function () {
-                    var _this = this;
-                    setLoading(true);
-                    var request = client.action(action, params);
-                    setPromise(request);
-                    request
-                        .then(function (r) {
-                        setData(r === null || r === void 0 ? void 0 : r.data);
-                    })
-                        .catch(function (e) { return __awaiter(_this, void 0, void 0, function () {
-                        var _a, error_1;
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0:
-                                    if (!onError) return [3 /*break*/, 4];
-                                    _b.label = 1;
-                                case 1:
-                                    _b.trys.push([1, 3, , 4]);
-                                    _a = setData;
-                                    return [4 /*yield*/, onError(action, params)(e)];
-                                case 2:
-                                    _a.apply(void 0, [_b.sent()]);
-                                    return [3 /*break*/, 4];
-                                case 3:
-                                    error_1 = _b.sent();
-                                    setError(error_1);
-                                    return [3 /*break*/, 4];
-                                case 4:
-                                    setError(e);
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); })
-                        .finally(function () { return setLoading(false); });
-                }, [
-                    action,
-                    JSON.stringify(params),
-                    reloadTimes
-                ]);
-                return {
-                    loading: loading,
-                    data: data,
-                    error: error,
-                    promise: promise,
-                    reload: function (params) {
-                        return __awaiter(this, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                if (params)
-                                    setParams(params);
-                                setReloadTimes(reloadTimes + 1);
-                                return [2 /*return*/, promise];
-                            });
-                        });
-                    }
-                };
-            }
-        };
-    }
+  class Response {
+      constructor({ status, headers, data }) {
+          this.status = status;
+          this.headers = headers;
+          this.data = data;
+      }
+  }
+  class ResponseError extends Error {
+      constructor({ message, status, headers, body }) {
+          super(message);
+          this.status = status;
+          this.headers = headers;
+          this.body = body;
+      }
+  }
+  class FaasBrowserClient {
+      /**
+       * 创建 FaasJS 浏览器客户端
+       * @param baseUrl {string} 网关地址
+       * @param options {object} 默认配置项
+       */
+      constructor(baseUrl, options) {
+          this.host = baseUrl[baseUrl.length - 1] === '/' ? baseUrl : baseUrl + '/';
+          this.defaultOptions = options || Object.create(null);
+          console.debug('[faas] baseUrl: ' + this.host);
+      }
+      /**
+       * 发起请求
+       * @param action {string} 动作名称
+       * @param params {any} 动作参数
+       * @param options {object} 默认配置项
+       */
+      async action(action, params, options = {}) {
+          const url = this.host + action.toLowerCase() + '?_=' + new Date().getTime().toString();
+          options = Object.assign(Object.assign({}, this.defaultOptions), options);
+          const xhr = new XMLHttpRequest();
+          xhr.open('POST', url);
+          xhr.withCredentials = true;
+          xhr.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
+          if (options.beforeRequest)
+              await options.beforeRequest({
+                  action,
+                  params,
+                  xhr
+              });
+          return new Promise(function (resolve, reject) {
+              xhr.onload = function () {
+                  var _a;
+                  let res = xhr.response;
+                  const headersList = xhr.getAllResponseHeaders().trim().split(/[\r\n]+/);
+                  const headers = {};
+                  headersList.forEach(function (line) {
+                      const parts = line.split(': ');
+                      const key = parts.shift();
+                      const value = parts.join(': ');
+                      if (key)
+                          headers[key] = value;
+                  });
+                  if (xhr.response && ((_a = xhr.getResponseHeader('Content-Type')) === null || _a === void 0 ? void 0 : _a.includes('json')))
+                      try {
+                          res = JSON.parse(xhr.response);
+                          if (res.error && res.error.message)
+                              reject(new ResponseError({
+                                  message: res.error.message,
+                                  status: xhr.status,
+                                  headers,
+                                  body: res
+                              }));
+                      }
+                      catch (error) {
+                          console.error(error);
+                      }
+                  if (xhr.status >= 200 && xhr.status < 300)
+                      resolve(new Response({
+                          status: xhr.status,
+                          headers,
+                          data: res.data
+                      }));
+                  else {
+                      console.error(xhr, res);
+                      reject(new ResponseError({
+                          message: xhr.statusText || xhr.status.toString(),
+                          status: xhr.status,
+                          headers,
+                          body: res
+                      }));
+                  }
+              };
+              xhr.onerror = function () {
+                  reject(new ResponseError({
+                      message: 'Network Error',
+                      status: xhr.status,
+                      headers: {},
+                      body: null
+                  }));
+              };
+              xhr.send(JSON.stringify(params));
+          });
+      }
+  }
 
-    exports.FaasReactClient = FaasReactClient;
+  function FaasReactClient({ domain, options, onError }) {
+      const client = new FaasBrowserClient(domain, options);
+      return {
+          async faas(action, params) {
+              if (onError)
+                  return client.action(action, params).catch(onError(action, params));
+              return client.action(action, params);
+          },
+          useFaas(action, defaultParams) {
+              const [loading, setLoading] = React__default["default"].useState(false);
+              const [data, setData] = React__default["default"].useState();
+              const [error, setError] = React__default["default"].useState();
+              const [promise, setPromise] = React__default["default"].useState();
+              const [params, setParams] = React__default["default"].useState(defaultParams);
+              const [reloadTimes, setReloadTimes] = React__default["default"].useState(0);
+              React__default["default"].useEffect(function () {
+                  if (JSON.stringify(defaultParams) !== JSON.stringify(params)) {
+                      setParams(defaultParams);
+                  }
+              }, [defaultParams]);
+              React__default["default"].useEffect(function () {
+                  setLoading(true);
+                  const request = client.action(action, params);
+                  setPromise(request);
+                  request
+                      .then(r => {
+                      setData(r === null || r === void 0 ? void 0 : r.data);
+                  })
+                      .catch(async (e) => {
+                      if (onError)
+                          try {
+                              setData(await onError(action, params)(e));
+                          }
+                          catch (error) {
+                              setError(error);
+                          }
+                      setError(e);
+                  })
+                      .finally(() => setLoading(false));
+                  return () => {
+                      setLoading(false);
+                  };
+              }, [
+                  action,
+                  JSON.stringify(params),
+                  reloadTimes
+              ]);
+              return {
+                  loading,
+                  data,
+                  error,
+                  promise,
+                  async reload(params) {
+                      if (params)
+                          setParams(params);
+                      setReloadTimes(reloadTimes + 1);
+                      return promise;
+                  }
+              };
+          }
+      };
+  }
 
-    Object.defineProperty(exports, '__esModule', { value: true });
+  exports.FaasReactClient = FaasReactClient;
 
-})));
+  Object.defineProperty(exports, '__esModule', { value: true });
+
+}));

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

@@ -1,15 +1,17 @@
 import { Options, Params, Response, ResponseError } from '../../browser/src';
+export declare type faas = <T = any>(action: string, params: Params) => Promise<Response<T>>;
+export declare type useFaas = <T = any>(action: string, params: Params) => {
+    loading: boolean;
+    data: T;
+    error: any;
+    promise: Promise<Response<T>>;
+    reload(params?: Params): Promise<Response<T>>;
+};
 export declare function FaasReactClient({ domain, options, onError }: {
     domain: string;
     options?: Options;
     onError?: (action: string, params: Params) => (res: ResponseError) => Promise<any>;
 }): {
-    faas: <T = any>(action: string, params: Params) => Promise<Response<T>>;
-    useFaas: <T = any>(action: string, params: Params) => {
-        loading: boolean;
-        data: T;
-        error: any;
-        promise: Promise<Response<T>>;
-        reload(params?: Params): Promise<Response<T>>;
-    };
+    faas: faas;
+    useFaas: useFaas;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/react",
-  "version": "0.0.2-beta.252",
+  "version": "0.0.2-beta.280",
   "license": "MIT",
   "main": "lib/index.js",
   "types": "lib/react/src/index.d.ts",
@@ -17,6 +17,7 @@
     "lib"
   ],
   "peerDependencies": {
+    "@faasjs/browser": "*",
     "react": "*"
   },
   "devDependencies": {
@@ -26,5 +27,5 @@
     "rollup-plugin-typescript2": "*",
     "typescript": "*"
   },
-  "gitHead": "39f7c31097c6b83e08faa12a4bf72321eaa0174e"
+  "gitHead": "7f68b54ee55e1a325a1e9a422b81b8e088a74d63"
 }