@opengeoweb/api 5.2.1 → 6.0.1

package/index.js

@@ -135,7 +135,10 @@ function _regeneratorRuntime() {
       if ("executing" === state) throw new Error("Generator is already running");
       if ("completed" === state) {
         if ("throw" === method) throw arg;
-        return doneResult();
+        return {
+          value: void 0,
+          done: !0
+        };
       }
       for (context.method = method, context.arg = arg;;) {
         var delegate = context.delegate;
@@ -188,7 +191,7 @@ function _regeneratorRuntime() {
     }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0);
   }
   function values(iterable) {
-    if (iterable) {
+    if (iterable || "" === iterable) {
       var iteratorMethod = iterable[iteratorSymbol];
       if (iteratorMethod) return iteratorMethod.call(iterable);
       if ("function" == typeof iterable.next) return iterable;
@@ -201,15 +204,7 @@ function _regeneratorRuntime() {
         return next.next = next;
       }
     }
-    return {
-      next: doneResult
-    };
-  }
-  function doneResult() {
-    return {
-      value: undefined,
-      done: !0
-    };
+    throw new TypeError(typeof iterable + " is not iterable");
   }
   return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", {
     value: GeneratorFunctionPrototype,
@@ -419,9 +414,9 @@ function __awaiter(thisArg, _arguments, P, generator) {
 var generateRandomId = function generateRandomId() {
   return "-".concat(Math.random().toString(36).substr(2, 9));
 };
+var useApi = function useApi(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-var useApi = function useApi(apiCall) {
-  var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+apiCall, params) {
   var _useIsMounted = useIsMounted(),
     isMounted = _useIsMounted.isMounted;
   var _React$useState = React.useState(generateRandomId()),
@@ -440,8 +435,7 @@ var useApi = function useApi(apiCall) {
     result = _React$useState8[0],
     setResult = _React$useState8[1];
   var debouncedParams = useDebounce(JSON.stringify(params), 300);
-  var fetchApiData = function fetchApiData() {
-    var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+  var fetchApiData = function fetchApiData(_params) {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var response;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -531,10 +525,13 @@ var ApiProvider = function ApiProvider(_a) {
     return function () {
     };
   }, [handleNewApi, name]);
-  return /*#__PURE__*/React.createElement(ApiContext.Provider, {
-    value: {
+  var contextValue = React.useMemo(function () {
+    return {
       api: api
-    }
+    };
+  }, [api]);
+  return /*#__PURE__*/React.createElement(ApiContext.Provider, {
+    value: contextValue
   }, children);
 };
 function useApiContext() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/api",
-  "version": "5.2.1",
+  "version": "6.0.1",
   "description": "GeoWeb API library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,8 +13,8 @@
   "types": "./src/index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "@opengeoweb/shared": "5.2.1",
-    "axios": "1.4.0",
+    "@opengeoweb/shared": "6.0.1",
+    "axios": "1.2.0",
     "react": "18.2.0"
   }
 }

package/src/lib/components/ApiContext/types.d.ts

@@ -9,7 +9,7 @@ export interface Credentials {
     token: string;
     refresh_token: string;
     expires_at?: number;
-    keep_session_alive_at?: any;
+    keep_session_alive_at?: number;
     has_connection_issue?: boolean;
 }
 export declare type ApiUrls = {

package/src/lib/components/apihooks/useApi.d.ts

@@ -1,8 +1,12 @@
+import { ConfigType } from '@opengeoweb/shared';
+export declare type ApiParams = string | ConfigType | {
+    [key: string]: string | undefined;
+} | null;
 export interface ApiHookProps {
     isLoading: boolean;
     error: Error;
     result: any;
-    fetchApiData?: (params: any) => Promise<void>;
+    fetchApiData?: (params: ApiParams) => Promise<void>;
     clearResults?: () => void;
 }
-export declare const useApi: (apiCall: any, params?: any) => ApiHookProps;
+export declare const useApi: (apiCall?: ((params?: ApiParams | undefined, id?: string | undefined) => Promise<any>) | undefined, params?: ApiParams | undefined) => ApiHookProps;