@nxtedition/lib 21.6.3 → 21.7.0

package/couch.js

@@ -119,7 +119,7 @@ export function makeCouch(opts) {
    * @param {string} [options.since=null] - The sequence number to start from.
    * @param {number} [options.highWaterMark=128 * 1024] - Buffering.
    * @param {object} [options.selector=null] - The selector to filter changes.
-   * @yields {Array<{ id: string, seq?: string, doc?: Object, deleted?: boolean, changes: Array<{ rev: string }> }>}
+   * @return {AsyncGenerator<Array<{ id: string, seq?: string, doc?: Object, deleted?: boolean, changes: Array<{ rev: string }>}> & { lastSeq: string | null | 0 }}
    */
   async function* changes({ client = defaultClient, signal = null, logger, ...options } = {}) {
     const params = {}

package/merge-ranges.js

@@ -29,7 +29,13 @@ export default function mergeRanges(ranges) {
     const range = ranges[n]
     const top = stack[stack.length - 1]
 
-    if (range.length !== 2 || !Number.isFinite(range[0]) || !Number.isFinite(range[1])) {
+    if (
+      !Array.isArray(range) ||
+      range.length !== 2 ||
+      !Number.isFinite(range[0]) ||
+      !Number.isFinite(range[1]) ||
+      range[0] > range[1]
+    ) {
       continue
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "21.6.3",
+  "version": "21.7.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/s3.js

@@ -10,13 +10,13 @@ const QUEUE = new PQueue({ concurrency: 8 })
 const MD5_HEX_EXPR = /^[A-F0-9]{32}$/i
 
 /**
- * @typedef {import('undici').Dispatcher} Dispatcher
- * @typedef {import('@aws-sdk/client-s3').S3ClientConfig & {dispatcher?: Dispatcher}} S3ClientConfig
+ * @import { Dispatcher } from 'undici'
+ * @import { S3ClientConfig, CreateMultipartUploadRequest } from '@aws-sdk/client-s3'
  */
 
 export class S3Client extends AWS.S3Client {
   /**
-   * @param {S3ClientConfig} config
+   * @param {S3ClientConfig & { dispatcher?: Dispatcher }} config
    */
   constructor(config) {
     const { dispatcher, ...options } = config
@@ -79,12 +79,11 @@ class UndiciRequestHandler extends NodeHttpHandler {
  * @param {Object} options.logger - The logger to use.
  * @param {number} [options.partSize=16e6] - The size of each part in the multipart upload.
  * @param {PQueue} [options.queue] - The queue to use for part uploads.
- * @param {Object} options.params - The parameters for the upload.
- * @param {Buffer|NodeJS.ReadStream} options.params.Body - The data to upload.
- * @param {string} options.params.Key - The key of the object.
- * @param {string} options.params.Bucket - The name of the bucket.
- * @param {string} [options.params.ContentMD5] - The MD5 hash of the object as base64 string.
- * @param {number} [options.params.ContentLength] - The length of the object.
+ * @param {CreateMultipartUploadRequest & {
+ *   Body: Buffer | NodeJS.ReadStream,
+ *   ContentMD5?: string,
+ *   ContentLength?: number,
+ * }} options.params - The parameters for the upload.
  * @returns {Promise<Object>} The result of the upload.
  */
 export async function upload({
@@ -107,7 +106,7 @@ export async function upload({
     throw new Error('Invalid params')
   }
 
-  const { Body, Key, Bucket, ContentMD5, ContentLength } = params
+  const { Body, Key, Bucket, ContentMD5, ContentLength, ...createMultipartParams } = params
 
   const size = ContentLength != null ? Number(ContentLength) : null
 
@@ -144,7 +143,7 @@ export async function upload({
     }
 
     const multipartUploadOutput = await s3.send(
-      new AWS.CreateMultipartUploadCommand({ Bucket, Key }),
+      new AWS.CreateMultipartUploadCommand({ ...createMultipartParams, Bucket, Key }),
       { abortSignal: uploader.signal },
     )
     uploader.signal.throwIfAborted()