@nxtedition/lib 15.0.57 → 15.1.0

package/merge-ranges.js

@@ -1,7 +1,7 @@
 const EMPTY_ARR = Object.freeze([])
 
 module.exports = function mergeRanges(ranges) {
-  if (!Array.isArray(ranges)) {
+  if (!Array.isArray(ranges) || ranges.length === 0) {
     return EMPTY_ARR
   }
 
@@ -10,17 +10,9 @@ module.exports = function mergeRanges(ranges) {
     return Array.isArray(range) && range.length === 2 && range[1] > range[0] ? ranges : EMPTY_ARR
   }
 
-  {
-    // Make sure ranges are valid and copied for mutation.
-    const tmp = []
-    for (let n = 0, len = ranges.length; n < len; n++) {
-      const range = ranges[n]
-      if (Array.isArray(range) && range.length === 2 && range[1] > range[0]) {
-        tmp.push([range[0], range[1]])
-      }
-    }
-    ranges = tmp
-  }
+  ranges = ranges.filter(
+    (range) => Array.isArray(range) && range.length === 2 && range[1] > range[0],
+  )
 
   if (ranges.length <= 1) {
     return ranges
@@ -33,13 +25,13 @@ module.exports = function mergeRanges(ranges) {
   // Add first range to stack
   stack.push(ranges[0])
 
-  for (let n = 1; n < ranges.length; ++n) {
+  for (let n = 1, len = ranges.length; n < len; ++n) {
     const range = ranges[n]
     const top = stack[stack.length - 1]
 
     if (top[1] < range[0]) {
       // No overlap, push range onto stack
-      stack.push(range)
+      stack.push([range[0], range[1]])
     } else if (top[1] < range[1]) {
       // Update previous range
       top[1] = range[1]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "15.0.57",
+  "version": "15.1.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [
@@ -72,6 +72,7 @@
     "/__tests__"
   ],
   "dependencies": {
+    "@nxtedition/nxt-undici": "^1.4.3",
     "date-fns": "^2.29.3",
     "fast-querystring": "^1.1.1",
     "hasha": "^5.2.2",
@@ -90,16 +91,16 @@
     "smpte-timecode": "^1.3.3",
     "split-string": "^6.0.0",
     "toobusy-js": "^0.5.1",
-    "undici": "^5.27.1",
+    "undici": "^5.27.2",
     "url-join": "^4.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.8.10",
-    "eslint": "^8.52.0",
+    "eslint": "^8.53.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-n": "^16.2.0",
+    "eslint-plugin-n": "^16.3.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
     "husky": "^8.0.3",
@@ -108,7 +109,7 @@
     "prettier": "^3.0.3",
     "rxjs": "^7.5.6",
     "send": "^0.18.0",
-    "tap": "^18.5.6"
+    "tap": "^18.5.7"
   },
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.6.0",

package/serializers.js

@@ -40,8 +40,16 @@ module.exports = {
       err = err.length === 1 ? err[0] : new AggregateError(err)
     }
 
+    if (err == null) {
+      return undefined
+    }
+
     const ret = serializers.err(err)
 
+    if (ret == null) {
+      return undefined
+    }
+
     if (ret.data !== null && typeof ret.data === 'object') {
       ret.data = JSON.stringify(ret.data)
     }

package/util/template/javascript.js

@@ -5,6 +5,7 @@ const vm = require('node:vm')
 const objectHash = require('object-hash')
 const datefns = require('date-fns')
 const JSON5 = require('json5')
+const { request } = require('@nxtedition/nxt-undici')
 const undici = require('undici')
 
 const kSuspend = Symbol('kSuspend')
@@ -26,6 +27,11 @@ class TimerEntry {
   }
 }
 
+const fetchClient = new undici.Agent({
+  connections: 128,
+  pipelining: 8,
+})
+
 class FetchEntry {
   constructor(key, refresh, { resource, options }) {
     this.key = key
@@ -38,26 +44,25 @@ class FetchEntry {
     this.status = null
     this.error = null
 
-    // TODO (fix): options.signal
-    // TODO (fix): cache...
-    // TODO (fix): expire...
-
-    undici
-      .fetch(resource, { ...options, signal: this.signal })
+    request(resource, {
+      ...options,
+      signal: this.signal,
+      dispatcher: fetchClient,
+    })
       .then(async (res) => {
-        if (this.refresh) {
+        try {
           // TODO (fix): max size...
-          this.body = Buffer.from(await res.arrayBuffer())
           this.status = res.status
           this.headers = res.headers
-          this.refresh()
+          this.body = await res.text()
+        } catch (err) {
+          this.error = err
         }
+        this.refresh()
       })
       .catch((err) => {
-        if (this.refresh) {
-          this.error = err
-          this.refresh()
-        }
+        this.error = err
+        this.refresh()
       })
   }
 
@@ -143,7 +148,7 @@ class PromiseEntry {
           this.error = err
           this.refresh()
         }
-      }
+      },
     )
   }
 
@@ -342,7 +347,7 @@ module.exports = ({ ds, proxify, compiler }) => {
           Object.assign(new Error('expression failed'), {
             cause: err,
             data: self._expression,
-          })
+          }),
         )
       } finally {
         compiler.current = previous
@@ -518,7 +523,7 @@ module.exports = ({ ds, proxify, compiler }) => {
       const data = this._getRecord(
         id + ':asset.rawTypes?',
         state ?? ds.record.PROVIDER,
-        suspend ?? true
+        suspend ?? true,
       )
       return data && Array.isArray(data.value) && data.value.includes(type) ? id : null
     }