@nxtedition/lib 23.11.0 → 23.11.2

package/couch.d.ts

@@ -16,7 +16,7 @@ export interface CouchRequestOptions<Stream extends boolean = false> {
   body?: unknown
   headersTimeout?: number
   bodyTimeout?: number
-  dispatcher: undici.Dispatcher
+  dispatcher?: undici.Dispatcher
   query?: {
     startkey?: string
     endkey?: string

package/http.js

@@ -334,7 +334,9 @@ export async function requestMiddleware(ctx, next) {
   } finally {
     pendingSet.delete(ctx)
 
-    if (!res.writableEnded && !res.destroyed) {
+    if (res.writableEnded || res.destroyed || res.stream?.destroyed) {
+      // Do nothing..
+    } else {
       res.destroy()
       ctx.logger?.warn({ req }, 'request destroyed')
     }

package/package.json

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

package/util/template/index-common.js

@@ -7,7 +7,7 @@ import objectHash from 'object-hash'
 import { makeWeakCache } from '../../weakCache.js'
 import firstValueFrom from '../../rxjs/firstValueFrom.js'
 
-export function makeTemplateCompiler({ ds, proxify, logger, sha512, fetch }) {
+export function makeTemplateCompiler({ ds, proxify, logger, platform }) {
   const compiler = {
     current: null,
     resolveTemplate,
@@ -17,8 +17,8 @@ export function makeTemplateCompiler({ ds, proxify, logger, sha512, fetch }) {
   }
 
   const compilers = {
-    nxt: getNxtpressionsCompiler({ ds, logger, sha512 }),
-    js: getJavascriptCompiler({ ds, proxify, compiler, logger, fetch }),
+    nxt: getNxtpressionsCompiler({ ds, logger, platform }),
+    js: getJavascriptCompiler({ ds, proxify, compiler, logger, platform }),
   }
 
   function inner(str) {

package/util/template/index-web.js

@@ -8,21 +8,23 @@ export function makeTemplateCompiler({ ds, proxify, logger = console }) {
     ds,
     proxify,
     logger,
-    sha512: (data) => {
-      throw new Error('sha512 is not supported')
-    },
-    fetch: async (resource, options) => {
-      // eslint-disable-next-line no-undef
-      const res = await window.fetch(resource, options)
-      return {
-        statusCode: res.status,
-        headers: Object.fromEntries(res.headers.entries()),
-        body: {
-          text: async () => {
-            return await res.text()
+    platform: {
+      hasha: (data) => {
+        throw new Error('hasha is not supported')
+      },
+      fetch: async (resource, options) => {
+        // eslint-disable-next-line no-undef
+        const res = await window.fetch(resource, options)
+        return {
+          statusCode: res.status,
+          headers: Object.fromEntries(res.headers.entries()),
+          body: {
+            text: async () => {
+              return await res.text()
+            },
           },
-        },
-      }
+        }
+      },
     },
   })
 }

package/util/template/index.js

@@ -17,8 +17,10 @@ export function makeTemplateCompiler({ logger = globalThis.__nxt_lib_app?.logger
   return commonMakeTemplateCompiler({
     ...args,
     logger,
-    sha256: (data) => hashSync(data),
-    fetch,
+    platform: {
+      hasha: hashSync,
+      fetch,
+    },
   })
 }
 

package/util/template/index.test.js

@@ -0,0 +1,24 @@
+import { test } from 'node:test'
+import assert from 'node:assert'
+import { makeTemplateCompiler } from './index.js'
+
+test('javascript', async () => {
+  const compiler = makeTemplateCompiler({
+    ds: {},
+    logger: console,
+  })
+
+  assert.strictEqual(
+    await compiler.resolveTemplate('{{#js _($.foo, foo => foo.toUpperCase()) }}', { foo: 'bar' }),
+    'BAR',
+  )
+})
+
+test('nexpression', async () => {
+  const compiler = makeTemplateCompiler({
+    ds: {},
+    logger: console,
+  })
+
+  assert.strictEqual(await compiler.resolveTemplate('{{ foo }}', { foo: 'bar' }), 'bar')
+})

package/util/template/javascript.js

@@ -222,7 +222,7 @@ function makeWrapper(expression) {
   return (value, suspend = true) => proxify(value, expression, handler, suspend)
 }
 
-export default function ({ ds, proxify, compiler, logger, fetch: fetchFn }) {
+export default function ({ ds, proxify, compiler, logger, platform }) {
   class Expression {
     constructor(script, expression, args, observer) {
       this._expression = expression
@@ -468,7 +468,7 @@ export default function ({ ds, proxify, compiler, logger, fetch: fetchFn }) {
 
     _getFetch(resource, options, suspend) {
       const key = JSON.stringify({ resource, options })
-      const entry = this._getEntry(key, FetchEntry, { resource, options, fetch: fetchFn })
+      const entry = this._getEntry(key, FetchEntry, { resource, options, fetch: platform.fetch })
 
       if (entry.refresh === null) {
         return null

package/util/template/nextpressions.js

@@ -25,7 +25,7 @@ function asFilter(transform, predicate, obj) {
   )
 }
 
-export default function ({ ds, logger, sha512 } = {}) {
+export default function ({ ds, logger, platform: { hasha } } = {}) {
   const FILTERS = {
     // any
     ...asFilter(null, null, {
@@ -85,9 +85,9 @@ export default function ({ ds, logger, sha512 } = {}) {
       isString: () => (value) => fp.isString(value),
       ternary: (a, b) => (value) => (value ? a : b),
       cond: (a, b) => (value) => (value ? a : b),
-      hasha: (options) => (value) => sha512(JSON.stringify(value), options || {}),
+      hasha: (options) => (value) => hasha(JSON.stringify(value), options || {}),
       hashaint: (options) => (value) =>
-        parseInt(sha512(JSON.stringify(value), options || {}).slice(-13), 16),
+        parseInt(hasha(JSON.stringify(value), options || {}).slice(-13), 16),
       return: () => (value) => value || RETURN,
       add:
         (...args) =>