Refactored AbortController;

DigitalBrainJS · Dec 6, 2020 · 6255fb1 · 6255fb1
1 parent 5d4aafe
commit 6255fb1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 737 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@
 /node_modules/
 /trash/
 /.idea/
+/test/tests/decorators.js
+/test/tests/decorators.legacy.js
diff --git a/lib/abort-controller.js b/lib/abort-controller.js
@@ -7,14 +7,27 @@ const _aborted = Symbol('aborted');
 const _events = Symbol('events');
 const _abort = Symbol('abort');
 
+const nativeAbortController= (()=>{
+    try {
+        if (typeof AbortController === 'function') {
+            const controller = new AbortController();
+            if (controller.toString() === '[object AbortController]' &&
+                controller.constructor.toString().indexOf('[native code]') !== -1) {
+                return AbortController;
+            }
+        }
+    } catch (e) {
+    }
+})()
+
 /**
  * AbortSignalPolyfill class
  * @alias CPromise.AbortSignalPolyfill
  */
 
-class AbortSignalEx {
+class AbortSignal {
     /**
-     * Constructs a new AbortSignalPolyfill instance
+     * Constructs a new AbortSignal instance
      */
 
     constructor() {
@@ -121,7 +134,7 @@ class AbortSignalEx {
  * AbortController class
  */
 
-class AbortControllerEx {
+class AbortController {
     /**
      * Constructs new AbortController instance
      */
@@ -131,11 +144,11 @@ class AbortControllerEx {
 
     /**
      * returns the signal of the controller
-     * @returns {AbortSignalEx}
+     * @returns {AbortSignal}
      */
 
     get signal() {
-        return this[_signal] || (this[_signal] = new AbortSignalEx());
+        return this[_signal] || (this[_signal] = new AbortSignal());
     }
 
     set signal(v) {
@@ -173,20 +186,9 @@ const isAbortController = (thing) => {
 };
 
 module.exports = {
-    AbortController: (()=>{
-        try {
-            if (typeof AbortController === 'function') {
-                const controller = new AbortController();
-                if (controller.toString() === '[object AbortController]' &&
-                    controller.constructor.toString().indexOf('[native code]') !== -1) {
-                    return AbortController;
-                }
-            }
-        } catch (e) {
-        }
-    })() || AbortControllerEx,
-    AbortControllerEx,
-    AbortSignalEx,
+    AbortController:  nativeAbortController || AbortController,
+    AbortControllerEx: AbortController,
+    AbortSignalEx: AbortSignal,
     isAbortSignal,
     isAbortController
 };