@nxtedition/lib 14.1.20 → 14.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "14.1.20",
+  "version": "14.2.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [

package/rxjs/firstValueFrom.js

@@ -1,6 +1,5 @@
-const rxjs = require('rxjs')
 const rx = require('rxjs/operators')
-const { AbortError } = require('../errors')
+const withAbortSignal = require('./withAbortSignal')
 
 module.exports = function firstValueFrom(x$, config) {
   const hasConfig = config && typeof config === 'object'
@@ -8,8 +7,7 @@ module.exports = function firstValueFrom(x$, config) {
   const timeout = hasConfig ? config.timeout : undefined
 
   if (signal) {
-    x$ = signal.aborted ? rxjs.EMPTY : x$.pipe(rx.takeUntil(rxjs.fromEvent(signal, 'abort')))
-    x$ = x$.pipe(rx.throwIfEmpty(() => new AbortError()))
+    x$ = x$.pipe(withAbortSignal(signal))
   }
 
   if (timeout) {

package/rxjs/withAbortSignal.js

@@ -0,0 +1,29 @@
+const rxjs = require('rxjs')
+const { AbortError } = require('../errors')
+
+function withAbortSignal(signal) {
+  return new rxjs.Observable((o) => {
+    o.add(this.subscribe(o))
+
+    if (!signal) {
+      return
+    }
+
+    const onAbort = () => {
+      o.error(signal.reason ?? new AbortError())
+    }
+
+    if (signal.aborted) {
+      onAbort()
+    } else {
+      signal.addEventListener('abort', onAbort)
+      o.add(() => {
+        signal.removeEventListener('abort', onAbort)
+      })
+    }
+  })
+}
+
+rxjs.Observable.prototype.withAbortSignal = withAbortSignal
+
+module.exports = (signal) => (o) => withAbortSignal.call(o, signal)