make-service 0.0.3 → 0.1.0

package/README.md

@@ -155,21 +155,21 @@ import { typedResponse } from 'make-service'
 import type { TypedResponse } from 'make-service'
 
 // With JSON
-const response: TypedResponse = new Response(JSON.stringify({ foo: "bar" }))
-const json = await typedResponse(response).json()
+const response: TypedResponse = typedResponse(new Response(JSON.stringify({ foo: "bar" })))
+const json = await response.json()
 //    ^? unknown
-const json = await typedResponse(response).json<{ foo: string }>()
+const json = await response.json<{ foo: string }>()
 //    ^? { foo: string }
-const json = await typedResponse(response).json(z.object({ foo: z.string() }))
+const json = await response.json(z.object({ foo: z.string() }))
 //    ^? { foo: string }
 
 // With text
-const response: TypedResponse = new Response("foo")
-const text = await typedResponse(response).text()
+const response: TypedResponse = typedResponse(new Response("foo"))
+const text = await response.text()
 //    ^? string
-const text = await typedResponse(response).text<`foo${string}`>()
+const text = await response.text<`foo${string}`>()
 //    ^? `foo${string}`
-const text = await typedResponse(response).text(z.string().email())
+const text = await response.text(z.string().email())
 //    ^? string
 ```
 

package/dist/index.d.ts

@@ -33,6 +33,12 @@ type HTTPMethod = (typeof HTTP_METHODS)[number];
 type TypedResponseJson = ReturnType<typeof getJson>;
 type TypedResponseText = ReturnType<typeof getText>;
 
+/**
+ * It merges multiple HeadersInit objects into a single Headers object
+ * @param entries Any number of HeadersInit objects
+ * @returns a new Headers object with the merged headers
+ */
+declare function mergeHeaders(...entries: (HeadersInit | [string, undefined][] | Record<string, undefined>)[]): Headers;
 /**
  * @param input a string or URL to which the query parameters will be added
  * @param searchParams the query parameters
@@ -43,7 +49,7 @@ declare function addQueryToInput(input: string | URL, searchParams?: SearchParam
  * @param baseURL the base path to the API
  * @returns a function that receives a path and an object of query parameters and returns a URL
  */
-declare function makeGetApiUrl(baseURL: string): (path: string, searchParams?: SearchParams) => string | URL;
+declare function makeGetApiUrl(baseURL: string | URL): (path: string, searchParams?: SearchParams) => string | URL;
 /**
  * It hacks the Response object to add typed json and text methods
  * @param response the Response to be proxied
@@ -90,7 +96,7 @@ declare function enhancedFetch(input: string | URL, requestInit?: EnhancedReques
  * const users = await response.json(userSchema);
  * //    ^? User[]
  */
-declare function makeService(baseURL: string, baseHeaders?: HeadersInit): {
+declare function makeService(baseURL: string | URL, baseHeaders?: HeadersInit): {
     get: (path: string, requestInit?: ServiceRequestInit) => Promise<TypedResponse>;
     post: (path: string, requestInit?: ServiceRequestInit) => Promise<TypedResponse>;
     put: (path: string, requestInit?: ServiceRequestInit) => Promise<TypedResponse>;
@@ -100,4 +106,4 @@ declare function makeService(baseURL: string, baseHeaders?: HeadersInit): {
     head: (path: string, requestInit?: ServiceRequestInit) => Promise<TypedResponse>;
 };
 
-export { EnhancedRequestInit, HTTPMethod, JSONValue, Schema, SearchParams, ServiceRequestInit, TypedResponse, TypedResponseJson, TypedResponseText, addQueryToInput, enhancedFetch, ensureStringBody, makeGetApiUrl, makeService, typedResponse };
+export { EnhancedRequestInit, HTTPMethod, JSONValue, Schema, SearchParams, ServiceRequestInit, TypedResponse, TypedResponseJson, TypedResponseText, addQueryToInput, enhancedFetch, ensureStringBody, makeGetApiUrl, makeService, mergeHeaders, typedResponse };

package/dist/index.js

@@ -25,6 +25,7 @@ __export(src_exports, {
   ensureStringBody: () => ensureStringBody,
   makeGetApiUrl: () => makeGetApiUrl,
   makeService: () => makeService,
+  mergeHeaders: () => mergeHeaders,
   typedResponse: () => typedResponse
 });
 module.exports = __toCommonJS(src_exports);
@@ -61,20 +62,42 @@ function isHTTPMethod(method) {
 }
 
 // src/make-service.ts
+function mergeHeaders(...entries) {
+  const result = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const headers = new Headers(entry);
+    for (const [key, value] of headers.entries()) {
+      if (value === void 0 || value === "undefined") {
+        result.delete(key);
+      } else {
+        result.set(key, value);
+      }
+    }
+  }
+  return new Headers(Array.from(result.entries()));
+}
 function addQueryToInput(input, searchParams) {
   if (!searchParams)
     return input;
-  if (searchParams && typeof input === "string") {
+  if (typeof input === "string") {
     const separator = input.includes("?") ? "&" : "?";
     return `${input}${separator}${new URLSearchParams(searchParams)}`;
   }
   if (searchParams && input instanceof URL) {
-    input.search = new URLSearchParams(searchParams).toString();
+    for (const [key, value] of Object.entries(
+      new URLSearchParams(searchParams)
+    )) {
+      input.searchParams.set(key, value);
+    }
   }
   return input;
 }
 function makeGetApiUrl(baseURL) {
-  return (path, searchParams) => addQueryToInput(`${baseURL}${path}`, searchParams);
+  const base = baseURL instanceof URL ? baseURL.toString() : baseURL;
+  return (path, searchParams) => {
+    const url = `${base}${path}`.replace(/([^https?:]\/)\/+/g, "$1");
+    return addQueryToInput(url, searchParams);
+  };
 }
 function typedResponse(response) {
   return new Proxy(response, {
@@ -95,23 +118,30 @@ function ensureStringBody(body) {
   return JSON.stringify(body);
 }
 async function enhancedFetch(input, requestInit) {
+  var _a;
   const { query, trace, ...reqInit } = requestInit != null ? requestInit : {};
-  const headers = { "content-type": "application/json", ...reqInit.headers };
+  const headers = mergeHeaders(
+    {
+      "content-type": "application/json"
+    },
+    (_a = reqInit.headers) != null ? _a : {}
+  );
   const url = addQueryToInput(input, query);
   const body = ensureStringBody(reqInit.body);
   const enhancedReqInit = { ...reqInit, headers, body };
   trace == null ? void 0 : trace(url, enhancedReqInit);
-  const request = new Request(url, enhancedReqInit);
-  const response = await fetch(request);
+  const response = await fetch(url, enhancedReqInit);
   return typedResponse(response);
 }
 function makeService(baseURL, baseHeaders) {
   const service = (method) => {
     return async (path, requestInit = {}) => {
-      const response = await enhancedFetch(`${baseURL}${path}`, {
+      var _a;
+      const url = makeGetApiUrl(baseURL)(path);
+      const response = await enhancedFetch(url, {
         ...requestInit,
         method,
-        headers: { ...baseHeaders, ...requestInit == null ? void 0 : requestInit.headers }
+        headers: mergeHeaders(baseHeaders != null ? baseHeaders : {}, (_a = requestInit == null ? void 0 : requestInit.headers) != null ? _a : {})
       });
       return response;
     };
@@ -119,7 +149,7 @@ function makeService(baseURL, baseHeaders) {
   return new Proxy({}, {
     get(_target, prop) {
       if (isHTTPMethod(prop))
-        return service(prop);
+        return service(prop.toUpperCase());
       throw new Error(`Invalid HTTP method: ${prop.toString()}`);
     }
   });
@@ -131,5 +161,6 @@ function makeService(baseURL, baseHeaders) {
   ensureStringBody,
   makeGetApiUrl,
   makeService,
+  mergeHeaders,
   typedResponse
 });

package/dist/index.mjs

@@ -30,20 +30,42 @@ function isHTTPMethod(method) {
 }
 
 // src/make-service.ts
+function mergeHeaders(...entries) {
+  const result = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const headers = new Headers(entry);
+    for (const [key, value] of headers.entries()) {
+      if (value === void 0 || value === "undefined") {
+        result.delete(key);
+      } else {
+        result.set(key, value);
+      }
+    }
+  }
+  return new Headers(Array.from(result.entries()));
+}
 function addQueryToInput(input, searchParams) {
   if (!searchParams)
     return input;
-  if (searchParams && typeof input === "string") {
+  if (typeof input === "string") {
     const separator = input.includes("?") ? "&" : "?";
     return `${input}${separator}${new URLSearchParams(searchParams)}`;
   }
   if (searchParams && input instanceof URL) {
-    input.search = new URLSearchParams(searchParams).toString();
+    for (const [key, value] of Object.entries(
+      new URLSearchParams(searchParams)
+    )) {
+      input.searchParams.set(key, value);
+    }
   }
   return input;
 }
 function makeGetApiUrl(baseURL) {
-  return (path, searchParams) => addQueryToInput(`${baseURL}${path}`, searchParams);
+  const base = baseURL instanceof URL ? baseURL.toString() : baseURL;
+  return (path, searchParams) => {
+    const url = `${base}${path}`.replace(/([^https?:]\/)\/+/g, "$1");
+    return addQueryToInput(url, searchParams);
+  };
 }
 function typedResponse(response) {
   return new Proxy(response, {
@@ -64,23 +86,30 @@ function ensureStringBody(body) {
   return JSON.stringify(body);
 }
 async function enhancedFetch(input, requestInit) {
+  var _a;
   const { query, trace, ...reqInit } = requestInit != null ? requestInit : {};
-  const headers = { "content-type": "application/json", ...reqInit.headers };
+  const headers = mergeHeaders(
+    {
+      "content-type": "application/json"
+    },
+    (_a = reqInit.headers) != null ? _a : {}
+  );
   const url = addQueryToInput(input, query);
   const body = ensureStringBody(reqInit.body);
   const enhancedReqInit = { ...reqInit, headers, body };
   trace == null ? void 0 : trace(url, enhancedReqInit);
-  const request = new Request(url, enhancedReqInit);
-  const response = await fetch(request);
+  const response = await fetch(url, enhancedReqInit);
   return typedResponse(response);
 }
 function makeService(baseURL, baseHeaders) {
   const service = (method) => {
     return async (path, requestInit = {}) => {
-      const response = await enhancedFetch(`${baseURL}${path}`, {
+      var _a;
+      const url = makeGetApiUrl(baseURL)(path);
+      const response = await enhancedFetch(url, {
         ...requestInit,
         method,
-        headers: { ...baseHeaders, ...requestInit == null ? void 0 : requestInit.headers }
+        headers: mergeHeaders(baseHeaders != null ? baseHeaders : {}, (_a = requestInit == null ? void 0 : requestInit.headers) != null ? _a : {})
       });
       return response;
     };
@@ -88,7 +117,7 @@ function makeService(baseURL, baseHeaders) {
   return new Proxy({}, {
     get(_target, prop) {
       if (isHTTPMethod(prop))
-        return service(prop);
+        return service(prop.toUpperCase());
       throw new Error(`Invalid HTTP method: ${prop.toString()}`);
     }
   });
@@ -99,5 +128,6 @@ export {
   ensureStringBody,
   makeGetApiUrl,
   makeService,
+  mergeHeaders,
   typedResponse
 };

package/package.json

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