@nxtedition/lib 15.0.32 → 15.0.34

package/lib/undici/index.js

@@ -77,15 +77,21 @@ const dispatchers = {
   cache: require('./interceptor/cache.js'),
 }
 
-async function request(url, opts = {}) {
+async function request(url, opts) {
   if (typeof url === 'string') {
     url = new URL(url)
   } else if (url instanceof URL) {
     // Do nothing...
+  } else if (typeof url.origin === 'string' && typeof (url.path ?? url.pathname) === 'string') {
+    // Do nothing...
   } else {
     throw new Error('missing url')
   }
 
+  if (opts == null && typeof url === 'object' && url != null) {
+    opts = url
+  }
+
   const method = opts.method ?? (opts.body ? 'POST' : 'GET')
   const idempotent = opts.idempotent ?? (method === 'GET' || method === 'HEAD')
 
@@ -117,7 +123,7 @@ async function request(url, opts = {}) {
       ...headers,
     },
     origin: url.origin,
-    path: url.search ? `${url.pathname}${url.search ?? ''}` : url.pathname,
+    path: url.path ? url.path : url.search ? `${url.pathname}${url.search ?? ''}` : url.pathname,
     reset: opts.reset ?? false,
     headersTimeout: opts.headersTimeout,
     bodyTimeout: opts.bodyTimeout,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "15.0.32",
+  "version": "15.0.34",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [

package/util/template/index.js

@@ -84,7 +84,7 @@ module.exports = ({ ds, proxify }) => {
     let indices
 
     for (let i = 0; i < template.length; i++) {
-      const resolver = compileTemplate(template[i])
+      const resolver = _compileTemplate(template[i])
       if (resolver) {
         resolvers ??= []
         resolvers.push(resolver)
@@ -121,7 +121,7 @@ module.exports = ({ ds, proxify }) => {
     const keys = Object.keys(template)
 
     for (let i = 0; i < keys.length; i++) {
-      const resolver = compileTemplate(template[keys[i]])
+      const resolver = _compileTemplate(template[keys[i]])
       if (resolver) {
         resolvers ??= []
         resolvers.push(resolver)
@@ -207,7 +207,7 @@ module.exports = ({ ds, proxify }) => {
     return typeof val === 'string' && val.indexOf('{{') !== -1
   }
 
-  const compileTemplateCache = weakCache(
+  const _compileTemplateCache = weakCache(
     (template) => {
       if (fp.isPlainObject(template)) {
         return compileObjectTemplate(template)
@@ -222,9 +222,14 @@ module.exports = ({ ds, proxify }) => {
     (template, hash) => hash,
   )
 
-  function compileTemplate(template) {
+  function _compileTemplate(template) {
     const hash = hashTemplate(template)
-    const resolver = hash ? compileTemplateCache(template, hash) : null
+    const resolver = hash ? _compileTemplateCache(template, hash) : null
+    return resolver // ? (args$) => resolver(template, args$) : null
+  }
+
+  function compileTemplate(template) {
+    const resolver = _compileTemplate(template)
     return resolver ? (args$) => resolver(template, args$) : null
   }
 
@@ -234,7 +239,7 @@ module.exports = ({ ds, proxify }) => {
 
   function onResolveTemplate(template, args$) {
     try {
-      return compileTemplate(template)?.(args$) ?? rxjs.of(template)
+      return _compileTemplate(template)?.(template, args$) ?? rxjs.of(template)
     } catch (err) {
       return rxjs.throwError(() => err)
     }