aidbox-react 1.3.3 → 1.4.0

package/lib/hooks/service.d.ts

@@ -1,6 +1,8 @@
 import { RemoteData, RemoteDataResult } from '../libs/remoteData';
-export interface ServiceManager<S> {
+export interface ServiceManager<S, F> {
     reload: () => void;
+    reloadAsync: () => Promise<RemoteDataResult<S, F>>;
+    softReloadAsync: () => Promise<RemoteDataResult<S, F>>;
     set: (dataOrFn: S | ((data: S) => S)) => void;
 }
-export declare function useService<S = any, F = any>(asyncFunction: () => Promise<RemoteDataResult<S, F>>, deps?: ReadonlyArray<any>): [RemoteData<S, F>, ServiceManager<S>];
+export declare function useService<S = any, F = any>(asyncFunction: () => Promise<RemoteDataResult<S, F>>, deps?: ReadonlyArray<any>): [RemoteData<S, F>, ServiceManager<S, F>];

package/lib/hooks/service.js

@@ -8,37 +8,72 @@ function useService(asyncFunction, deps) {
     var _this = this;
     if (deps === void 0) { deps = []; }
     var _a = react_1.useState(remoteData_1.notAsked), remoteData = _a[0], setRemoteData = _a[1];
-    // Use another state variable to trigger effect on demand
     var _b = react_1.useState(0), reloadsCount = _b[0], setReloadsCount = _b[1];
+    var reload = react_1.useCallback(function () { return setReloadsCount(function (x) { return x + 1; }); }, []);
+    var load = react_1.useCallback(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        var err_1;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, asyncFunction()];
+                case 1: return [2 /*return*/, _a.sent()];
+                case 2:
+                    err_1 = _a.sent();
+                    return [2 /*return*/, remoteData_1.failure(err_1.response ? err_1.response.data : err_1.message)];
+                case 3: return [2 /*return*/];
+            }
+        });
+    }); }, deps);
+    var softReloadAsync = react_1.useCallback(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        var response;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, load()];
+                case 1:
+                    response = _a.sent();
+                    setRemoteData(response);
+                    return [2 /*return*/, response];
+            }
+        });
+    }); }, tslib_1.__spreadArrays(deps, [load]));
+    var reloadAsync = react_1.useCallback(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        var response;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    setRemoteData(remoteData_1.loading);
+                    return [4 /*yield*/, load()];
+                case 1:
+                    response = _a.sent();
+                    setRemoteData(response);
+                    return [2 /*return*/, response];
+            }
+        });
+    }); }, tslib_1.__spreadArrays(deps, [load]));
     react_1.useEffect(function () {
         (function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var response, err_1;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+            var _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         setRemoteData(remoteData_1.loading);
-                        _a.label = 1;
+                        _a = setRemoteData;
+                        return [4 /*yield*/, load()];
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, asyncFunction()];
-                    case 2:
-                        response = _a.sent();
-                        setRemoteData(response);
-                        return [3 /*break*/, 4];
-                    case 3:
-                        err_1 = _a.sent();
-                        setRemoteData(remoteData_1.failure(err_1.response ? err_1.response.data : err_1.message));
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
+                        _a.apply(void 0, [_b.sent()]);
+                        return [2 /*return*/];
                 }
             });
         }); })();
-        // eslint-disable-next-line
-    }, deps.concat(reloadsCount));
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, tslib_1.__spreadArrays(deps, [reloadsCount, load]));
     return [
         remoteData,
         {
-            reload: function () { return setReloadsCount(function (count) { return count + 1; }); },
+            reload: reload,
+            reloadAsync: reloadAsync,
+            softReloadAsync: softReloadAsync,
             set: function (dataOrFn) {
                 if (typeof dataOrFn === 'function') {
                     setRemoteData(function (rd) { return (remoteData_1.isSuccess(rd) ? remoteData_1.success(dataOrFn(rd.data)) : rd); });

package/lib/hooks/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/hooks/service.ts"],"names":[],"mappings":";;;;AAAA,+BAA4C;AAE5C,iDAAkH;AAOlH,SAAgB,UAAU,CACtB,aAAoD,EACpD,IAA6B;IAFjC,iBAmCC;IAjCG,qBAAA,EAAA,SAA6B;IAEvB,IAAA,KAA8B,gBAAQ,CAAmB,qBAAQ,CAAC,EAAjE,UAAU,QAAA,EAAE,aAAa,QAAwC,CAAC;IAEzE,yDAAyD;IACnD,IAAA,KAAkC,gBAAQ,CAAC,CAAC,CAAC,EAA5C,YAAY,QAAA,EAAE,eAAe,QAAe,CAAC;IAEpD,iBAAS,CAAC;QACN,CAAC;;;;;wBACG,aAAa,CAAC,oBAAO,CAAC,CAAC;;;;wBAEsB,qBAAM,aAAa,EAAE,EAAA;;wBAAxD,QAAQ,GAA2B,SAAqB;wBAC9D,aAAa,CAAC,QAAQ,CAAC,CAAC;;;;wBAExB,aAAa,CAAC,oBAAO,CAAC,KAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAG,CAAC,OAAO,CAAC,CAAC,CAAC;;;;;aAE9E,CAAC,EAAE,CAAC;QACL,2BAA2B;IAC/B,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;IAE9B,OAAO;QACH,UAAU;QACV;YACI,MAAM,EAAE,cAAM,OAAA,eAAe,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,GAAG,CAAC,EAAT,CAAS,CAAC,EAArC,CAAqC;YACnD,GAAG,EAAE,UAAC,QAA8B;gBAChC,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;oBAChC,aAAa,CAAC,UAAC,EAAE,IAAK,OAAA,CAAC,sBAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,oBAAO,CAAE,QAA2B,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAArE,CAAqE,CAAC,CAAC;iBAChG;qBAAM;oBACH,aAAa,CAAC,oBAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;iBACpC;YACL,CAAC;SACJ;KACJ,CAAC;AACN,CAAC;AAnCD,gCAmCC"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/hooks/service.ts"],"names":[],"mappings":";;;;AAAA,+BAAyD;AAEzD,iDAAkH;AAalH,SAAgB,UAAU,CACtB,aAAoD,EACpD,IAA6B;IAFjC,iBAyDC;IAvDG,qBAAA,EAAA,SAA6B;IAEvB,IAAA,KAA8B,gBAAQ,CAAmB,qBAAQ,CAAC,EAAjE,UAAU,QAAA,EAAE,aAAa,QAAwC,CAAC;IACnE,IAAA,KAAkC,gBAAQ,CAAC,CAAC,CAAC,EAA5C,YAAY,QAAA,EAAE,eAAe,QAAe,CAAC;IACpD,IAAM,MAAM,GAAG,mBAAW,CAAC,cAAM,OAAA,eAAe,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,GAAG,CAAC,EAAL,CAAK,CAAC,EAA7B,CAA6B,EAAE,EAAE,CAAC,CAAC;IAEpE,IAAM,IAAI,GAAG,mBAAW,CAAC;;;;;;oBAEV,qBAAM,aAAa,EAAE,EAAA;wBAA5B,sBAAO,SAAqB,EAAC;;;oBAE7B,sBAAO,oBAAO,CAAC,KAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAG,CAAC,OAAO,CAAC,EAAC;;;;SAGtE,EAAE,IAAI,CAAC,CAAC;IAET,IAAM,eAAe,GAAG,mBAAW,CAAC;;;;wBACf,qBAAM,IAAI,EAAE,EAAA;;oBAAvB,QAAQ,GAAG,SAAY;oBAC7B,aAAa,CAAC,QAAQ,CAAC,CAAC;oBAExB,sBAAO,QAAQ,EAAC;;;SAEnB,yBAAM,IAAI,GAAE,IAAI,GAAE,CAAC;IAEpB,IAAM,WAAW,GAAG,mBAAW,CAAC;;;;;oBAC5B,aAAa,CAAC,oBAAO,CAAC,CAAC;oBACN,qBAAM,IAAI,EAAE,EAAA;;oBAAvB,QAAQ,GAAG,SAAY;oBAC7B,aAAa,CAAC,QAAQ,CAAC,CAAC;oBAExB,sBAAO,QAAQ,EAAC;;;SAEnB,yBAAM,IAAI,GAAE,IAAI,GAAE,CAAC;IAEpB,iBAAS,CAAC;QACN,CAAC;;;;;wBACG,aAAa,CAAC,oBAAO,CAAC,CAAC;wBACvB,KAAA,aAAa,CAAA;wBAAC,qBAAM,IAAI,EAAE,EAAA;;wBAA1B,kBAAc,SAAY,EAAC,CAAC;;;;aAC/B,CAAC,EAAE,CAAC;QACL,uDAAuD;IAC3D,CAAC,yBAAM,IAAI,GAAE,YAAY,EAAE,IAAI,GAAE,CAAC;IAElC,OAAO;QACH,UAAU;QACV;YACI,MAAM,QAAA;YACN,WAAW,aAAA;YACX,eAAe,iBAAA;YACf,GAAG,EAAE,UAAC,QAA8B;gBAChC,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;oBAChC,aAAa,CAAC,UAAC,EAAE,IAAK,OAAA,CAAC,sBAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,oBAAO,CAAE,QAA2B,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAArE,CAAqE,CAAC,CAAC;iBAChG;qBAAM;oBACH,aAAa,CAAC,oBAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;iBACpC;YACL,CAAC;SACJ;KACJ,CAAC;AACN,CAAC;AAzDD,gCAyDC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "aidbox-react",
-    "version": "1.3.3",
+    "version": "1.4.0",
     "scripts": {
         "build": "tsc",
         "coverage": "jest --config=./jest.config.json --coverage --coverageReporters=text-lcov | coveralls",
@@ -9,7 +9,7 @@
         "prepare": "npm run build"
     },
     "dependencies": {
-        "axios": "^0.21.1",
+        "axios": "^0.21.2",
         "moment": "^2.29.1"
     },
     "devDependencies": {

package/src/hooks/service.ts

@@ -1,38 +1,66 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useCallback } from 'react';
 
 import { loading, notAsked, RemoteData, RemoteDataResult, success, failure, isSuccess } from '../libs/remoteData';
 
-export interface ServiceManager<S> {
+export interface ServiceManager<S, F> {
+    // `reload` just sends signal to reload
     reload: () => void;
+    // `reloadAsync` returns Promise and intialize loading from the loading state
+    reloadAsync: () => Promise<RemoteDataResult<S, F>>;
+    // `softReloadAsync` returns Promise and intialize just updates
+    // remoteData with success/failure state without preloading
+    softReloadAsync: () => Promise<RemoteDataResult<S, F>>;
     set: (dataOrFn: S | ((data: S) => S)) => void;
 }
 
 export function useService<S = any, F = any>(
     asyncFunction: () => Promise<RemoteDataResult<S, F>>,
     deps: ReadonlyArray<any> = []
-): [RemoteData<S, F>, ServiceManager<S>] {
+): [RemoteData<S, F>, ServiceManager<S, F>] {
     const [remoteData, setRemoteData] = useState<RemoteData<S, F>>(notAsked);
-
-    // Use another state variable to trigger effect on demand
     const [reloadsCount, setReloadsCount] = useState(0);
+    const reload = useCallback(() => setReloadsCount((x) => x + 1), []);
+
+    const load = useCallback(async () => {
+        try {
+            return await asyncFunction();
+        } catch (err: any) {
+            return failure(err.response ? err.response.data : err.message);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, deps);
+
+    const softReloadAsync = useCallback(async () => {
+        const response = await load();
+        setRemoteData(response);
+
+        return response;
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [...deps, load]);
+
+    const reloadAsync = useCallback(async () => {
+        setRemoteData(loading);
+        const response = await load();
+        setRemoteData(response);
+
+        return response;
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [...deps, load]);
 
     useEffect(() => {
         (async () => {
             setRemoteData(loading);
-            try {
-                const response: RemoteDataResult<S, F> = await asyncFunction();
-                setRemoteData(response);
-            } catch (err: any) {
-                setRemoteData(failure(err.response ? err.response.data : err.message));
-            }
+            setRemoteData(await load());
         })();
-        // eslint-disable-next-line
-    }, deps.concat(reloadsCount));
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [...deps, reloadsCount, load]);
 
     return [
         remoteData,
         {
-            reload: () => setReloadsCount((count) => count + 1),
+            reload,
+            reloadAsync,
+            softReloadAsync,
             set: (dataOrFn: S | ((data: S) => S)) => {
                 if (typeof dataOrFn === 'function') {
                     setRemoteData((rd) => (isSuccess(rd) ? success((dataOrFn as (data: S) => S)(rd.data)) : rd));

package/CHANGELOG.md

@@ -1,20 +0,0 @@
-## 1.3.3
-
-- Adjust the code for new ts
-
-## 1.3.2
-
--   Fix build
-
-## 1.3.0
-
--   findFHIRResources uses getFHIRResources under the hood
--   formatError respects OperationOutcome.issue.diagnostics in addition to OperationOutcome.issue.details.text
-
-## 1.2.0
-
--   All requests helpers from FHIR module returns Resources wrapped with WithId type-wrapper.
-
-## 1.1.1
-
--   Stable release