fix(action): fixed action abort error type

andrewcourtice · Aug 11, 2021 · 176b41e · 176b41e
1 parent 34b32ad
commit 176b41e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/extensions/action/src/errors.ts b/extensions/action/src/errors.ts
@@ -0,0 +1,11 @@
+export class ActionAbortError extends Error {
+    public name: string;
+    public instanceId: symbol;
+
+    constructor(name: string, instanceId: symbol) {
+        super(`Action ${name} as been cancelled`);
+
+        this.name = name;
+        this.instanceId = instanceId;
+    }
+}
diff --git a/extensions/action/src/index.ts b/extensions/action/src/index.ts
@@ -14,6 +14,10 @@ import {
     Mutator,
 } from '@harlem/core';
 
+import {
+    ActionAbortError,
+} from './errors';
+
 import type {
     Action,
     ActionBody,
@@ -22,6 +26,10 @@ import type {
     ActionStoreState,
 } from './types';
 
+export {
+    ActionAbortError,
+} from './errors';
+
 export * from './types';
 
 export default function actionsExtension<TState extends BaseState>() {
@@ -84,8 +92,9 @@ export default function actionsExtension<TState extends BaseState>() {
                     const id = Symbol(name);
 
                     const complete = () => (tasks.delete(task), removeInstance(name, id));
+                    const fail = () => reject(new ActionAbortError(name, id));
 
-                    onAbort(() => (complete(), reject()));
+                    onAbort(() => (complete(), fail()));
                     addInstance(name, id, payload);
 
                     try {
@@ -95,9 +104,11 @@ export default function actionsExtension<TState extends BaseState>() {
                         resolve(result);
                         incrementRunCount(name);
                     } catch (error) {
-                        if (!(error instanceof DOMException)) {
-                            reject(error);
+                        if (error instanceof DOMException) {
+                            fail(); // Fetch has been cancelled
                         }
+
+                        reject(error);
                     } finally {
                         complete();
                     }

diff --git a/extensions/action/test/actions.test.ts b/extensions/action/test/actions.test.ts
@@ -5,7 +5,9 @@ import {
     bootstrap,
 } from '@harlem/testing';
 
-import actionsExtension from '../src';
+import actionsExtension, {
+    ActionAbortError,
+} from '../src';
 
 interface UserInfo {
     firstName: string;
@@ -114,8 +116,8 @@ describe('Actions Extension', () => {
 
         try {
             await task;
-        } catch {
-            // do nothing
+        } catch (error) {
+            expect(error).toBeInstanceOf(ActionAbortError);
         } finally {
             expect(state.details.firstName).toBe('');
             expect(state.details.lastName).toBe('');