aidbox-react 1.3.5 → 1.5.0

package/CHANGELOG.md

@@ -0,0 +1,28 @@
+## 1.5.0
+
+-   Fix useService hook performance
+
+## 1.4.0
+
+-   Add softReloadAsync ans reloadAsync to useService manager
+
+## 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

package/lib/hooks/service.d.ts

@@ -1,7 +1,8 @@
 import { RemoteData, RemoteDataResult } from '../libs/remoteData';
 export interface ServiceManager<S, F> {
-    reload: () => Promise<RemoteDataResult<S, F>>;
-    softReload: () => Promise<RemoteDataResult<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, F>];

package/lib/hooks/service.js

@@ -8,6 +8,8 @@ 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];
+    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) {
@@ -23,7 +25,7 @@ function useService(asyncFunction, deps) {
             }
         });
     }); }, deps);
-    var softReload = react_1.useCallback(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+    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) {
@@ -35,7 +37,7 @@ function useService(asyncFunction, deps) {
             }
         });
     }); }, tslib_1.__spreadArrays(deps, [load]));
-    var reload = react_1.useCallback(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+    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) {
@@ -65,22 +67,23 @@ function useService(asyncFunction, deps) {
             });
         }); })();
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, tslib_1.__spreadArrays(deps, [load]));
-    return [
-        remoteData,
-        {
-            reload: reload,
-            softReload: softReload,
-            set: function (dataOrFn) {
-                if (typeof dataOrFn === 'function') {
-                    setRemoteData(function (rd) { return (remoteData_1.isSuccess(rd) ? remoteData_1.success(dataOrFn(rd.data)) : rd); });
-                }
-                else {
-                    setRemoteData(remoteData_1.success(dataOrFn));
-                }
-            },
-        },
-    ];
+    }, tslib_1.__spreadArrays(deps, [reloadsCount, load]));
+    var set = react_1.useCallback(function (dataOrFn) {
+        if (typeof dataOrFn === 'function') {
+            setRemoteData(function (rd) { return (remoteData_1.isSuccess(rd) ? remoteData_1.success(dataOrFn(rd.data)) : rd); });
+        }
+        else {
+            setRemoteData(remoteData_1.success(dataOrFn));
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, deps);
+    var manager = react_1.useMemo(function () { return ({
+        reload: reload,
+        reloadAsync: reloadAsync,
+        softReloadAsync: softReloadAsync,
+        set: set,
+    }); }, [reload, reloadAsync, softReloadAsync, set]);
+    return [remoteData, manager];
 }
 exports.useService = useService;
 //# sourceMappingURL=service.js.map

package/lib/hooks/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/hooks/service.ts"],"names":[],"mappings":";;;;AAAA,+BAAyD;AAEzD,iDAAkH;AAQlH,SAAgB,UAAU,CACtB,aAAoD,EACpD,IAA6B;IAFjC,iBAsDC;IApDG,qBAAA,EAAA,SAA6B;IAEvB,IAAA,KAA8B,gBAAQ,CAAmB,qBAAQ,CAAC,EAAjE,UAAU,QAAA,EAAE,aAAa,QAAwC,CAAC;IAEzE,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,UAAU,GAAG,mBAAW,CAAC;;;;wBACV,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,MAAM,GAAG,mBAAW,CAAC;;;;;oBACvB,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,IAAI,GAAE,CAAC;IAEpB,OAAO;QACH,UAAU;QACV;YACI,MAAM,QAAA;YACN,UAAU,YAAA;YACV,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;AAtDD,gCAsDC"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/hooks/service.ts"],"names":[],"mappings":";;;;AAAA,+BAAkE;AAElE,iDAAkH;AAalH,SAAgB,UAAU,CACtB,aAAoD,EACpD,IAA6B;IAFjC,iBA8DC;IA5DG,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,IAAM,GAAG,GAAG,mBAAW,CAAC,UAAC,QAA8B;QACnD,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;YAChC,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;SAChG;aAAM;YACH,aAAa,CAAC,oBAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;SACpC;QACD,uDAAuD;IAC3D,CAAC,EAAE,IAAI,CAAC,CAAC;IAET,IAAM,OAAO,GAAG,eAAO,CACnB,cAAM,OAAA,CAAC;QACH,MAAM,QAAA;QACN,WAAW,aAAA;QACX,eAAe,iBAAA;QACf,GAAG,KAAA;KACN,CAAC,EALI,CAKJ,EACF,CAAC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,CAAC,CAC9C,CAAC;IAEF,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AACjC,CAAC;AA9DD,gCA8DC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "aidbox-react",
-    "version": "1.3.5",
+    "version": "1.5.0",
     "scripts": {
         "build": "tsc",
         "coverage": "jest --config=./jest.config.json --coverage --coverageReporters=text-lcov | coveralls",

package/src/hooks/service.ts

@@ -1,10 +1,15 @@
-import { useEffect, useState, useCallback } from 'react';
+import { useEffect, useState, useCallback, useMemo } from 'react';
 
 import { loading, notAsked, RemoteData, RemoteDataResult, success, failure, isSuccess } from '../libs/remoteData';
 
 export interface ServiceManager<S, F> {
-    reload: () => Promise<RemoteDataResult<S, F>>;
-    softReload: () => Promise<RemoteDataResult<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;
 }
 
@@ -13,17 +18,19 @@ export function useService<S = any, F = any>(
     deps: ReadonlyArray<any> = []
 ): [RemoteData<S, F>, ServiceManager<S, F>] {
     const [remoteData, setRemoteData] = useState<RemoteData<S, F>>(notAsked);
+    const [reloadsCount, setReloadsCount] = useState(0);
+    const reload = useCallback(() => setReloadsCount((x) => x + 1), []);
 
     const load = useCallback(async () => {
         try {
             return await asyncFunction();
-        } catch (err) {
+        } catch (err: any) {
             return failure(err.response ? err.response.data : err.message);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, deps);
 
-    const softReload = useCallback(async () => {
+    const softReloadAsync = useCallback(async () => {
         const response = await load();
         setRemoteData(response);
 
@@ -31,7 +38,7 @@ export function useService<S = any, F = any>(
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [...deps, load]);
 
-    const reload = useCallback(async () => {
+    const reloadAsync = useCallback(async () => {
         setRemoteData(loading);
         const response = await load();
         setRemoteData(response);
@@ -46,20 +53,26 @@ export function useService<S = any, F = any>(
             setRemoteData(await load());
         })();
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [...deps, load]);
+    }, [...deps, reloadsCount, load]);
+
+    const set = useCallback((dataOrFn: S | ((data: S) => S)) => {
+        if (typeof dataOrFn === 'function') {
+            setRemoteData((rd) => (isSuccess(rd) ? success((dataOrFn as (data: S) => S)(rd.data)) : rd));
+        } else {
+            setRemoteData(success(dataOrFn));
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, deps);
 
-    return [
-        remoteData,
-        {
+    const manager = useMemo(
+        () => ({
             reload,
-            softReload,
-            set: (dataOrFn: S | ((data: S) => S)) => {
-                if (typeof dataOrFn === 'function') {
-                    setRemoteData((rd) => (isSuccess(rd) ? success((dataOrFn as (data: S) => S)(rd.data)) : rd));
-                } else {
-                    setRemoteData(success(dataOrFn));
-                }
-            },
-        },
-    ];
+            reloadAsync,
+            softReloadAsync,
+            set,
+        }),
+        [reload, reloadAsync, softReloadAsync, set]
+    );
+
+    return [remoteData, manager];
 }