make-service 4.1.0 → 4.1.1

package/dist/index.js

@@ -49,15 +49,23 @@ var HTTP_METHODS = [
 
 // src/primitives.ts
 function addQueryToURL(url, searchParams) {
-  if (!searchParams) return url;
+  if (searchParams === void 0) return url;
   if (typeof url === "string") {
-    const separator = url.includes("?") ? "&" : "?";
-    return `${url}${separator}${new URLSearchParams(searchParams)}`;
+    const hasQuery = url.includes("?");
+    const qs = new URLSearchParams(searchParams).toString();
+    if (!qs) return hasQuery ? url : `${url}?`;
+    const separator = hasQuery ? "&" : "?";
+    return `${url}${separator}${qs}`;
   }
-  if (searchParams && url instanceof URL) {
+  if (url instanceof URL) {
     const result = new URL(url.toString());
-    for (const [key, value] of new URLSearchParams(searchParams).entries()) {
-      result.searchParams.set(key, value);
+    const qs = new URLSearchParams(searchParams);
+    if (!qs.toString()) {
+      if (!result.search) result.search = "?";
+    } else {
+      for (const [key, value] of qs.entries()) {
+        result.searchParams.set(key, value);
+      }
     }
     return result;
   }
@@ -66,7 +74,7 @@ function addQueryToURL(url, searchParams) {
 function ensureStringBody(body) {
   if (typeof body === "undefined") return body;
   if (typeof body === "string") return body;
-  return ["number", "boolean", "array", "object"].includes(typeOf(body)) ? JSON.stringify(body) : body;
+  return ["number", "boolean", "array", "object", "date"].includes(typeOf(body)) ? JSON.stringify(body) : body;
 }
 function makeGetApiURL(baseURL) {
   const base = baseURL instanceof URL ? baseURL.toString() : baseURL;
@@ -93,7 +101,7 @@ function replaceURLParams(url, params) {
   if (!params) return url;
   let urlString = String(url);
   for (const [key, value] of Object.entries(params)) {
-    urlString = urlString.replace(new RegExp(`:${key}($|/)`), `${value}$1`);
+    urlString = urlString.replace(new RegExp(`:${key}($|/)`, "g"), `${value}$1`);
   }
   return url instanceof URL ? new URL(urlString) : urlString;
 }
@@ -102,7 +110,7 @@ function typeOf(t) {
 }
 var ParseResponseError = class extends Error {
   constructor(message, issues) {
-    super(JSON.stringify({ message, issues }, null, 2));
+    super(message);
     this.issues = issues;
     this.name = "ParseResponseError";
     this.issues = issues;
@@ -142,8 +150,8 @@ function typedResponse(response, options) {
   const getTextFn = options?.getText ?? getText;
   return new Proxy(response, {
     get(target, prop) {
-      if (prop === "json") return getJsonFn(target);
-      if (prop === "text") return getTextFn(target);
+      if (prop === "json") return getJsonFn(target.clone());
+      if (prop === "text") return getTextFn(target.clone());
       const value = Reflect.get(target, prop);
       if (typeof value === "function") {
         return value.bind(target);

package/dist/index.mjs

@@ -13,15 +13,23 @@ var HTTP_METHODS = [
 
 // src/primitives.ts
 function addQueryToURL(url, searchParams) {
-  if (!searchParams) return url;
+  if (searchParams === void 0) return url;
   if (typeof url === "string") {
-    const separator = url.includes("?") ? "&" : "?";
-    return `${url}${separator}${new URLSearchParams(searchParams)}`;
+    const hasQuery = url.includes("?");
+    const qs = new URLSearchParams(searchParams).toString();
+    if (!qs) return hasQuery ? url : `${url}?`;
+    const separator = hasQuery ? "&" : "?";
+    return `${url}${separator}${qs}`;
   }
-  if (searchParams && url instanceof URL) {
+  if (url instanceof URL) {
     const result = new URL(url.toString());
-    for (const [key, value] of new URLSearchParams(searchParams).entries()) {
-      result.searchParams.set(key, value);
+    const qs = new URLSearchParams(searchParams);
+    if (!qs.toString()) {
+      if (!result.search) result.search = "?";
+    } else {
+      for (const [key, value] of qs.entries()) {
+        result.searchParams.set(key, value);
+      }
     }
     return result;
   }
@@ -30,7 +38,7 @@ function addQueryToURL(url, searchParams) {
 function ensureStringBody(body) {
   if (typeof body === "undefined") return body;
   if (typeof body === "string") return body;
-  return ["number", "boolean", "array", "object"].includes(typeOf(body)) ? JSON.stringify(body) : body;
+  return ["number", "boolean", "array", "object", "date"].includes(typeOf(body)) ? JSON.stringify(body) : body;
 }
 function makeGetApiURL(baseURL) {
   const base = baseURL instanceof URL ? baseURL.toString() : baseURL;
@@ -57,7 +65,7 @@ function replaceURLParams(url, params) {
   if (!params) return url;
   let urlString = String(url);
   for (const [key, value] of Object.entries(params)) {
-    urlString = urlString.replace(new RegExp(`:${key}($|/)`), `${value}$1`);
+    urlString = urlString.replace(new RegExp(`:${key}($|/)`, "g"), `${value}$1`);
   }
   return url instanceof URL ? new URL(urlString) : urlString;
 }
@@ -66,7 +74,7 @@ function typeOf(t) {
 }
 var ParseResponseError = class extends Error {
   constructor(message, issues) {
-    super(JSON.stringify({ message, issues }, null, 2));
+    super(message);
     this.issues = issues;
     this.name = "ParseResponseError";
     this.issues = issues;
@@ -106,8 +114,8 @@ function typedResponse(response, options) {
   const getTextFn = options?.getText ?? getText;
   return new Proxy(response, {
     get(target, prop) {
-      if (prop === "json") return getJsonFn(target);
-      if (prop === "text") return getTextFn(target);
+      if (prop === "json") return getJsonFn(target.clone());
+      if (prop === "text") return getTextFn(target.clone());
       const value = Reflect.get(target, prop);
       if (typeof value === "function") {
         return value.bind(target);

package/package.json

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