@jcoreio/abortable 1.0.3 → 1.0.4

package/index.js

@@ -11,6 +11,12 @@ var newAbortError = exports.newAbortError = function newAbortError() {
 var noop = function noop() {};
 function abortable(promise, signal) {
   if (!signal) return promise;
+  if (signal.aborted) {
+    // prevent unhandled rejection
+    promise["catch"](function () {});
+    // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
+    return Promise.reject(signal.reason);
+  }
   return new Promise(function (resolve, reject) {
     var cleanup = function cleanup() {
       var callbacks = {
@@ -37,12 +43,7 @@ function abortable(promise, signal) {
     }, function (error) {
       return cleanup().reject(error);
     });
-    if (signal.aborted) {
-      // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
-      reject(signal.reason);
-    } else {
-      signal.addEventListener('abort', onAbort);
-    }
+    signal.addEventListener('abort', onAbort);
   });
 }
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["newAbortError","exports","DOMException","noop","abortable","promise","signal","Promise","resolve","reject","cleanup","callbacks","removeEventListener","onAbort","reason","then","value","error","aborted","addEventListener"],"sources":["src/index.ts"],"sourcesContent":[null],"mappings":";;;;;;;AAAO,IAAMA,aAAa,GAAAC,OAAA,CAAAD,aAAA,GAAG,SAAhBA,aAAaA,CAAA;EAAA,OACxB,IAAIE,YAAY,CAAC,4BAA4B,EAAE,YAAY,CAAC;AAAA;AAE9D,IAAMC,IAAI,GAAG,SAAPA,IAAIA,CAAA,EAAS,CAAC,CAAC;AAEd,SAASC,SAASA,CACvBC,OAAmB,EACnBC,MAA+B,EACnB;EACZ,IAAI,CAACA,MAAM,EAAE,OAAOD,OAAO;EAC3B,OAAO,IAAIE,OAAO,CAAI,UAACC,OAAO,EAAEC,MAAM,EAAK;IACzC,IAAMC,OAAO,GAAG,SAAVA,OAAOA,CAAA,EAAS;MACpB,IAAMC,SAAS,GAAG;QAAEH,OAAO,EAAPA,OAAO;QAAEC,MAAM,EAANA;MAAO,CAAC;MACrC;MACA;MACA;MACA;MACA;MACAD,OAAO,GAAGL,IAAI;MACdM,MAAM,GAAGN,IAAI;MACb;MACA;MACAG,MAAM,CAACM,mBAAmB,CAAC,OAAO,EAAEC,OAAO,CAAC;MAC5C,OAAOF,SAAS;IAClB,CAAC;IACD,IAAME,OAAO,GAAG,SAAVA,OAAOA,CAAA;MAAA,OAASH,OAAO,CAAC,CAAC,CAACD,MAAM,CAACH,MAAM,CAACQ,MAAM,CAAC;IAAA;IAErDT,OAAO,CAACU,IAAI,CACV,UAACC,KAAK;MAAA,OAAKN,OAAO,CAAC,CAAC,CAACF,OAAO,CAACQ,KAAK,CAAC;IAAA,GACnC,UAACC,KAAc;MAAA,OAAKP,OAAO,CAAC,CAAC,CAACD,MAAM,CAACQ,KAAK,CAAC;IAAA,CAC7C,CAAC;IACD,IAAIX,MAAM,CAACY,OAAO,EAAE;MAClB;MACAT,MAAM,CAACH,MAAM,CAACQ,MAAM,CAAC;IACvB,CAAC,MAAM;MACLR,MAAM,CAACa,gBAAgB,CAAC,OAAO,EAAEN,OAAO,CAAC;IAC3C;EACF,CAAC,CAAC;AACJ","ignoreList":[]}
+{"version":3,"file":"index.js","names":["newAbortError","exports","DOMException","noop","abortable","promise","signal","aborted","Promise","reject","reason","resolve","cleanup","callbacks","removeEventListener","onAbort","then","value","error","addEventListener"],"sources":["src/index.ts"],"sourcesContent":[null],"mappings":";;;;;;;AAAO,IAAMA,aAAa,GAAAC,OAAA,CAAAD,aAAA,GAAG,SAAhBA,aAAaA,CAAA;EAAA,OACxB,IAAIE,YAAY,CAAC,4BAA4B,EAAE,YAAY,CAAC;AAAA;AAE9D,IAAMC,IAAI,GAAG,SAAPA,IAAIA,CAAA,EAAS,CAAC,CAAC;AAEd,SAASC,SAASA,CACvBC,OAAmB,EACnBC,MAA+B,EACnB;EACZ,IAAI,CAACA,MAAM,EAAE,OAAOD,OAAO;EAC3B,IAAIC,MAAM,CAACC,OAAO,EAAE;IAClB;IACAF,OAAO,SAAM,CAAC,YAAM,CAAC,CAAC,CAAC;IACvB;IACA,OAAOG,OAAO,CAACC,MAAM,CAACH,MAAM,CAACI,MAAM,CAAC;EACtC;EACA,OAAO,IAAIF,OAAO,CAAI,UAACG,OAAO,EAAEF,MAAM,EAAK;IACzC,IAAMG,OAAO,GAAG,SAAVA,OAAOA,CAAA,EAAS;MACpB,IAAMC,SAAS,GAAG;QAAEF,OAAO,EAAPA,OAAO;QAAEF,MAAM,EAANA;MAAO,CAAC;MACrC;MACA;MACA;MACA;MACA;MACAE,OAAO,GAAGR,IAAI;MACdM,MAAM,GAAGN,IAAI;MACb;MACA;MACAG,MAAM,CAACQ,mBAAmB,CAAC,OAAO,EAAEC,OAAO,CAAC;MAC5C,OAAOF,SAAS;IAClB,CAAC;IACD,IAAME,OAAO,GAAG,SAAVA,OAAOA,CAAA;MAAA,OAASH,OAAO,CAAC,CAAC,CAACH,MAAM,CAACH,MAAM,CAACI,MAAM,CAAC;IAAA;IAErDL,OAAO,CAACW,IAAI,CACV,UAACC,KAAK;MAAA,OAAKL,OAAO,CAAC,CAAC,CAACD,OAAO,CAACM,KAAK,CAAC;IAAA,GACnC,UAACC,KAAc;MAAA,OAAKN,OAAO,CAAC,CAAC,CAACH,MAAM,CAACS,KAAK,CAAC;IAAA,CAC7C,CAAC;IACDZ,MAAM,CAACa,gBAAgB,CAAC,OAAO,EAAEJ,OAAO,CAAC;EAC3C,CAAC,CAAC;AACJ","ignoreList":[]}

package/index.mjs

@@ -2,6 +2,12 @@ export const newAbortError = () => new DOMException('This operation was aborted'
 const noop = () => {};
 export function abortable(promise, signal) {
   if (!signal) return promise;
+  if (signal.aborted) {
+    // prevent unhandled rejection
+    promise.catch(() => {});
+    // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
+    return Promise.reject(signal.reason);
+  }
   return new Promise((resolve, reject) => {
     const cleanup = () => {
       const callbacks = {
@@ -22,12 +28,7 @@ export function abortable(promise, signal) {
     };
     const onAbort = () => cleanup().reject(signal.reason);
     promise.then(value => cleanup().resolve(value), error => cleanup().reject(error));
-    if (signal.aborted) {
-      // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
-      reject(signal.reason);
-    } else {
-      signal.addEventListener('abort', onAbort);
-    }
+    signal.addEventListener('abort', onAbort);
   });
 }
 //# sourceMappingURL=index.mjs.map

package/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["newAbortError","DOMException","noop","abortable","promise","signal","Promise","resolve","reject","cleanup","callbacks","removeEventListener","onAbort","reason","then","value","error","aborted","addEventListener"],"sources":["src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,MAAMA,aAAa,GAAGA,CAAA,KAC3B,IAAIC,YAAY,CAAC,4BAA4B,EAAE,YAAY,CAAC;AAE9D,MAAMC,IAAI,GAAGA,CAAA,KAAM,CAAC,CAAC;AAErB,OAAO,SAASC,SAASA,CACvBC,OAAmB,EACnBC,MAA+B,EACnB;EACZ,IAAI,CAACA,MAAM,EAAE,OAAOD,OAAO;EAC3B,OAAO,IAAIE,OAAO,CAAI,CAACC,OAAO,EAAEC,MAAM,KAAK;IACzC,MAAMC,OAAO,GAAGA,CAAA,KAAM;MACpB,MAAMC,SAAS,GAAG;QAAEH,OAAO;QAAEC;MAAO,CAAC;MACrC;MACA;MACA;MACA;MACA;MACAD,OAAO,GAAGL,IAAI;MACdM,MAAM,GAAGN,IAAI;MACb;MACA;MACAG,MAAM,CAACM,mBAAmB,CAAC,OAAO,EAAEC,OAAO,CAAC;MAC5C,OAAOF,SAAS;IAClB,CAAC;IACD,MAAME,OAAO,GAAGA,CAAA,KAAMH,OAAO,CAAC,CAAC,CAACD,MAAM,CAACH,MAAM,CAACQ,MAAM,CAAC;IAErDT,OAAO,CAACU,IAAI,CACTC,KAAK,IAAKN,OAAO,CAAC,CAAC,CAACF,OAAO,CAACQ,KAAK,CAAC,EAClCC,KAAc,IAAKP,OAAO,CAAC,CAAC,CAACD,MAAM,CAACQ,KAAK,CAC5C,CAAC;IACD,IAAIX,MAAM,CAACY,OAAO,EAAE;MAClB;MACAT,MAAM,CAACH,MAAM,CAACQ,MAAM,CAAC;IACvB,CAAC,MAAM;MACLR,MAAM,CAACa,gBAAgB,CAAC,OAAO,EAAEN,OAAO,CAAC;IAC3C;EACF,CAAC,CAAC;AACJ","ignoreList":[]}
+{"version":3,"file":"index.mjs","names":["newAbortError","DOMException","noop","abortable","promise","signal","aborted","catch","Promise","reject","reason","resolve","cleanup","callbacks","removeEventListener","onAbort","then","value","error","addEventListener"],"sources":["src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,MAAMA,aAAa,GAAGA,CAAA,KAC3B,IAAIC,YAAY,CAAC,4BAA4B,EAAE,YAAY,CAAC;AAE9D,MAAMC,IAAI,GAAGA,CAAA,KAAM,CAAC,CAAC;AAErB,OAAO,SAASC,SAASA,CACvBC,OAAmB,EACnBC,MAA+B,EACnB;EACZ,IAAI,CAACA,MAAM,EAAE,OAAOD,OAAO;EAC3B,IAAIC,MAAM,CAACC,OAAO,EAAE;IAClB;IACAF,OAAO,CAACG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACvB;IACA,OAAOC,OAAO,CAACC,MAAM,CAACJ,MAAM,CAACK,MAAM,CAAC;EACtC;EACA,OAAO,IAAIF,OAAO,CAAI,CAACG,OAAO,EAAEF,MAAM,KAAK;IACzC,MAAMG,OAAO,GAAGA,CAAA,KAAM;MACpB,MAAMC,SAAS,GAAG;QAAEF,OAAO;QAAEF;MAAO,CAAC;MACrC;MACA;MACA;MACA;MACA;MACAE,OAAO,GAAGT,IAAI;MACdO,MAAM,GAAGP,IAAI;MACb;MACA;MACAG,MAAM,CAACS,mBAAmB,CAAC,OAAO,EAAEC,OAAO,CAAC;MAC5C,OAAOF,SAAS;IAClB,CAAC;IACD,MAAME,OAAO,GAAGA,CAAA,KAAMH,OAAO,CAAC,CAAC,CAACH,MAAM,CAACJ,MAAM,CAACK,MAAM,CAAC;IAErDN,OAAO,CAACY,IAAI,CACTC,KAAK,IAAKL,OAAO,CAAC,CAAC,CAACD,OAAO,CAACM,KAAK,CAAC,EAClCC,KAAc,IAAKN,OAAO,CAAC,CAAC,CAACH,MAAM,CAACS,KAAK,CAC5C,CAAC;IACDb,MAAM,CAACc,gBAAgB,CAAC,OAAO,EAAEJ,OAAO,CAAC;EAC3C,CAAC,CAAC;AACJ","ignoreList":[]}

package/package.json

@@ -17,7 +17,7 @@
     "abort",
     "promise"
   ],
-  "version": "1.0.3",
+  "version": "1.0.4",
   "sideEffects": false,
   "engines": {
     "node": ">=16"

package/src/index.ts

@@ -8,6 +8,12 @@ export function abortable<T>(
   signal: AbortSignal | undefined
 ): Promise<T> {
   if (!signal) return promise
+  if (signal.aborted) {
+    // prevent unhandled rejection
+    promise.catch(() => {})
+    // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
+    return Promise.reject(signal.reason)
+  }
   return new Promise<T>((resolve, reject) => {
     const cleanup = () => {
       const callbacks = { resolve, reject }
@@ -29,11 +35,6 @@ export function abortable<T>(
       (value) => cleanup().resolve(value),
       (error: unknown) => cleanup().reject(error)
     )
-    if (signal.aborted) {
-      // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
-      reject(signal.reason)
-    } else {
-      signal.addEventListener('abort', onAbort)
-    }
+    signal.addEventListener('abort', onAbort)
   })
 }