@jcoreio/abortable 1.0.1 → 1.0.2

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,oBACoC,CAAA;AAI9D,wBAAgB,SAAS,CAAC,CAAC,EACzB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,MAAM,EAAE,WAAW,GAAG,SAAS,GAC9B,OAAO,CAAC,CAAC,CAAC,CA4BZ"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,oBACoC,CAAA;AAI9D,wBAAgB,SAAS,CAAC,CAAC,EACzB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,MAAM,EAAE,WAAW,GAAG,SAAS,GAC9B,OAAO,CAAC,CAAC,CAAC,CA6BZ"}

package/index.js

@@ -32,7 +32,6 @@ function abortable(promise, signal) {
     var onAbort = function onAbort() {
       return cleanup().reject(newAbortError());
     };
-    signal.addEventListener('abort', onAbort);
     promise.then(function (value) {
       return cleanup().resolve(value);
     }, function (error) {
@@ -40,7 +39,8 @@ function abortable(promise, signal) {
     });
     if (signal.aborted) {
       reject(newAbortError());
-      return;
+    } else {
+      signal.addEventListener('abort', onAbort);
     }
   });
 }

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","addEventListener","then","value","error","aborted"],"sources":["src/index.ts"],"sourcesContent":["export const newAbortError = () =>\n  new DOMException('This operation was aborted', 'AbortError')\n\nconst noop = () => {}\n\nexport function abortable<T>(\n  promise: Promise<T>,\n  signal: AbortSignal | undefined\n): Promise<T> {\n  if (!signal) return promise\n  return new Promise<T>((resolve, reject) => {\n    const cleanup = () => {\n      const callbacks = { resolve, reject }\n      // Prevent memory leaks.  If the input promise never resolves, then the handlers\n      // below would retain this enclosing Promise's resolve and reject callbacks,\n      // which would retain the enclosing Promise and anything waiting on it.\n      // By replacing references to these callbacks, we enable the enclosing Promise to\n      // be garbage collected\n      resolve = noop\n      reject = noop\n      // Memory could also leak if the signal never aborts, unless we remove the abort\n      // handler\n      signal.removeEventListener('abort', onAbort)\n      return callbacks\n    }\n    const onAbort = () => cleanup().reject(newAbortError())\n    signal.addEventListener('abort', onAbort)\n    promise.then(\n      (value) => cleanup().resolve(value),\n      (error) => cleanup().reject(error)\n    )\n    if (signal.aborted) {\n      reject(newAbortError())\n      return\n    }\n  })\n}\n"],"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,CAACT,aAAa,CAAC,CAAC,CAAC;IAAA;IACvDM,MAAM,CAACQ,gBAAgB,CAAC,OAAO,EAAED,OAAO,CAAC;IACzCR,OAAO,CAACU,IAAI,CACV,UAACC,KAAK;MAAA,OAAKN,OAAO,CAAC,CAAC,CAACF,OAAO,CAACQ,KAAK,CAAC;IAAA,GACnC,UAACC,KAAK;MAAA,OAAKP,OAAO,CAAC,CAAC,CAACD,MAAM,CAACQ,KAAK,CAAC;IAAA,CACpC,CAAC;IACD,IAAIX,MAAM,CAACY,OAAO,EAAE;MAClBT,MAAM,CAACT,aAAa,CAAC,CAAC,CAAC;MACvB;IACF;EACF,CAAC,CAAC;AACJ","ignoreList":[]}
+{"version":3,"file":"index.js","names":["newAbortError","exports","DOMException","noop","abortable","promise","signal","Promise","resolve","reject","cleanup","callbacks","removeEventListener","onAbort","then","value","error","aborted","addEventListener"],"sources":["src/index.ts"],"sourcesContent":["export const newAbortError = () =>\n  new DOMException('This operation was aborted', 'AbortError')\n\nconst noop = () => {}\n\nexport function abortable<T>(\n  promise: Promise<T>,\n  signal: AbortSignal | undefined\n): Promise<T> {\n  if (!signal) return promise\n  return new Promise<T>((resolve, reject) => {\n    const cleanup = () => {\n      const callbacks = { resolve, reject }\n      // Prevent memory leaks.  If the input promise never resolves, then the handlers\n      // below would retain this enclosing Promise's resolve and reject callbacks,\n      // which would retain the enclosing Promise and anything waiting on it.\n      // By replacing references to these callbacks, we enable the enclosing Promise to\n      // be garbage collected\n      resolve = noop\n      reject = noop\n      // Memory could also leak if the signal never aborts, unless we remove the abort\n      // handler\n      signal.removeEventListener('abort', onAbort)\n      return callbacks\n    }\n    const onAbort = () => cleanup().reject(newAbortError())\n\n    promise.then(\n      (value) => cleanup().resolve(value),\n      (error) => cleanup().reject(error)\n    )\n    if (signal.aborted) {\n      reject(newAbortError())\n    } else {\n      signal.addEventListener('abort', onAbort)\n    }\n  })\n}\n"],"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,CAACT,aAAa,CAAC,CAAC,CAAC;IAAA;IAEvDK,OAAO,CAACS,IAAI,CACV,UAACC,KAAK;MAAA,OAAKL,OAAO,CAAC,CAAC,CAACF,OAAO,CAACO,KAAK,CAAC;IAAA,GACnC,UAACC,KAAK;MAAA,OAAKN,OAAO,CAAC,CAAC,CAACD,MAAM,CAACO,KAAK,CAAC;IAAA,CACpC,CAAC;IACD,IAAIV,MAAM,CAACW,OAAO,EAAE;MAClBR,MAAM,CAACT,aAAa,CAAC,CAAC,CAAC;IACzB,CAAC,MAAM;MACLM,MAAM,CAACY,gBAAgB,CAAC,OAAO,EAAEL,OAAO,CAAC;IAC3C;EACF,CAAC,CAAC;AACJ","ignoreList":[]}

package/index.mjs

@@ -21,11 +21,11 @@ export function abortable(promise, signal) {
       return callbacks;
     };
     const onAbort = () => cleanup().reject(newAbortError());
-    signal.addEventListener('abort', onAbort);
     promise.then(value => cleanup().resolve(value), error => cleanup().reject(error));
     if (signal.aborted) {
       reject(newAbortError());
-      return;
+    } else {
+      signal.addEventListener('abort', onAbort);
     }
   });
 }

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","addEventListener","then","value","error","aborted"],"sources":["src/index.ts"],"sourcesContent":["export const newAbortError = () =>\n  new DOMException('This operation was aborted', 'AbortError')\n\nconst noop = () => {}\n\nexport function abortable<T>(\n  promise: Promise<T>,\n  signal: AbortSignal | undefined\n): Promise<T> {\n  if (!signal) return promise\n  return new Promise<T>((resolve, reject) => {\n    const cleanup = () => {\n      const callbacks = { resolve, reject }\n      // Prevent memory leaks.  If the input promise never resolves, then the handlers\n      // below would retain this enclosing Promise's resolve and reject callbacks,\n      // which would retain the enclosing Promise and anything waiting on it.\n      // By replacing references to these callbacks, we enable the enclosing Promise to\n      // be garbage collected\n      resolve = noop\n      reject = noop\n      // Memory could also leak if the signal never aborts, unless we remove the abort\n      // handler\n      signal.removeEventListener('abort', onAbort)\n      return callbacks\n    }\n    const onAbort = () => cleanup().reject(newAbortError())\n    signal.addEventListener('abort', onAbort)\n    promise.then(\n      (value) => cleanup().resolve(value),\n      (error) => cleanup().reject(error)\n    )\n    if (signal.aborted) {\n      reject(newAbortError())\n      return\n    }\n  })\n}\n"],"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,CAACR,aAAa,CAAC,CAAC,CAAC;IACvDK,MAAM,CAACQ,gBAAgB,CAAC,OAAO,EAAED,OAAO,CAAC;IACzCR,OAAO,CAACU,IAAI,CACTC,KAAK,IAAKN,OAAO,CAAC,CAAC,CAACF,OAAO,CAACQ,KAAK,CAAC,EAClCC,KAAK,IAAKP,OAAO,CAAC,CAAC,CAACD,MAAM,CAACQ,KAAK,CACnC,CAAC;IACD,IAAIX,MAAM,CAACY,OAAO,EAAE;MAClBT,MAAM,CAACR,aAAa,CAAC,CAAC,CAAC;MACvB;IACF;EACF,CAAC,CAAC;AACJ","ignoreList":[]}
+{"version":3,"file":"index.mjs","names":["newAbortError","DOMException","noop","abortable","promise","signal","Promise","resolve","reject","cleanup","callbacks","removeEventListener","onAbort","then","value","error","aborted","addEventListener"],"sources":["src/index.ts"],"sourcesContent":["export const newAbortError = () =>\n  new DOMException('This operation was aborted', 'AbortError')\n\nconst noop = () => {}\n\nexport function abortable<T>(\n  promise: Promise<T>,\n  signal: AbortSignal | undefined\n): Promise<T> {\n  if (!signal) return promise\n  return new Promise<T>((resolve, reject) => {\n    const cleanup = () => {\n      const callbacks = { resolve, reject }\n      // Prevent memory leaks.  If the input promise never resolves, then the handlers\n      // below would retain this enclosing Promise's resolve and reject callbacks,\n      // which would retain the enclosing Promise and anything waiting on it.\n      // By replacing references to these callbacks, we enable the enclosing Promise to\n      // be garbage collected\n      resolve = noop\n      reject = noop\n      // Memory could also leak if the signal never aborts, unless we remove the abort\n      // handler\n      signal.removeEventListener('abort', onAbort)\n      return callbacks\n    }\n    const onAbort = () => cleanup().reject(newAbortError())\n\n    promise.then(\n      (value) => cleanup().resolve(value),\n      (error) => cleanup().reject(error)\n    )\n    if (signal.aborted) {\n      reject(newAbortError())\n    } else {\n      signal.addEventListener('abort', onAbort)\n    }\n  })\n}\n"],"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,CAACR,aAAa,CAAC,CAAC,CAAC;IAEvDI,OAAO,CAACS,IAAI,CACTC,KAAK,IAAKL,OAAO,CAAC,CAAC,CAACF,OAAO,CAACO,KAAK,CAAC,EAClCC,KAAK,IAAKN,OAAO,CAAC,CAAC,CAACD,MAAM,CAACO,KAAK,CACnC,CAAC;IACD,IAAIV,MAAM,CAACW,OAAO,EAAE;MAClBR,MAAM,CAACR,aAAa,CAAC,CAAC,CAAC;IACzB,CAAC,MAAM;MACLK,MAAM,CAACY,gBAAgB,CAAC,OAAO,EAAEL,OAAO,CAAC;IAC3C;EACF,CAAC,CAAC;AACJ","ignoreList":[]}

package/package.json

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

package/src/index.ts

@@ -24,14 +24,15 @@ export function abortable<T>(
       return callbacks
     }
     const onAbort = () => cleanup().reject(newAbortError())
-    signal.addEventListener('abort', onAbort)
+
     promise.then(
       (value) => cleanup().resolve(value),
       (error) => cleanup().reject(error)
     )
     if (signal.aborted) {
       reject(newAbortError())
-      return
+    } else {
+      signal.addEventListener('abort', onAbort)
     }
   })
 }