extra-react-hooks 0.6.5 → 0.6.7

package/lib/use-callback-async.js

@@ -1,18 +1,24 @@
 import { useCallback } from 'react';
-import { go } from '@blackglory/prelude';
+import { go, pass } from '@blackglory/prelude';
 import { AbortController } from 'extra-abort';
 import { useMemoWithCleanup } from './use-memo-with-cleanup.js';
-const symbolAbort = Symbol();
+import { CustomError } from '@blackglory/errors';
+class InternalAbortError extends CustomError {
+}
 export function useCallbackAsync(callback, deps) {
-    const controller = useMemoWithCleanup(() => new AbortController(), controller => controller.abort(symbolAbort), deps);
+    const controller = useMemoWithCleanup(() => new AbortController(), controller => controller.abort(new InternalAbortError()), deps);
     return useCallback((...args) => {
         go(async () => {
             try {
                 await callback(...args, controller.signal);
             }
             catch (err) {
-                if (err !== symbolAbort)
+                if (err instanceof InternalAbortError) {
+                    pass();
+                }
+                else {
                     throw err;
+                }
             }
         });
     }, deps);

package/lib/use-callback-async.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-callback-async.js","sourceRoot":"","sources":["../src/use-callback-async.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAkB,MAAM,OAAO,CAAA;AACnD,OAAO,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAE/D,MAAM,WAAW,GAAG,MAAM,EAAE,CAAA;AAE5B,MAAM,UAAU,gBAAgB,CAC9B,QAA0E,EAC1E,IAAoB;IAEpB,MAAM,UAAU,GAAG,kBAAkB,CACnC,GAAG,EAAE,CAAC,IAAI,eAAe,EAAE,EAC3B,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,EAC3C,IAAI,CACL,CAAA;IAED,OAAO,WAAW,CAAC,CAAC,GAAG,IAAU,EAAE,EAAE;QACnC,EAAE,CAAC,KAAK,IAAI,EAAE;YACZ,IAAI;gBACF,MAAM,QAAQ,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;aAC3C;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,GAAG,KAAK,WAAW;oBAAE,MAAM,GAAG,CAAA;aACnC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,EAAE,IAAI,CAAC,CAAA;AACV,CAAC"}
+{"version":3,"file":"use-callback-async.js","sourceRoot":"","sources":["../src/use-callback-async.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAkB,MAAM,OAAO,CAAA;AACnD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAEhD,MAAM,kBAAmB,SAAQ,WAAW;CAAG;AAE/C,MAAM,UAAU,gBAAgB,CAC9B,QAA0E,EAC1E,IAAoB;IAEpB,MAAM,UAAU,GAAG,kBAAkB,CACnC,GAAG,EAAE,CAAC,IAAI,eAAe,EAAE,EAC3B,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,kBAAkB,EAAE,CAAC,EACxD,IAAI,CACL,CAAA;IAED,OAAO,WAAW,CAAC,CAAC,GAAG,IAAU,EAAE,EAAE;QACnC,EAAE,CAAC,KAAK,IAAI,EAAE;YACZ,IAAI;gBACF,MAAM,QAAQ,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;aAC3C;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,GAAG,YAAY,kBAAkB,EAAE;oBACrC,IAAI,EAAE,CAAA;iBACP;qBAAM;oBACL,MAAM,GAAG,CAAA;iBACV;aACF;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,EAAE,IAAI,CAAC,CAAA;AACV,CAAC"}

package/lib/use-effect-async.js

@@ -1,7 +1,9 @@
 import { useEffect } from 'react';
-import { go } from '@blackglory/prelude';
+import { go, pass } from '@blackglory/prelude';
 import { AbortController } from 'extra-abort';
-const abort = Symbol();
+import { CustomError } from '@blackglory/errors';
+class InternalAbortError extends CustomError {
+}
 export function useEffectAsync(effect, deps) {
     useEffect(() => {
         const controller = new AbortController();
@@ -10,11 +12,15 @@ export function useEffectAsync(effect, deps) {
                 await effect(controller.signal);
             }
             catch (err) {
-                if (err !== abort)
+                if (err instanceof InternalAbortError) {
+                    pass();
+                }
+                else {
                     throw err;
+                }
             }
         });
-        return () => controller.abort();
+        return () => controller.abort(new InternalAbortError());
     }, deps);
 }
 //# sourceMappingURL=use-effect-async.js.map

package/lib/use-effect-async.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-effect-async.js","sourceRoot":"","sources":["../src/use-effect-async.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAkB,MAAM,OAAO,CAAA;AACjD,OAAO,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE7C,MAAM,KAAK,GAAG,MAAM,EAAE,CAAA;AAEtB,MAAM,UAAU,cAAc,CAC5B,MAA8C,EAC9C,IAAqB;IAErB,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;QAExC,EAAE,CAAC,KAAK,IAAI,EAAE;YACZ,IAAI;gBACF,MAAM,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;aAChC;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,GAAG,KAAK,KAAK;oBAAE,MAAM,GAAG,CAAA;aAC7B;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;IACjC,CAAC,EAAE,IAAI,CAAC,CAAA;AACV,CAAC"}
+{"version":3,"file":"use-effect-async.js","sourceRoot":"","sources":["../src/use-effect-async.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAkB,MAAM,OAAO,CAAA;AACjD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAEhD,MAAM,kBAAmB,SAAQ,WAAW;CAAG;AAE/C,MAAM,UAAU,cAAc,CAC5B,MAA8C,EAC9C,IAAqB;IAErB,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;QAExC,EAAE,CAAC,KAAK,IAAI,EAAE;YACZ,IAAI;gBACF,MAAM,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;aAChC;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,GAAG,YAAY,kBAAkB,EAAE;oBACrC,IAAI,EAAE,CAAA;iBACP;qBAAM;oBACL,MAAM,GAAG,CAAA;iBACV;aACF;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,kBAAkB,EAAE,CAAC,CAAA;IACzD,CAAC,EAAE,IAAI,CAAC,CAAA;AACV,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extra-react-hooks",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "description": "",
   "keywords": [],
   "files": [
@@ -65,6 +65,7 @@
     "webpack": "^5.86.0"
   },
   "dependencies": {
+    "@blackglory/errors": "^3.0.3",
     "@blackglory/prelude": "^0.3.3",
     "extra-abort": "^0.3.7",
     "extra-fsm": "^0.2.1",

package/src/use-callback-async.ts

@@ -1,9 +1,10 @@
 import { useCallback, DependencyList } from 'react'
-import { go } from '@blackglory/prelude'
+import { go, pass } from '@blackglory/prelude'
 import { AbortController } from 'extra-abort'
 import { useMemoWithCleanup } from './use-memo-with-cleanup.js'
+import { CustomError } from '@blackglory/errors'
 
-const symbolAbort = Symbol()
+class InternalAbortError extends CustomError {}
 
 export function useCallbackAsync<Args extends unknown[]>(
   callback: (...args: [...args: Args, signal: AbortSignal]) => Promise<void>
@@ -11,7 +12,7 @@ export function useCallbackAsync<Args extends unknown[]>(
 ): (...args: Args) => void {
   const controller = useMemoWithCleanup(
     () => new AbortController()
-  , controller => controller.abort(symbolAbort)
+  , controller => controller.abort(new InternalAbortError())
   , deps
   )
 
@@ -20,7 +21,11 @@ export function useCallbackAsync<Args extends unknown[]>(
       try {
         await callback(...args, controller.signal)
       } catch (err) {
-        if (err !== symbolAbort) throw err
+        if (err instanceof InternalAbortError) {
+          pass()
+        } else {
+          throw err
+        }
       }
     })
   }, deps)

package/src/use-effect-async.ts

@@ -1,8 +1,9 @@
 import { useEffect, DependencyList } from 'react'
-import { go } from '@blackglory/prelude'
+import { go, pass } from '@blackglory/prelude'
 import { AbortController } from 'extra-abort'
+import { CustomError } from '@blackglory/errors'
 
-const abort = Symbol()
+class InternalAbortError extends CustomError {}
 
 export function useEffectAsync(
   effect: (signal: AbortSignal) => Promise<void>
@@ -15,10 +16,14 @@ export function useEffectAsync(
       try {
         await effect(controller.signal)
       } catch (err) {
-        if (err !== abort) throw err
+        if (err instanceof InternalAbortError) {
+          pass()
+        } else {
+          throw err
+        }
       }
     })
 
-    return () => controller.abort()
+    return () => controller.abort(new InternalAbortError())
   }, deps)
 }