aidbox-react 1.7.1 → 1.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "aidbox-react",
-    "version": "1.7.1",
+    "version": "1.10.0",
     "scripts": {
         "build": "tsc & rollup -c",
         "prebuild": "rimraf lib/* & rimraf dist/*",
@@ -10,7 +10,8 @@
         "prepare": "npm run build"
     },
     "dependencies": {
-        "axios": "^0.21.2",
+        "@beda.software/remote-data": "^1.1.3",
+        "axios": "^1.6.2",
         "moment": "^2.29.1"
     },
     "devDependencies": {
@@ -36,7 +37,7 @@
         "husky": "^4.2.0",
         "jest": "^24.9.0",
         "lint-staged": "^10.0.2",
-        "prettier": "^1.19.1",
+        "prettier": "^3.0.0",
         "react": "^16.12.0",
         "react-test-renderer": "^16.12.0",
         "rimraf": "^3.0.2",

package/src/hooks/service.ts

@@ -48,10 +48,19 @@ export function useService<S = any, F = any>(
     }, [...deps, load]);
 
     useEffect(() => {
+        let cancelled = false;
+
         (async () => {
             setRemoteData(loading);
-            setRemoteData(await load());
+            const response = await load();
+            if (!cancelled) {
+                setRemoteData(response);
+            }
         })();
+
+        return () => {
+            cancelled = true;
+        };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [...deps, reloadsCount, load]);
 

package/src/libs/remoteData.ts

@@ -1,81 +1,15 @@
-enum Status {
-    Success = 'Success',
-    Failure = 'Failure',
-    Loading = 'Loading',
-    NotAsked = 'NotAsked',
-}
-
-interface RemoteDataNotAsked {
-    status: Status.NotAsked;
-}
-
-export const notAsked: RemoteDataNotAsked = {
-    status: Status.NotAsked,
-};
-
-interface RemoteDataLoading {
-    status: Status.Loading;
-}
-
-export const loading: RemoteDataLoading = {
-    status: Status.Loading,
-};
-
-interface RemoteDataSuccess<s> {
-    status: Status.Success;
-    data: s;
-}
-
-export function success<S = any>(data: S): RemoteDataSuccess<S> {
-    return {
-        status: Status.Success,
-        data,
-    };
-}
-
-interface RemoteDataFailure<F> {
-    status: Status.Failure;
-    error: F;
-}
-
-export function failure<F = any>(error: F): RemoteDataFailure<F> {
-    return {
-        status: Status.Failure,
-        error,
-    };
-}
-
-export type RemoteDataResult<S = any, F = any> = RemoteDataSuccess<S> | RemoteDataFailure<F>;
-export type RemoteData<S = any, F = any> = RemoteDataNotAsked | RemoteDataLoading | RemoteDataResult<S, F>;
-
-export function isNotAsked(remoteData: RemoteData): remoteData is RemoteDataNotAsked {
-    return remoteData.status === Status.NotAsked;
-}
-
-export function isLoading(remoteData: RemoteData): remoteData is RemoteDataLoading {
-    return remoteData.status === Status.Loading;
-}
-
-export function isSuccess<S>(remoteData: RemoteData<S>): remoteData is RemoteDataSuccess<S> {
-    return remoteData.status === Status.Success;
-}
-
-export function isSuccessAll<S>(responses: Array<RemoteData<S>>): responses is Array<RemoteDataSuccess<S>> {
-    return responses.every(isSuccess);
-}
-
-export function isFailure<F>(remoteData: RemoteData<any, F>): remoteData is RemoteDataFailure<F> {
-    return remoteData.status === Status.Failure;
-}
-
-export function isFailureAny<F>(responses: Array<RemoteData<any, F>>): responses is Array<RemoteDataFailure<F>> {
-    return responses.some(isFailure);
-}
-
-export function isLoadingAny(responses: Array<RemoteData>): responses is Array<RemoteDataLoading> {
-    return responses.some(isLoading);
-}
-
-export function isNotAskedAny(responses: Array<RemoteData>): responses is Array<RemoteDataNotAsked> {
-    return responses.some(isNotAsked);
-}
+export type { RemoteDataResult, RemoteData } from '@beda.software/remote-data';
+export {
+    notAsked,
+    loading,
+    success,
+    failure,
+    isNotAsked,
+    isLoading,
+    isSuccess,
+    isSuccessAll,
+    isFailure,
+    isFailureAny,
+    isLoadingAny,
+    isNotAskedAny,
+} from '@beda.software/remote-data';