@scalar/api-client 2.2.11 → 2.2.15

package/dist/libs/send-request/send-request.js

@@ -1,28 +1,28 @@
 import { ERRORS as v, normalizeError as B } from "../errors.js";
-import { normalizeHeaders as q } from "../normalize-headers.js";
+import { normalizeHeaders as $ } from "../normalize-headers.js";
 import { replaceTemplateVariables as f } from "../string-template.js";
-import { canMethodHaveBody as A, isRelativePath as C, concatenateUrlAndPath as F, shouldUseProxy as U } from "@scalar/oas-utils/helpers";
+import { canMethodHaveBody as q, isRelativePath as C, concatenateUrlAndPath as F, shouldUseProxy as U, REGEX as H } from "@scalar/oas-utils/helpers";
 import g from "js-cookie";
 import M from "whatwg-mimetype";
 import { textMediaTypes as z } from "../../views/Request/consts/mediaTypes.js";
-function H(n, o) {
+function K(n, o) {
   const t = new M(o);
   return z.includes(t.essence) ? new TextDecoder(t.parameters.get("charset")).decode(n) : new Blob([n], { type: t.essence });
 }
-function K(n, o) {
+function W(n, o) {
   const t = {};
   return n.parameters.headers.forEach((r) => {
     const h = r.key.trim().toLowerCase();
     r.enabled && (h !== "content-type" || r.value !== "multipart/form-data") && (t[h] = f(r.value, o));
   }), t;
 }
-function W(n, o) {
+function j(n, o) {
   const t = new URLSearchParams();
   return n.parameters.query.forEach((r) => {
     r.enabled && r.value && t.append(r.key, f(r.value, o));
   }), t;
 }
-function j({
+function N({
   example: n,
   env: o,
   globalCookies: t,
@@ -42,13 +42,13 @@ function j({
     sameSite: "None",
     // The Secure attribute must also be set when setting SameSite=None.
     secure: !0
-  }, l = g.get();
-  return Object.keys(l).forEach((a) => g.remove(a)), n.parameters.cookies.forEach((a) => {
+  }, y = g.get();
+  return Object.keys(y).forEach((a) => g.remove(a)), n.parameters.cookies.forEach((a) => {
     a.enabled && g.set(a.key, f(a.value, o));
   }), t.forEach((a) => {
-    var y;
-    const { name: c, value: E, ...p } = a;
-    (p.domain === r || ((y = p.domain) == null ? void 0 : y.startsWith(".")) && r.endsWith(p.domain ?? "")) && g.set(c, E, {
+    var l;
+    const { name: c, value: k, ...p } = a;
+    (p.domain === r || ((l = p.domain) == null ? void 0 : l.startsWith(".")) && r.endsWith(p.domain ?? "")) && g.set(c, k, {
       /** Override the domain with the proxy value */
       domain: m,
       // TODO: path cookies probably don't worth with the proxy
@@ -61,15 +61,15 @@ function j({
     cookieParams: i
   };
 }
-function N(n, o, t) {
+function Y(n, o, t) {
   var r, h, m;
-  if (!A(n))
+  if (!q(n))
     return { body: void 0, contentType: void 0 };
   if (o.body.activeBody === "formData" && o.body.formData) {
-    const i = o.body.formData.encoding === "form-data" ? "multipart/form-data" : "application/x-www-form-urlencoded", l = o.body.formData.encoding === "form-data" ? new FormData() : new URLSearchParams();
+    const i = o.body.formData.encoding === "form-data" ? "multipart/form-data" : "application/x-www-form-urlencoded", y = o.body.formData.encoding === "form-data" ? new FormData() : new URLSearchParams();
     return o.body.formData.value.forEach((a) => {
-      !a.enabled || !a.key || (a.file && l instanceof FormData ? l.append(a.key, a.file, a.file.name) : a.value !== void 0 && l.append(a.key, f(a.value, t)));
-    }), { body: l, contentType: i };
+      !a.enabled || !a.key || (a.file && y instanceof FormData ? y.append(a.key, a.file, a.file.name) : a.value !== void 0 && y.append(a.key, f(a.value, t)));
+    }), { body: y, contentType: i };
   }
   return o.body.activeBody === "raw" ? {
     body: f(((r = o.body.raw) == null ? void 0 : r.value) ?? "", t),
@@ -82,10 +82,10 @@ function N(n, o, t) {
     contentType: void 0
   };
 }
-function Y(n) {
-  return n.startsWith("http://") || n.startsWith("https://") ? n : `http://${n}`;
+function Q(n) {
+  return H.PATH.test(n) || n.startsWith("http://") || n.startsWith("https://") ? n : `http://${n}`;
 }
-const T = "YOUR_SECRET_TOKEN", ee = ({
+const T = "YOUR_SECRET_TOKEN", oe = ({
   request: n,
   example: o,
   server: t,
@@ -93,18 +93,20 @@ const T = "YOUR_SECRET_TOKEN", ee = ({
   selectedSecuritySchemeUids: h = [],
   proxyUrl: m,
   status: i,
-  environment: l,
+  environment: y,
   globalCookies: a
 }) => {
   try {
-    const c = l ?? {}, E = new AbortController(), p = o.parameters.path.reduce((u, e) => (e.enabled && (u[e.key] = f(e.value, c)), u), {}), P = f((t == null ? void 0 : t.url) ?? "", c), y = f(n.path, p);
-    let d = P || y;
+    const c = y ?? {}, k = new AbortController(), p = o.parameters.path.reduce((u, e) => (e.enabled && (u[e.key] = f(e.value, c)), u), {}), P = f((t == null ? void 0 : t.url) ?? "", c), l = f(n.path, p);
+    let d = P || l;
     if (!d) throw v.URL_EMPTY;
     Object.entries((t == null ? void 0 : t.variables) ?? {}).forEach(([u, e]) => {
-      d = f(d, { [u]: e.default });
+      d = f(d, {
+        [u]: p[u] || e.default
+      });
     });
-    const D = W(o, c), k = K(o, c), { body: O } = N(n.method, o, c);
-    if (j({
+    const D = j(o, c), E = W(o, c), { body: O } = Y(n.method, o, c);
+    if (N({
       example: o,
       env: c,
       globalCookies: a,
@@ -116,33 +118,33 @@ const T = "YOUR_SECRET_TOKEN", ee = ({
       if (e) {
         if (e.type === "apiKey") {
           const s = f(e.value, c) || T;
-          e.in === "header" && (k[e.name] = s), e.in === "query" && D.append(e.name, s), e.in === "cookie" && g.set(e.name, s);
+          e.in === "header" && (E[e.name] = s), e.in === "query" && D.append(e.name, s), e.in === "cookie" && g.set(e.name, s);
         }
         if (e.type === "http")
           if (e.scheme === "basic") {
             const s = f(e.username, c), b = f(e.password, c), R = `${s}:${b}`;
-            k.Authorization = `Basic ${R === ":" ? "username:password" : btoa(R)}`;
+            E.Authorization = `Basic ${R === ":" ? "username:password" : btoa(R)}`;
           } else {
             const s = f(e.token, c);
-            k.Authorization = `Bearer ${s || T}`;
+            E.Authorization = `Bearer ${s || T}`;
           }
         if (e.type === "oauth2") {
           const b = (w = Object.values(e.flows).find((R) => R.token)) == null ? void 0 : w.token;
-          k.Authorization = `Bearer ${b || T}`;
+          E.Authorization = `Bearer ${b || T}`;
         }
       }
     }), d && (!C(d) || typeof window < "u")) {
-      const u = C(d) ? F(window.location.origin, d) : Y(d), e = new URL(u), w = new URL(y, e.origin), s = new URL(e);
-      t != null && t.url && (e.pathname === "/" ? s.pathname = y : s.pathname = e.pathname + y), s.search = new URLSearchParams([
+      const u = C(d) ? F(window.location.origin, d) : Q(d), e = new URL(u), w = new URL(l, e.origin), s = new URL(e);
+      t != null && t.url && (e.pathname === "/" ? s.pathname = l : s.pathname = e.pathname + l), s.search = new URLSearchParams([
         ...e.searchParams,
         ...w.searchParams,
         ...D
       ]).toString(), d = s.toString();
     }
-    const S = new URLSearchParams([["scalar_url", d.toString()]]), _ = U(m, d) ? `${m}?${S.toString()}` : d, L = new Request(_, {
+    const S = new URLSearchParams([["scalar_url", d.toString()]]), A = U(m, d) ? `${m}?${S.toString()}` : d, L = new Request(A, {
       method: n.method.toUpperCase(),
       body: O,
-      headers: k
+      headers: E
     });
     return [
       null,
@@ -153,13 +155,13 @@ const T = "YOUR_SECRET_TOKEN", ee = ({
           const u = Date.now();
           try {
             const e = await fetch(L, {
-              signal: E.signal
+              signal: k.signal
             });
             i == null || i.emit("stop");
-            const w = q(
+            const w = $(
               e.headers,
               U(m, d)
-            ), s = e.headers.get("content-type") ?? "text/plain;charset=UTF-8", b = await e.arrayBuffer(), R = H(b, s), $ = "getSetCookie" in e.headers && typeof e.headers.getSetCookie == "function" ? e.headers.getSetCookie() : [];
+            ), s = e.headers.get("content-type") ?? "text/plain;charset=UTF-8", b = await e.arrayBuffer(), R = K(b, s), _ = "getSetCookie" in e.headers && typeof e.headers.getSetCookie == "function" ? e.headers.getSetCookie() : [];
             return [
               null,
               {
@@ -168,13 +170,13 @@ const T = "YOUR_SECRET_TOKEN", ee = ({
                 response: {
                   ...e,
                   headers: w,
-                  cookieHeaderKeys: $,
+                  cookieHeaderKeys: _,
                   data: R,
                   size: b.byteLength,
                   duration: Date.now() - u,
                   method: n.method,
                   status: e.status,
-                  path: y
+                  path: l
                 }
               }
             ];
@@ -182,7 +184,7 @@ const T = "YOUR_SECRET_TOKEN", ee = ({
             return i == null || i.emit("abort"), [B(e, v.REQUEST_FAILED), null];
           }
         },
-        controller: E
+        controller: k
       }
     ];
   } catch (c) {
@@ -190,10 +192,10 @@ const T = "YOUR_SECRET_TOKEN", ee = ({
   }
 };
 export {
-  N as createFetchBody,
-  K as createFetchHeaders,
-  W as createFetchQueryParams,
-  ee as createRequestOperation,
-  H as decodeBuffer,
-  j as setRequestCookies
+  Y as createFetchBody,
+  W as createFetchHeaders,
+  j as createFetchQueryParams,
+  oe as createRequestOperation,
+  K as decodeBuffer,
+  N as setRequestCookies
 };