@rivascva/dt-idl 1.1.8 → 1.1.9

package/dist/index.cjs.js

@@ -7,9 +7,7 @@ const DEFAULT_HEADERS = {
 
 const PATH_PARAM_RE = /\{[^{}]+\}/g;
 
-/**
- * Add custom parameters to Request object
- */
+/** Add custom parameters to Request object */
 class CustomRequest extends Request {
   constructor(input, init) {
     super(input, init);
@@ -23,6 +21,14 @@ class CustomRequest extends Request {
   }
 }
 
+/**
+ * Returns a cheap, non-cryptographically-secure random ID
+ * Courtesy of @imranbarbhuiya (https://github.com/imranbarbhuiya)
+ */
+function randomID() {
+  return Math.random().toString(36).slice(2, 11);
+}
+
 /**
  * Create an openapi-fetch client.
  * @type {import("./index.js").default}
@@ -47,7 +53,7 @@ function createClient(clientOptions) {
    * @param {T} url
    * @param {import('./index.js').FetchOptions<T>} fetchOptions
    */
-  async function coreFetch(url, fetchOptions) {
+  async function coreFetch(schemaPath, fetchOptions) {
     const {
       fetch = baseFetch,
       headers,
@@ -80,30 +86,42 @@ function createClient(clientOptions) {
     };
     if (requestInit.body) {
       requestInit.body = bodySerializer(requestInit.body);
+      // remove `Content-Type` if serialized body is FormData; browser will correctly set Content-Type & boundary expression
+      if (requestInit.body instanceof FormData) {
+        requestInit.headers.delete("Content-Type");
+      }
     }
-    // remove `Content-Type` if serialized body is FormData; browser will correctly set Content-Type & boundary expression
-    if (requestInit.body instanceof FormData) {
-      requestInit.headers.delete("Content-Type");
-    }
-    let request = new CustomRequest(createFinalURL(url, { baseUrl, params, querySerializer }), requestInit);
-    // middleware (request)
-    const mergedOptions = {
-      baseUrl,
-      fetch,
-      parseAs,
-      querySerializer,
-      bodySerializer,
-    };
-    for (const m of middlewares) {
-      if (m && typeof m === "object" && typeof m.onRequest === "function") {
-        request.schemaPath = url; // (re)attach original URL
-        request.params = params; // (re)attach params
-        const result = await m.onRequest(request, mergedOptions);
-        if (result) {
-          if (!(result instanceof Request)) {
-            throw new Error("Middleware must return new Request() when modifying the request");
+
+    let id;
+    let options;
+    let request = new CustomRequest(createFinalURL(schemaPath, { baseUrl, params, querySerializer }), requestInit);
+
+    if (middlewares.length) {
+      id = randomID();
+
+      // middleware (request)
+      options = Object.freeze({
+        baseUrl,
+        fetch,
+        parseAs,
+        querySerializer,
+        bodySerializer,
+      });
+      for (const m of middlewares) {
+        if (m && typeof m === "object" && typeof m.onRequest === "function") {
+          const result = await m.onRequest({
+            request,
+            schemaPath,
+            params,
+            options,
+            id,
+          });
+          if (result) {
+            if (!(result instanceof Request)) {
+              throw new Error("onRequest: must return new Request() when modifying the request");
+            }
+            request = result;
           }
-          request = result;
         }
       }
     }
@@ -113,15 +131,24 @@ function createClient(clientOptions) {
 
     // middleware (response)
     // execute in reverse-array order (first priority gets last transform)
-    for (let i = middlewares.length - 1; i >= 0; i--) {
-      const m = middlewares[i];
-      if (m && typeof m === "object" && typeof m.onResponse === "function") {
-        const result = await m.onResponse(response, mergedOptions);
-        if (result) {
-          if (!(result instanceof Response)) {
-            throw new Error("Middleware must return new Response() when modifying the response");
+    if (middlewares.length) {
+      for (let i = middlewares.length - 1; i >= 0; i--) {
+        const m = middlewares[i];
+        if (m && typeof m === "object" && typeof m.onResponse === "function") {
+          const result = await m.onResponse({
+            request,
+            response,
+            schemaPath,
+            params,
+            options,
+            id,
+          });
+          if (result) {
+            if (!(result instanceof Response)) {
+              throw new Error("onResponse: must return new Response() when modifying the response");
+            }
+            response = result;
           }
-          response = result;
         }
       }
     }
@@ -399,7 +426,7 @@ function defaultPathSerializer(pathname, pathParams) {
       nextURL = nextURL.replace(match, `;${serializePrimitiveParam(name, value)}`);
       continue;
     }
-    nextURL = nextURL.replace(match, style === "label" ? `.${value}` : value);
+    nextURL = nextURL.replace(match, style === "label" ? `.${encodeURIComponent(value)}` : encodeURIComponent(value));
   }
   return nextURL;
 }
@@ -409,6 +436,9 @@ function defaultPathSerializer(pathname, pathParams) {
  * @type {import("./index.js").defaultBodySerializer}
  */
 function defaultBodySerializer(body) {
+  if (body instanceof FormData) {
+    return body;
+  }
   return JSON.stringify(body);
 }