@nxtedition/lib 23.8.0 → 23.8.3

package/couch.js

@@ -102,7 +102,7 @@ export function makeCouch(opts) {
 
   /**
    * @param {Object} [options={}]
-   * @param {AbortSignal} [options.signal=null]
+   * @param {AbortSignal} [options.signal]
    * @param {boolean} [options.descending=false]
    * @param {boolean} [options.include_docs=false]
    * @param {number} [options.seq_interval=null]
@@ -115,7 +115,7 @@ export function makeCouch(opts) {
    * @param {import('pino').Logger} [options.logger=null]
    * @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 } = {}) {
+  async function* changes({ client = defaultClient, signal, logger, ...options } = {}) {
     const params = {}
 
     let body
@@ -583,7 +583,7 @@ export function makeCouch(opts) {
     pathname,
     params,
     body,
-    { client = defaultClient, signal = null, idempotent = true, headers = null } = {},
+    { client = defaultClient, signal, idempotent = true, headers = null } = {},
   ) {
     const req = {
       pathname,
@@ -629,7 +629,7 @@ export function makeCouch(opts) {
     pathname,
     params,
     body,
-    { client = getClient('_all_docs'), signal = null, idempotent = true, headers = null } = {},
+    { client = getClient('_all_docs'), signal, idempotent = true, headers = null } = {},
   ) {
     const req = {
       pathname,
@@ -654,7 +654,7 @@ export function makeCouch(opts) {
     pathname,
     params,
     body,
-    { client = defaultClient, signal = null, idempotent = true, headers = null } = {},
+    { client = defaultClient, signal, idempotent = true, headers = null } = {},
   ) {
     const req = {
       pathname,
@@ -678,7 +678,7 @@ export function makeCouch(opts) {
   async function info(
     params,
     body,
-    { client = defaultClient, signal = null, idempotent = true, headers = null } = {},
+    { client = defaultClient, signal, idempotent = true, headers = null } = {},
   ) {
     const req = {
       pathname: null,
@@ -699,7 +699,7 @@ export function makeCouch(opts) {
     return res.data
   }
 
-  async function up(params, body, { client = defaultClient, signal = null } = {}) {
+  async function up(params, body, { client = defaultClient, signal } = {}) {
     const res = await undiciRequest(new URL('/_up', dbOrigin), {
       signal,
       dispatcher: client,
@@ -707,7 +707,7 @@ export function makeCouch(opts) {
     return await res.body.json()
   }
 
-  async function upsert(pathname, diffFun, { client = defaultClient, signal = null } = {}) {
+  async function upsert(pathname, diffFun, { client = defaultClient, signal } = {}) {
     while (true) {
       let doc
       try {

package/http.js

@@ -745,12 +745,25 @@ export async function request(ctx, next) {
   }
 }
 
-export function createServer(options, ctx, middleware) {
-  middleware = [middleware].flat(16).filter(Boolean)
-  middleware = middleware.includes(requestMiddleware)
-    ? middleware
-    : [requestMiddleware, ...middleware]
-  middleware = compose(middleware)
+export function createServer(...args) {
+  let options
+  let ctx
+  let middleware
+
+  if (typeof args[0] === 'function') {
+    ;[ctx, middleware] = args
+  } else {
+    ;[options, ctx, middleware] = args
+  }
+
+  if (middleware) {
+    middleware = [middleware].flat(16).filter(Boolean)
+    middleware = middleware.includes(requestMiddleware)
+      ? middleware
+      : [requestMiddleware, ...middleware]
+    middleware = compose(middleware)
+    middleware = middleware.length === 0 ? null : middleware
+  }
 
   let factory
   if (typeof ctx === 'function') {
@@ -766,7 +779,7 @@ export function createServer(options, ctx, middleware) {
       if (opaque) {
         Object.assign(context, opaque)
       }
-      return middleware(context)
+      return context
     }
   }
 
@@ -779,7 +792,7 @@ export function createServer(options, ctx, middleware) {
       requestTimeout: 0,
       ...options,
     },
-    (req, res) => middleware(factory(req, res)),
+    (req, res) => (middleware ? middleware(factory(req, res)) : factory(req, res)),
   )
 
   server.setTimeout(options.socketTimeout ?? options.timeout ?? 2 * 60e3)

package/package.json

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