make-service 2.1.2 → 3.0.0

package/README.md

@@ -102,7 +102,6 @@ On the example above, the request will be sent with the following arguments:
 // {
 //   method: 'GET',
 //   headers: {
-//    'content-type': 'application/json',
 //    'authorization': 'Bearer 123',
 //   }
 // }
@@ -202,7 +201,7 @@ const service = makeService("https://example.com/api", {
 })
 
 const response = await service.get("/users", {
-  headers: new Headers({ authorization: 'undefined', "Content-Type": undefined }),
+  headers: new Headers({ authorization: 'undefined' }),
 })
 // headers will be empty.
 ```
@@ -344,7 +343,7 @@ const service = makeService("https://example.com/api")
 const response = await service.get("/users/:id", {
   params: { id: "2" },
   query: { page: "2"},
-  headers: { Accept: "application/json" },
+  headers: { Accept: "application/json", "Content-type": "application/json" },
   trace: (url, requestInit) => {
     console.log("The request was sent to " + url)
     console.log("with the following params: " + JSON.stringify(requestInit))
@@ -408,12 +407,9 @@ await enhancedFetch("https://example.com/api/users/:role", {
 // {
 //   method: 'POST',
 //   body: '{"some":{"object":{"as":{"body":{}}}}}',
-//   headers: { 'content-type': 'application/json' }
 // }
 ```
 
-Notice: the `enhancedFetch` adds a `'content-type': 'application/json'` header by default.
-
 ## typedResponse
 
 A type-safe wrapper around the `Response` object. It adds a `json` and `text` method that will parse the response with a given zod schema. If you don't provide a schema, it will return `unknown` instead of `any`, then you can also give it a generic to type cast the result.
@@ -596,6 +592,7 @@ The params will be **strongly-typed** which means they will be validated against
       <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/danielweinmann"><img src="https://avatars.githubusercontent.com/u/204765?v=4?s=100" width="100px;" alt="Daniel Weinmann"/><br /><sub><b>Daniel Weinmann</b></sub></a><br /><a href="#code-danielweinmann" title="Code">💻</a> <a href="#promotion-danielweinmann" title="Promotion">📣</a> <a href="#ideas-danielweinmann" title="Ideas, Planning, & Feedback">🤔</a> <a href="#doc-danielweinmann" title="Documentation">📖</a> <a href="#bug-danielweinmann" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/diogob"><img src="https://avatars.githubusercontent.com/u/20662?v=4?s=100" width="100px;" alt="Diogo Biazus"/><br /><sub><b>Diogo Biazus</b></sub></a><br /><a href="#code-diogob" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/garusis"><img src="https://avatars.githubusercontent.com/u/15615652?v=4?s=100" width="100px;" alt="Marcos Javier Alvarez Maestre"/><br /><sub><b>Marcos Javier Alvarez Maestre</b></sub></a><br /><a href="#code-garusis" title="Code">💻</a> <a href="#bug-garusis" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://luca.md"><img src="https://avatars.githubusercontent.com/u/1881266?v=4?s=100" width="100px;" alt="Andrei Luca"/><br /><sub><b>Andrei Luca</b></sub></a><br /><a href="#doc-iamandrewluca" title="Documentation">📖</a></td>
     </tr>
   </tbody>
 </table>

package/dist/index.js

@@ -124,23 +124,21 @@ function typedResponse(response, options) {
         return getJsonFn(target);
       if (prop === "text")
         return getTextFn(target);
-      return target[prop];
+      const value = Reflect.get(target, prop);
+      if (typeof value === "function") {
+        return value.bind(target);
+      }
+      return value;
     }
   });
 }
 async function enhancedFetch(url, requestInit) {
-  var _a, _b;
+  var _a;
   const { query, trace, ...reqInit } = requestInit != null ? requestInit : {};
-  const headers = mergeHeaders(
-    {
-      "content-type": "application/json"
-    },
-    (_a = reqInit.headers) != null ? _a : {}
-  );
-  const withParams = replaceURLParams(url, (_b = reqInit.params) != null ? _b : {});
-  const fullURL = addQueryToURL(withParams, query);
   const body = ensureStringBody(reqInit.body);
-  const enhancedReqInit = { ...reqInit, headers, body };
+  const withParams = replaceURLParams(url, (_a = reqInit.params) != null ? _a : {});
+  const fullURL = addQueryToURL(withParams, query);
+  const enhancedReqInit = { ...reqInit, body };
   trace == null ? void 0 : trace(fullURL, enhancedReqInit);
   const response = await fetch(fullURL, enhancedReqInit);
   return typedResponse(response);

package/dist/index.mjs

@@ -89,23 +89,21 @@ function typedResponse(response, options) {
         return getJsonFn(target);
       if (prop === "text")
         return getTextFn(target);
-      return target[prop];
+      const value = Reflect.get(target, prop);
+      if (typeof value === "function") {
+        return value.bind(target);
+      }
+      return value;
     }
   });
 }
 async function enhancedFetch(url, requestInit) {
-  var _a, _b;
+  var _a;
   const { query, trace, ...reqInit } = requestInit != null ? requestInit : {};
-  const headers = mergeHeaders(
-    {
-      "content-type": "application/json"
-    },
-    (_a = reqInit.headers) != null ? _a : {}
-  );
-  const withParams = replaceURLParams(url, (_b = reqInit.params) != null ? _b : {});
-  const fullURL = addQueryToURL(withParams, query);
   const body = ensureStringBody(reqInit.body);
-  const enhancedReqInit = { ...reqInit, headers, body };
+  const withParams = replaceURLParams(url, (_a = reqInit.params) != null ? _a : {});
+  const fullURL = addQueryToURL(withParams, query);
+  const enhancedReqInit = { ...reqInit, body };
   trace == null ? void 0 : trace(fullURL, enhancedReqInit);
   const response = await fetch(fullURL, enhancedReqInit);
   return typedResponse(response);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "make-service",
-  "version": "2.1.2",
+  "version": "3.0.0",
   "description": "Some utilities to extend the 'fetch' API to better interact with external APIs.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",