@nxtedition/lib 19.0.10 → 19.0.11

package/app.js

@@ -13,7 +13,7 @@ import { makeCouch } from './couch.js'
 import { makeTemplateCompiler } from './util/template/index.js'
 import { makeDeepstream } from './deepstream.js'
 import v8 from 'v8'
-import rxjs from 'rxjs'
+import * as rxjs from 'rxjs'
 import rx from 'rxjs/operators'
 import { performance } from 'perf_hooks'
 import hashString from './hash.js'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.0.10",
+  "version": "19.0.11",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -116,7 +116,8 @@
     "pinst": "^3.0.0",
     "prettier": "^3.2.5",
     "rxjs": "^7.5.6",
-    "send": "^0.18.0"
+    "send": "^0.18.0",
+    "tap": "^18.7.1"
   },
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.6.0",

package/platform.js

@@ -1,36 +1,38 @@
 export const SIGNALS =
-  {
-    linux: {
-      129: 'SIGHUP', //  1
-      130: 'SIGINT', //  2
-      131: 'SIGQUIT', //  3
-      132: 'SIGILL', //  4
-      133: 'SIGTRAP', //  5
-      134: 'SIGABRT', //  6
-      135: 'SIGBUS', //  7
-      136: 'SIGFPE', //  8
-      137: 'SIGKILL', //  9
-      138: 'SIGUSR1', // 10
-      139: 'SIGSEGV', // 11
-      140: 'SIGUSR2', // 12
-      141: 'SIGPIPE', // 13
-      142: 'SIGALRM', // 14
-      143: 'SIGTERM', // 15
-      144: 'SIGSTKFLT', // 16
-      145: 'SIGCHLD', // 17
-      146: 'SIGCONT', // 18
-      147: 'SIGSTOP', // 19
-      148: 'SIGTSTP', // 20
-      149: 'SIGTTIN', // 21
-      150: 'SIGTTOU', // 22
-      151: 'SIGURG', // 23
-      152: 'SIGXCPU', // 24
-      153: 'SIGXFSZ', // 25
-      154: 'SIGVTALRM', // 26
-      155: 'SIGPROF', // 27
-      156: 'SIGWINCH', // 28
-      157: 'SIGIO', // 29
-      158: 'SIGPWR', // 30
-      159: 'SIGSYS', // 31
-    },
-  }[process.platform] ?? {}
+  typeof process === 'object'
+    ? {
+        linux: {
+          129: 'SIGHUP', //  1
+          130: 'SIGINT', //  2
+          131: 'SIGQUIT', //  3
+          132: 'SIGILL', //  4
+          133: 'SIGTRAP', //  5
+          134: 'SIGABRT', //  6
+          135: 'SIGBUS', //  7
+          136: 'SIGFPE', //  8
+          137: 'SIGKILL', //  9
+          138: 'SIGUSR1', // 10
+          139: 'SIGSEGV', // 11
+          140: 'SIGUSR2', // 12
+          141: 'SIGPIPE', // 13
+          142: 'SIGALRM', // 14
+          143: 'SIGTERM', // 15
+          144: 'SIGSTKFLT', // 16
+          145: 'SIGCHLD', // 17
+          146: 'SIGCONT', // 18
+          147: 'SIGSTOP', // 19
+          148: 'SIGTSTP', // 20
+          149: 'SIGTTIN', // 21
+          150: 'SIGTTOU', // 22
+          151: 'SIGURG', // 23
+          152: 'SIGXCPU', // 24
+          153: 'SIGXFSZ', // 25
+          154: 'SIGVTALRM', // 26
+          155: 'SIGPROF', // 27
+          156: 'SIGWINCH', // 28
+          157: 'SIGIO', // 29
+          158: 'SIGPWR', // 30
+          159: 'SIGSYS', // 31
+        },
+      }[process.platform] ?? {}
+    : {}

package/rxjs/auditMap.js

@@ -1,7 +1,7 @@
-import rxjs from 'rxjs'
+import { Observable, from } from 'rxjs'
 
 function auditMapImpl(project) {
-  return new rxjs.Observable((o) => {
+  return new Observable((o) => {
     let pendingValue = null
     let hasPendingValue = false
     let isComplete = false
@@ -33,7 +33,7 @@ function auditMapImpl(project) {
     function _tryNext(value) {
       try {
         const result = project(value)
-        const observable = typeof result.then === 'function' ? rxjs.from(result) : result
+        const observable = typeof result.then === 'function' ? from(result) : result
         innerSubscription = observable.subscribe({
           next: _innerNext,
           error: _error,
@@ -78,7 +78,7 @@ function auditMapImpl(project) {
   })
 }
 
-rxjs.Observable.prototype.auditMap = auditMapImpl
+Observable.prototype.auditMap = auditMapImpl
 
 export default function auditMap(project) {
   return (o) => auditMapImpl.call(o, project)

package/rxjs/combineMap.js

@@ -1,10 +1,10 @@
-import rxjs from 'rxjs'
+import { Observable, from, throwError } from 'rxjs'
 
 const EMPTY = Object.freeze([])
 
 function combineMapImpl(project, equals = (a, b) => a === b) {
   const self = this
-  return new rxjs.Observable((o) => {
+  return new Observable((o) => {
     let curr = EMPTY
     let scheduled = false
     let disposed = false
@@ -75,9 +75,9 @@ function combineMapImpl(project, equals = (a, b) => a === b) {
           } else {
             let observable
             try {
-              observable = rxjs.from(project(keys[n]))
+              observable = from(project(keys[n]))
             } catch (err) {
-              observable = rxjs.throwError(() => err)
+              observable = throwError(() => err)
             }
 
             const entry = {
@@ -146,7 +146,7 @@ function combineMapImpl(project, equals = (a, b) => a === b) {
   })
 }
 
-rxjs.Observable.prototype.combineMap = combineMapImpl
+Observable.prototype.combineMap = combineMapImpl
 
 export default function combineMap(project, equals) {
   return (o) => combineMapImpl.call(o, project, equals)

package/rxjs/firstValueFrom.js

@@ -1,4 +1,4 @@
-import rx from 'rxjs/operators'
+import { first, timeout as rxTimeout } from 'rxjs'
 import withAbortSignal from './withAbortSignal.js'
 
 export default function firstValueFrom(x$, config) {
@@ -11,8 +11,8 @@ export default function firstValueFrom(x$, config) {
   }
 
   if (timeout) {
-    x$ = x$.pipe(rx.timeout(timeout))
+    x$ = x$.pipe(rxTimeout(timeout))
   }
 
-  return x$.pipe(rx.first(hasConfig ? config.defaultValue : undefined)).toPromise()
+  return x$.pipe(first(hasConfig ? config.defaultValue : undefined)).toPromise()
 }

package/rxjs/lastValueFrom.js

@@ -1,5 +1,4 @@
-import rxjs from 'rxjs'
-import rx from 'rxjs/operators'
+import { EMPTY, fromEvent, takeUntil, throwIfEmpty, last } from 'rxjs'
 import { AbortError } from '../errors'
 
 export default function lastValueFrom(x$, config) {
@@ -7,9 +6,9 @@ export default function lastValueFrom(x$, config) {
   const signal = hasConfig ? config.signal : undefined
 
   if (signal) {
-    x$ = signal.aborted ? rxjs.EMPTY : x$.pipe(rx.takeUntil(rxjs.fromEvent(signal, 'abort')))
-    x$ = x$.pipe(rx.throwIfEmpty(() => new AbortError()))
+    x$ = signal.aborted ? EMPTY : x$.pipe(takeUntil(fromEvent(signal, 'abort')))
+    x$ = x$.pipe(throwIfEmpty(() => new AbortError()))
   }
 
-  return x$.pipe(rx.last(hasConfig ? config.defaultValue : undefined)).toPromise()
+  return x$.pipe(last(hasConfig ? config.defaultValue : undefined)).toPromise()
 }

package/rxjs/withAbortSignal.js

@@ -1,8 +1,8 @@
-import rxjs from 'rxjs'
+import { Observable } from 'rxjs'
 import { AbortError } from '../errors.js'
 
 function withAbortSignalImpl(signal) {
-  return new rxjs.Observable((o) => {
+  return new Observable((o) => {
     o.add(this.subscribe(o))
 
     if (!signal) {
@@ -24,7 +24,7 @@ function withAbortSignalImpl(signal) {
   })
 }
 
-rxjs.Observable.prototype.withAbortSignal = withAbortSignalImpl
+Observable.prototype.withAbortSignal = withAbortSignalImpl
 
 export default function withAbortSignal(signal) {
   return (o) => withAbortSignalImpl.call(o, signal)

package/util/template/index.js

@@ -1,5 +1,4 @@
-import rx from 'rxjs/operators'
-import rxjs from 'rxjs'
+import * as rxjs from 'rxjs'
 import fp from 'lodash/fp.js'
 import getNxtpressionsCompiler from './nextpressions.js'
 import getJavascriptCompiler from './javascript.js'
@@ -102,7 +101,7 @@ export function makeTemplateCompiler({ ds, proxify }) {
           }
 
           return rxjs.combineLatest(values).pipe(
-            rx.map((values) => {
+            rxjs.map((values) => {
               const ret = [...arr]
               for (let n = 0; n < values.length; n++) {
                 ret[indices[n]] = values[n]
@@ -139,7 +138,7 @@ export function makeTemplateCompiler({ ds, proxify }) {
           }
 
           return rxjs.combineLatest(values).pipe(
-            rx.map((values) => {
+            rxjs.map((values) => {
               const ret = { ...obj }
               for (let n = 0; n < values.length; n++) {
                 ret[indices[n]] = values[n]
@@ -174,7 +173,9 @@ export function makeTemplateCompiler({ ds, proxify }) {
             compileStringTemplate(post)?.(str, args$) ?? rxjs.of(post),
           ])
           .pipe(
-            rx.map(([pre, body, post]) => (pre || post ? `${pre}${stringify(body)}${post}` : body)),
+            rxjs.map(([pre, body, post]) =>
+              pre || post ? `${pre}${stringify(body)}${post}` : body,
+            ),
           )
     } else if (type === 'nxt') {
       const expr = compilers.nxt(body)
@@ -185,7 +186,9 @@ export function makeTemplateCompiler({ ds, proxify }) {
 
       return (str, args$) =>
         expr(args$).pipe(
-          rx.switchMap((body) => onResolveTemplate(`${pre}${stringify(body, true)}${post}`, args$)),
+          rxjs.switchMap((body) =>
+            onResolveTemplate(`${pre}${stringify(body, true)}${post}`, args$),
+          ),
         )
     } else {
       throw new Error('unknown expression type: ' + type)

package/util/template/javascript.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert'
 import { makeWeakCache } from '../../weakCache.js'
-import rxjs from 'rxjs'
+import * as rxjs from 'rxjs'
 import vm from 'node:vm'
 import objectHash from 'object-hash'
 import * as datefns from 'date-fns'

package/util/template/nextpressions.js

@@ -1,6 +1,5 @@
 import moment from 'moment-timezone'
-import rx from 'rxjs/operators'
-import Observable from 'rxjs'
+import * as rxjs from 'rxjs'
 import JSON5 from 'json5'
 import fp from 'lodash/fp.js'
 import NestedError from 'nested-error-stacks'
@@ -189,7 +188,7 @@ export default function ({ ds } = {}) {
 
         function observe(id, options) {
           if (id == null) {
-            return Observable.of(path ? undefined : {})
+            return rxjs.of(path ? undefined : {})
           }
 
           const name = (id || '') + (postfix || '')
@@ -211,8 +210,8 @@ export default function ({ ds } = {}) {
           if (Array.isArray(value)) {
             value = value.filter((x) => x && fp.isString(x))
             return value.length
-              ? Observable.combineLatest(value.map((id) => observe(id, options)))
-              : Observable.of([])
+              ? rxjs.combineLatest(value.map((id) => observe(id, options)))
+              : rxjs.of([])
           }
 
           return null
@@ -262,14 +261,14 @@ export default function ({ ds } = {}) {
           return (value) =>
             value
               ? ds.record.observe2(`${value}:asset.rawTypes?`).pipe(
-                  rx.map(({ state, data }) => ({
+                  rxjs.map(({ state, data }) => ({
                     state,
                     data: fp.includes(type, data.value),
                   })),
-                  rx.filter(({ state, data }) => data || state >= ds.record.PROVIDER),
-                  rx.pluck('data'),
-                  rx.distinctUntilChanged(),
-                  rx.map((isType) => (isType ? value : _return ? RETURN : null)),
+                  rxjs.filter(({ state, data }) => data || state >= ds.record.PROVIDER),
+                  rxjs.pluck('data'),
+                  rxjs.distinctUntilChanged(),
+                  rxjs.map((isType) => (isType ? value : _return ? RETURN : null)),
                 )
               : null
         },
@@ -490,9 +489,9 @@ export default function ({ ds } = {}) {
           return null
         }
 
-        return Observable.timer(dueTime, period).pipe(
-          rx.map(() => moment()),
-          rx.startWith(null),
+        return rxjs.timer(dueTime, period).pipe(
+          rxjs.map(() => moment()),
+          rxjs.startWith(null),
         )
       },
     }),
@@ -537,12 +536,12 @@ export default function ({ ds } = {}) {
 
   const getValue = (value, [path, ...rest]) => {
     if (!path || !value || typeof value !== 'object') {
-      return Observable.isObservable(value) ? value : Observable.of(value)
+      return rxjs.isObservable(value) ? value : rxjs.of(value)
     } else {
-      return Observable.isObservable(value)
+      return rxjs.isObservable(value)
         ? value.pipe(
-            rx.switchMap((value) => getValue(value[path], rest)),
-            rx.distinctUntilChanged(),
+            rxjs.switchMap((value) => getValue(value[path], rest)),
+            rxjs.distinctUntilChanged(),
           )
         : getValue(value[path], rest)
     }
@@ -550,27 +549,27 @@ export default function ({ ds } = {}) {
 
   const reduceValue = (value, index, filters, options) => {
     if (value === RETURN) {
-      return Observable.of(null)
+      return rxjs.of(null)
     }
 
     while (index < filters.length) {
       value = filters[index++](value, options)
 
       if (value === RETURN) {
-        return Observable.of(null)
+        return rxjs.of(null)
       }
 
-      if (Observable.isObservable(value)) {
+      if (rxjs.isObservable(value)) {
         return value.pipe(
-          rx.switchMap((value) => reduceValue(value, index, filters, options)),
-          rx.distinctUntilChanged(),
+          rxjs.switchMap((value) => reduceValue(value, index, filters, options)),
+          rxjs.distinctUntilChanged(),
           // TODO (fix): better error handling...
-          rx.catchError(() => Observable.of(null)),
+          rxjs.catchError(() => rxjs.of(null)),
         )
       }
     }
 
-    return Observable.of(value)
+    return rxjs.of(value)
   }
 
   return makeWeakCache((expression) => {
@@ -585,14 +584,14 @@ export default function ({ ds } = {}) {
 
       return (context, options) =>
         getValue(context, basePath).pipe(
-          rx.switchMap((value) => reduceValue(value, 0, filters, options)),
-          rx.distinctUntilChanged(),
-          rx.catchError((err) => {
+          rxjs.switchMap((value) => reduceValue(value, 0, filters, options)),
+          rxjs.distinctUntilChanged(),
+          rxjs.catchError((err) => {
             options?.logger?.error(
               { err, expression: { expression, context: JSON.stringify(context) } },
               'expression failed',
             )
-            return Observable.of(null)
+            return rxjs.of(null)
           }),
         )
     } catch (err) {