@merkur/plugin-http-client 0.38.0 → 0.39.0

package/lib/index.cjs

@@ -5,44 +5,35 @@ var core = require('@merkur/core');
 function setDefaultConfig(widget, newDefaultConfig) {
   widget.$in.httpClient.defaultConfig = {
     ...widget.$in.httpClient.defaultConfig,
-    ...newDefaultConfig,
+    ...newDefaultConfig
   };
 }
-
 function getDefaultTransformers(widget) {
-  return [
-    transformBody(),
-    transformQuery(),
-    transformTimeout(),
-  ];
+  return [transformBody(), transformQuery(), transformTimeout()];
 }
 function httpClientPlugin() {
   return {
     async setup(widget) {
       core.assignMissingKeys(widget, httpClientAPI());
-
       widget.$in.httpClient = {
         defaultConfig: {
           method: 'GET',
           transformers: getDefaultTransformers(),
           headers: {},
           query: {},
-          timeout: 15000,
-        },
+          timeout: 15000
+        }
       };
-
       widget.$dependencies.fetch = getFetchAPI();
       widget.$dependencies.AbortController = AbortController;
-
       return widget;
     },
     async create(widget) {
       core.bindWidgetToFunctions(widget, widget.http);
       return widget;
-    },
+    }
   };
 }
-
 function httpClientAPI() {
   return {
     http: {
@@ -50,168 +41,129 @@ function httpClientAPI() {
         let response = null;
         let request = {
           ...widget.$in.httpClient.defaultConfig,
-          ...requestConfig,
+          ...requestConfig
         };
         const transformers = request.transformers;
-
-        [request, response] = await runTransformers(
-          widget,
-          transformers,
-          'transformRequest',
-          request,
-          response,
-        );
-
-        response = !response
-          ? await widget.$dependencies.fetch(request.url, request)
-          : response;
-
-        [request, response] = await runTransformers(
-          widget,
-          transformers,
-          'transformResponse',
-          request,
-          response,
-        );
-
+        [request, response] = await runTransformers(widget, transformers, 'transformRequest', request, response);
+        response = !response ? await widget.$dependencies.fetch(request.url, request) : response;
+        [request, response] = await runTransformers(widget, transformers, 'transformResponse', request, response);
         if (!response.ok) {
-          const error = new Error(
-            `Received ${response.status} status code when requesting ${request.url}`,
-            {
-              cause: { request, response },
-            },
-          );
+          const error = new Error(`Received ${response.status} status code when requesting ${request.url}`, {
+            cause: {
+              request,
+              response
+            }
+          });
           // keep compatablity
           error.request = request;
           error.response = response;
-
           return Promise.reject(error);
         }
-
-        return { request, response };
-      },
-    },
+        return {
+          request,
+          response
+        };
+      }
+    }
   };
 }
-
 async function runTransformers(widget, transformers, method, ...rest) {
   for (const transformer of transformers) {
     if (typeof transformer[method] === 'function') {
       rest = await transformer[method](widget, ...rest);
     }
   }
-
   return rest;
 }
-
 function getFetchAPI() {
   if (typeof window === 'undefined') {
     return global?.fetch;
   }
-
   return window?.fetch?.bind?.(window);
 }
-
 function transformQuery() {
   return {
     async transformRequest(widget, request, response) {
-      let newRequest = { ...request };
-      let { baseUrl = '', path = '/' } = request;
-
+      let newRequest = {
+        ...request
+      };
+      let {
+        baseUrl = '',
+        path = '/'
+      } = request;
       if (!request.url) {
-        newRequest.url = `${
-          baseUrl.endsWith('/')
-            ? baseUrl.substring(0, baseUrl.length - 1)
-            : baseUrl
-        }/${path.startsWith('/') ? path.substring(1) : path}`;
+        newRequest.url = `${baseUrl.endsWith('/') ? baseUrl.substring(0, baseUrl.length - 1) : baseUrl}/${path.startsWith('/') ? path.substring(1) : path}`;
       } else {
         newRequest.url = request.url;
       }
-
-      const queryString = Object.keys(request.query)
-        .map((key) =>
-          [key, request.query[key]].map(encodeURIComponent).join('='),
-        )
-        .join('&');
+      const queryString = Object.keys(request.query).map(key => [key, request.query[key]].map(encodeURIComponent).join('=')).join('&');
       const hasQuestionMark = newRequest.url.indexOf('?') !== -1;
-
       if (hasQuestionMark) {
         newRequest.url += queryString ? `&${queryString}` : '';
       } else {
         newRequest.url += queryString ? `?${queryString}` : '';
       }
-
       return [newRequest, response];
-    },
+    }
   };
 }
-
 function transformBody() {
   return {
     async transformResponse(widget, request, response) {
       if (response.status !== 204 && typeof response.json === 'function') {
         const contentType = response.headers.get('content-type');
         let body = null;
-
         if (contentType && contentType.includes('application/json')) {
           body = await response.json();
         } else {
           body = await response.text();
         }
-
         let newResponse = copyResponse(response);
         newResponse.body = body;
-
         return [request, newResponse];
       }
-
       return [request, response];
     },
     async transformRequest(widget, request, response) {
-      const { body, headers, method } = request;
-
-      if (
-        body &&
-        (headers['Content-Type'] || headers['content-type']) ===
-          'application/json' &&
-        !['GET', 'HEAD'].includes(method)
-      ) {
-        let newRequest = { ...request, body: JSON.stringify(body) };
-
+      const {
+        body,
+        headers,
+        method
+      } = request;
+      if (body && (headers['Content-Type'] || headers['content-type']) === 'application/json' && !['GET', 'HEAD'].includes(method)) {
+        let newRequest = {
+          ...request,
+          body: JSON.stringify(body)
+        };
         return [newRequest, response];
       }
-
       return [request, response];
-    },
+    }
   };
 }
-
 function transformTimeout() {
   return {
     async transformRequest(widget, request, response) {
-      let newRequest = { ...request };
-
+      let newRequest = {
+        ...request
+      };
       if ('timeout' in request) {
         const controller = new widget.$dependencies.AbortController();
         newRequest.signal = controller.signal;
-
         newRequest.timeoutTimer = setTimeout(() => {
           controller.abort();
         }, request.timeout);
       }
-
       return [newRequest, response];
     },
     async transformResponse(widget, request, response) {
       if ('timeoutTimer' in request) {
         clearTimeout(request.timeoutTimer);
       }
-
       return [request, response];
-    },
+    }
   };
 }
-
 function copyResponse(response) {
   const {
     body,
@@ -223,9 +175,8 @@ function copyResponse(response) {
     trailers,
     type,
     url,
-    useFinalURL,
+    useFinalURL
   } = response;
-
   return {
     body: assign({}, body),
     headers,
@@ -236,31 +187,23 @@ function copyResponse(response) {
     trailers,
     type,
     url,
-    useFinalURL,
+    useFinalURL
   };
 }
-
 const PROTECTED_FIELDS = ['__proto__', 'prototype', 'constructor'];
 function assign(target, source = {}, parentField = null) {
   for (const field of Object.keys(source)) {
     if (PROTECTED_FIELDS.includes(field)) {
       return;
     }
-
     const value = source[field];
     const fieldPath = parentField ? parentField + '.' + field : field;
-
     if (value instanceof Array) {
       target[field] = value.slice();
-    } else if (
-      value instanceof Object &&
-      !(value instanceof Function) &&
-      !(value instanceof RegExp)
-    ) {
+    } else if (value instanceof Object && !(value instanceof Function) && !(value instanceof RegExp)) {
       if (!(target[field] instanceof Object)) {
         target[field] = {};
       }
-
       assign(target[field], value, fieldPath);
     } else {
       target[field] = value;

package/lib/index.js

@@ -5,44 +5,35 @@ var core = require('@merkur/core');
 function setDefaultConfig(widget, newDefaultConfig) {
   widget.$in.httpClient.defaultConfig = {
     ...widget.$in.httpClient.defaultConfig,
-    ...newDefaultConfig,
+    ...newDefaultConfig
   };
 }
-
 function getDefaultTransformers(widget) {
-  return [
-    transformBody(),
-    transformQuery(),
-    transformTimeout(),
-  ];
+  return [transformBody(), transformQuery(), transformTimeout()];
 }
 function httpClientPlugin() {
   return {
     async setup(widget) {
       core.assignMissingKeys(widget, httpClientAPI());
-
       widget.$in.httpClient = {
         defaultConfig: {
           method: 'GET',
           transformers: getDefaultTransformers(),
           headers: {},
           query: {},
-          timeout: 15000,
-        },
+          timeout: 15000
+        }
       };
-
       widget.$dependencies.fetch = getFetchAPI();
       widget.$dependencies.AbortController = AbortController;
-
       return widget;
     },
     async create(widget) {
       core.bindWidgetToFunctions(widget, widget.http);
       return widget;
-    },
+    }
   };
 }
-
 function httpClientAPI() {
   return {
     http: {
@@ -50,168 +41,129 @@ function httpClientAPI() {
         let response = null;
         let request = {
           ...widget.$in.httpClient.defaultConfig,
-          ...requestConfig,
+          ...requestConfig
         };
         const transformers = request.transformers;
-
-        [request, response] = await runTransformers(
-          widget,
-          transformers,
-          'transformRequest',
-          request,
-          response,
-        );
-
-        response = !response
-          ? await widget.$dependencies.fetch(request.url, request)
-          : response;
-
-        [request, response] = await runTransformers(
-          widget,
-          transformers,
-          'transformResponse',
-          request,
-          response,
-        );
-
+        [request, response] = await runTransformers(widget, transformers, 'transformRequest', request, response);
+        response = !response ? await widget.$dependencies.fetch(request.url, request) : response;
+        [request, response] = await runTransformers(widget, transformers, 'transformResponse', request, response);
         if (!response.ok) {
-          const error = new Error(
-            `Received ${response.status} status code when requesting ${request.url}`,
-            {
-              cause: { request, response },
-            },
-          );
+          const error = new Error(`Received ${response.status} status code when requesting ${request.url}`, {
+            cause: {
+              request,
+              response
+            }
+          });
           // keep compatablity
           error.request = request;
           error.response = response;
-
           return Promise.reject(error);
         }
-
-        return { request, response };
-      },
-    },
+        return {
+          request,
+          response
+        };
+      }
+    }
   };
 }
-
 async function runTransformers(widget, transformers, method, ...rest) {
   for (const transformer of transformers) {
     if (typeof transformer[method] === 'function') {
       rest = await transformer[method](widget, ...rest);
     }
   }
-
   return rest;
 }
-
 function getFetchAPI() {
   if (typeof window === 'undefined') {
     return global?.fetch;
   }
-
   return window?.fetch?.bind?.(window);
 }
-
 function transformQuery() {
   return {
     async transformRequest(widget, request, response) {
-      let newRequest = { ...request };
-      let { baseUrl = '', path = '/' } = request;
-
+      let newRequest = {
+        ...request
+      };
+      let {
+        baseUrl = '',
+        path = '/'
+      } = request;
       if (!request.url) {
-        newRequest.url = `${
-          baseUrl.endsWith('/')
-            ? baseUrl.substring(0, baseUrl.length - 1)
-            : baseUrl
-        }/${path.startsWith('/') ? path.substring(1) : path}`;
+        newRequest.url = `${baseUrl.endsWith('/') ? baseUrl.substring(0, baseUrl.length - 1) : baseUrl}/${path.startsWith('/') ? path.substring(1) : path}`;
       } else {
         newRequest.url = request.url;
       }
-
-      const queryString = Object.keys(request.query)
-        .map((key) =>
-          [key, request.query[key]].map(encodeURIComponent).join('='),
-        )
-        .join('&');
+      const queryString = Object.keys(request.query).map(key => [key, request.query[key]].map(encodeURIComponent).join('=')).join('&');
       const hasQuestionMark = newRequest.url.indexOf('?') !== -1;
-
       if (hasQuestionMark) {
         newRequest.url += queryString ? `&${queryString}` : '';
       } else {
         newRequest.url += queryString ? `?${queryString}` : '';
       }
-
       return [newRequest, response];
-    },
+    }
   };
 }
-
 function transformBody() {
   return {
     async transformResponse(widget, request, response) {
       if (response.status !== 204 && typeof response.json === 'function') {
         const contentType = response.headers.get('content-type');
         let body = null;
-
         if (contentType && contentType.includes('application/json')) {
           body = await response.json();
         } else {
           body = await response.text();
         }
-
         let newResponse = copyResponse(response);
         newResponse.body = body;
-
         return [request, newResponse];
       }
-
       return [request, response];
     },
     async transformRequest(widget, request, response) {
-      const { body, headers, method } = request;
-
-      if (
-        body &&
-        (headers['Content-Type'] || headers['content-type']) ===
-          'application/json' &&
-        !['GET', 'HEAD'].includes(method)
-      ) {
-        let newRequest = { ...request, body: JSON.stringify(body) };
-
+      const {
+        body,
+        headers,
+        method
+      } = request;
+      if (body && (headers['Content-Type'] || headers['content-type']) === 'application/json' && !['GET', 'HEAD'].includes(method)) {
+        let newRequest = {
+          ...request,
+          body: JSON.stringify(body)
+        };
         return [newRequest, response];
       }
-
       return [request, response];
-    },
+    }
   };
 }
-
 function transformTimeout() {
   return {
     async transformRequest(widget, request, response) {
-      let newRequest = { ...request };
-
+      let newRequest = {
+        ...request
+      };
       if ('timeout' in request) {
         const controller = new widget.$dependencies.AbortController();
         newRequest.signal = controller.signal;
-
         newRequest.timeoutTimer = setTimeout(() => {
           controller.abort();
         }, request.timeout);
       }
-
       return [newRequest, response];
     },
     async transformResponse(widget, request, response) {
       if ('timeoutTimer' in request) {
         clearTimeout(request.timeoutTimer);
       }
-
       return [request, response];
-    },
+    }
   };
 }
-
 function copyResponse(response) {
   const {
     body,
@@ -223,9 +175,8 @@ function copyResponse(response) {
     trailers,
     type,
     url,
-    useFinalURL,
+    useFinalURL
   } = response;
-
   return {
     body: assign({}, body),
     headers,
@@ -236,31 +187,23 @@ function copyResponse(response) {
     trailers,
     type,
     url,
-    useFinalURL,
+    useFinalURL
   };
 }
-
 const PROTECTED_FIELDS = ['__proto__', 'prototype', 'constructor'];
 function assign(target, source = {}, parentField = null) {
   for (const field of Object.keys(source)) {
     if (PROTECTED_FIELDS.includes(field)) {
       return;
     }
-
     const value = source[field];
     const fieldPath = parentField ? parentField + '.' + field : field;
-
     if (value instanceof Array) {
       target[field] = value.slice();
-    } else if (
-      value instanceof Object &&
-      !(value instanceof Function) &&
-      !(value instanceof RegExp)
-    ) {
+    } else if (value instanceof Object && !(value instanceof Function) && !(value instanceof RegExp)) {
       if (!(target[field] instanceof Object)) {
         target[field] = {};
       }
-
       assign(target[field], value, fieldPath);
     } else {
       target[field] = value;

package/lib/index.mjs

@@ -3,44 +3,35 @@ import { bindWidgetToFunctions, assignMissingKeys } from '@merkur/core';
 function setDefaultConfig(widget, newDefaultConfig) {
   widget.$in.httpClient.defaultConfig = {
     ...widget.$in.httpClient.defaultConfig,
-    ...newDefaultConfig,
+    ...newDefaultConfig
   };
 }
-
 function getDefaultTransformers(widget) {
-  return [
-    transformBody(),
-    transformQuery(),
-    transformTimeout(),
-  ];
+  return [transformBody(), transformQuery(), transformTimeout()];
 }
 function httpClientPlugin() {
   return {
     async setup(widget) {
       assignMissingKeys(widget, httpClientAPI());
-
       widget.$in.httpClient = {
         defaultConfig: {
           method: 'GET',
           transformers: getDefaultTransformers(),
           headers: {},
           query: {},
-          timeout: 15000,
-        },
+          timeout: 15000
+        }
       };
-
       widget.$dependencies.fetch = getFetchAPI();
       widget.$dependencies.AbortController = AbortController;
-
       return widget;
     },
     async create(widget) {
       bindWidgetToFunctions(widget, widget.http);
       return widget;
-    },
+    }
   };
 }
-
 function httpClientAPI() {
   return {
     http: {
@@ -48,168 +39,129 @@ function httpClientAPI() {
         let response = null;
         let request = {
           ...widget.$in.httpClient.defaultConfig,
-          ...requestConfig,
+          ...requestConfig
         };
         const transformers = request.transformers;
-
-        [request, response] = await runTransformers(
-          widget,
-          transformers,
-          'transformRequest',
-          request,
-          response,
-        );
-
-        response = !response
-          ? await widget.$dependencies.fetch(request.url, request)
-          : response;
-
-        [request, response] = await runTransformers(
-          widget,
-          transformers,
-          'transformResponse',
-          request,
-          response,
-        );
-
+        [request, response] = await runTransformers(widget, transformers, 'transformRequest', request, response);
+        response = !response ? await widget.$dependencies.fetch(request.url, request) : response;
+        [request, response] = await runTransformers(widget, transformers, 'transformResponse', request, response);
         if (!response.ok) {
-          const error = new Error(
-            `Received ${response.status} status code when requesting ${request.url}`,
-            {
-              cause: { request, response },
-            },
-          );
+          const error = new Error(`Received ${response.status} status code when requesting ${request.url}`, {
+            cause: {
+              request,
+              response
+            }
+          });
           // keep compatablity
           error.request = request;
           error.response = response;
-
           return Promise.reject(error);
         }
-
-        return { request, response };
-      },
-    },
+        return {
+          request,
+          response
+        };
+      }
+    }
   };
 }
-
 async function runTransformers(widget, transformers, method, ...rest) {
   for (const transformer of transformers) {
     if (typeof transformer[method] === 'function') {
       rest = await transformer[method](widget, ...rest);
     }
   }
-
   return rest;
 }
-
 function getFetchAPI() {
   if (typeof window === 'undefined') {
     return global?.fetch;
   }
-
   return window?.fetch?.bind?.(window);
 }
-
 function transformQuery() {
   return {
     async transformRequest(widget, request, response) {
-      let newRequest = { ...request };
-      let { baseUrl = '', path = '/' } = request;
-
+      let newRequest = {
+        ...request
+      };
+      let {
+        baseUrl = '',
+        path = '/'
+      } = request;
       if (!request.url) {
-        newRequest.url = `${
-          baseUrl.endsWith('/')
-            ? baseUrl.substring(0, baseUrl.length - 1)
-            : baseUrl
-        }/${path.startsWith('/') ? path.substring(1) : path}`;
+        newRequest.url = `${baseUrl.endsWith('/') ? baseUrl.substring(0, baseUrl.length - 1) : baseUrl}/${path.startsWith('/') ? path.substring(1) : path}`;
       } else {
         newRequest.url = request.url;
       }
-
-      const queryString = Object.keys(request.query)
-        .map((key) =>
-          [key, request.query[key]].map(encodeURIComponent).join('='),
-        )
-        .join('&');
+      const queryString = Object.keys(request.query).map(key => [key, request.query[key]].map(encodeURIComponent).join('=')).join('&');
       const hasQuestionMark = newRequest.url.indexOf('?') !== -1;
-
       if (hasQuestionMark) {
         newRequest.url += queryString ? `&${queryString}` : '';
       } else {
         newRequest.url += queryString ? `?${queryString}` : '';
       }
-
       return [newRequest, response];
-    },
+    }
   };
 }
-
 function transformBody() {
   return {
     async transformResponse(widget, request, response) {
       if (response.status !== 204 && typeof response.json === 'function') {
         const contentType = response.headers.get('content-type');
         let body = null;
-
         if (contentType && contentType.includes('application/json')) {
           body = await response.json();
         } else {
           body = await response.text();
         }
-
         let newResponse = copyResponse(response);
         newResponse.body = body;
-
         return [request, newResponse];
       }
-
       return [request, response];
     },
     async transformRequest(widget, request, response) {
-      const { body, headers, method } = request;
-
-      if (
-        body &&
-        (headers['Content-Type'] || headers['content-type']) ===
-          'application/json' &&
-        !['GET', 'HEAD'].includes(method)
-      ) {
-        let newRequest = { ...request, body: JSON.stringify(body) };
-
+      const {
+        body,
+        headers,
+        method
+      } = request;
+      if (body && (headers['Content-Type'] || headers['content-type']) === 'application/json' && !['GET', 'HEAD'].includes(method)) {
+        let newRequest = {
+          ...request,
+          body: JSON.stringify(body)
+        };
         return [newRequest, response];
       }
-
       return [request, response];
-    },
+    }
   };
 }
-
 function transformTimeout() {
   return {
     async transformRequest(widget, request, response) {
-      let newRequest = { ...request };
-
+      let newRequest = {
+        ...request
+      };
       if ('timeout' in request) {
         const controller = new widget.$dependencies.AbortController();
         newRequest.signal = controller.signal;
-
         newRequest.timeoutTimer = setTimeout(() => {
           controller.abort();
         }, request.timeout);
       }
-
       return [newRequest, response];
     },
     async transformResponse(widget, request, response) {
       if ('timeoutTimer' in request) {
         clearTimeout(request.timeoutTimer);
       }
-
       return [request, response];
-    },
+    }
   };
 }
-
 function copyResponse(response) {
   const {
     body,
@@ -221,9 +173,8 @@ function copyResponse(response) {
     trailers,
     type,
     url,
-    useFinalURL,
+    useFinalURL
   } = response;
-
   return {
     body: assign({}, body),
     headers,
@@ -234,31 +185,23 @@ function copyResponse(response) {
     trailers,
     type,
     url,
-    useFinalURL,
+    useFinalURL
   };
 }
-
 const PROTECTED_FIELDS = ['__proto__', 'prototype', 'constructor'];
 function assign(target, source = {}, parentField = null) {
   for (const field of Object.keys(source)) {
     if (PROTECTED_FIELDS.includes(field)) {
       return;
     }
-
     const value = source[field];
     const fieldPath = parentField ? parentField + '.' + field : field;
-
     if (value instanceof Array) {
       target[field] = value.slice();
-    } else if (
-      value instanceof Object &&
-      !(value instanceof Function) &&
-      !(value instanceof RegExp)
-    ) {
+    } else if (value instanceof Object && !(value instanceof Function) && !(value instanceof RegExp)) {
       if (!(target[field] instanceof Object)) {
         target[field] = {};
       }
-
       assign(target[field], value, fieldPath);
     } else {
       target[field] = value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/plugin-http-client",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "description": "Merkur event emitter plugin.",
   "main": "lib/index",
   "module": "lib/index",
@@ -24,8 +24,7 @@
     "preversion": "npm test",
     "test": "jest --no-watchman -c ./jest.config.js",
     "test:es:version": "es-check es11 ./lib/index.mjs --module && es-check es9 ./lib/index.es9.mjs --module && es-check es9 ./lib/index.es9.cjs --module",
-    "build": "rollup -c rollup.config.mjs",
-    "prepare": "npm run build"
+    "build": "rollup -c rollup.config.mjs"
   },
   "repository": {
     "type": "git",
@@ -48,10 +47,10 @@
   },
   "homepage": "https://merkur.js.org/",
   "devDependencies": {
-    "@merkur/core": "^0.38.0"
+    "@merkur/core": "^0.39.0"
   },
   "peerDependencies": {
     "@merkur/core": "*"
   },
-  "gitHead": "a6e379c0cb887898e34465dc3db9231feb68e6a5"
+  "gitHead": "8ad2c8b26246850ce6289502a8b05e882f80ce31"
 }