@scalar/api-client 2.1.50 → 2.1.52

package/dist/libs/send-request.js

@@ -1,190 +1,193 @@
 import { ERRORS as B, normalizeError as C } from "./errors.js";
 import { normalizeHeaders as H } from "./normalize-headers.js";
-import { replaceTemplateVariables as f } from "./string-template.js";
-import { canMethodHaveBody as q, isRelativePath as S, shouldUseProxy as A } from "@scalar/oas-utils/helpers";
+import { replaceTemplateVariables as h } from "./string-template.js";
+import { canMethodHaveBody as q, isRelativePath as A, concatenateUrlAndPath as K, shouldUseProxy as S } from "@scalar/oas-utils/helpers";
 import g from "js-cookie";
-import K from "whatwg-mimetype";
+import W from "whatwg-mimetype";
 import { textMediaTypes as _ } from "../views/Request/consts/mediaTypes.js";
-function j(c, t) {
-  const n = new K(t);
-  return _.includes(n.essence) ? new TextDecoder(n.parameters.get("charset")).decode(c) : new Blob([c], { type: n.essence });
+function j(a, o) {
+  const n = new W(o);
+  return _.includes(n.essence) ? new TextDecoder(n.parameters.get("charset")).decode(a) : new Blob([a], { type: n.essence });
 }
-function Q(c, t) {
+function Q(a, o) {
   const n = {};
-  return c.parameters.headers.forEach((e) => {
-    const p = e.key.trim().toLowerCase();
-    e.enabled && (p !== "content-type" || e.value !== "multipart/form-data") && (n[p] = f(e.value, t));
+  return a.parameters.headers.forEach((e) => {
+    const m = e.key.trim().toLowerCase();
+    e.enabled && (m !== "content-type" || e.value !== "multipart/form-data") && (n[m] = h(e.value, o));
   }), n;
 }
-function V(c, t) {
+function V(a, o) {
   const n = new URLSearchParams();
-  return c.parameters.query.forEach((e) => {
-    e.enabled && e.value && n.append(e.key, f(e.value, t));
+  return a.parameters.query.forEach((e) => {
+    e.enabled && e.value && n.append(e.key, h(e.value, o));
   }), n;
 }
-function W({
-  example: c,
-  env: t,
+function I({
+  example: a,
+  env: o,
   globalCookies: n,
   domain: e,
-  proxy: p
+  proxy: m
 }) {
-  let h;
+  let f;
   try {
-    h = new URL(p || e).host;
+    f = new URL(m || e).host;
   } catch {
-    typeof window < "u" && (h = window.location.host);
+    typeof window < "u" && (f = window.location.host);
   }
-  const u = {
+  const l = {
     // Must point all cookies to the proxy and let it sort them out
-    domain: h,
+    domain: f,
     // Means that the browser sends the cookie with both cross-site and same-site requests.
     sameSite: "None",
     // The Secure attribute must also be set when setting SameSite=None.
     secure: !0
-  }, r = g.get();
-  return Object.keys(r).forEach((a) => g.remove(a)), c.parameters.cookies.forEach((a) => {
-    a.enabled && g.set(a.key, f(a.value, t));
-  }), n.forEach((a) => {
+  }, i = g.get();
+  return Object.keys(i).forEach((r) => g.remove(r)), a.parameters.cookies.forEach((r) => {
+    r.enabled && g.set(r.key, h(r.value, o));
+  }), n.forEach((r) => {
     var R;
-    const { name: v, value: s, ...m } = a;
-    (m.domain === e || ((R = m.domain) == null ? void 0 : R.startsWith(".")) && e.endsWith(m.domain ?? "")) && g.set(v, s, {
+    const { name: P, value: s, ...p } = r;
+    (p.domain === e || ((R = p.domain) == null ? void 0 : R.startsWith(".")) && e.endsWith(p.domain ?? "")) && g.set(P, s, {
       /** Override the domain with the proxy value */
-      domain: h,
+      domain: f,
       // TODO: path cookies probably don't worth with the proxy
-      path: m.path,
-      expires: m.expires ? new Date(m.expires) : void 0,
-      httpOnly: m.httpOnly,
-      secure: m.secure
+      path: p.path,
+      expires: p.expires ? new Date(p.expires) : void 0,
+      httpOnly: p.httpOnly,
+      secure: p.secure
     });
   }), {
-    cookieParams: u
+    cookieParams: l
   };
 }
-function I(c, t, n) {
-  var e, p, h;
-  if (!q(c))
+function N(a, o, n) {
+  var e, m, f;
+  if (!q(a))
     return { body: void 0, contentType: void 0 };
-  if (t.body.activeBody === "formData" && t.body.formData) {
-    const u = t.body.formData.encoding === "form-data" ? "multipart/form-data" : "application/x-www-form-urlencoded", r = t.body.formData.encoding === "form-data" ? new FormData() : new URLSearchParams();
-    return t.body.formData.value.forEach((a) => {
-      !a.enabled || !a.key || (a.file && r instanceof FormData ? r.append(a.key, a.file, a.file.name) : a.value !== void 0 && r.append(a.key, f(a.value, n)));
-    }), { body: r, contentType: u };
+  if (o.body.activeBody === "formData" && o.body.formData) {
+    const l = o.body.formData.encoding === "form-data" ? "multipart/form-data" : "application/x-www-form-urlencoded", i = o.body.formData.encoding === "form-data" ? new FormData() : new URLSearchParams();
+    return o.body.formData.value.forEach((r) => {
+      !r.enabled || !r.key || (r.file && i instanceof FormData ? i.append(r.key, r.file, r.file.name) : r.value !== void 0 && i.append(r.key, h(r.value, n)));
+    }), { body: i, contentType: l };
   }
-  return t.body.activeBody === "raw" ? {
-    body: f(((e = t.body.raw) == null ? void 0 : e.value) ?? "", n),
-    contentType: (p = t.body.raw) == null ? void 0 : p.encoding
-  } : t.body.activeBody === "binary" ? {
-    body: t.body.binary,
-    contentType: (h = t.body.binary) == null ? void 0 : h.type
+  return o.body.activeBody === "raw" ? {
+    body: h(((e = o.body.raw) == null ? void 0 : e.value) ?? "", n),
+    contentType: (m = o.body.raw) == null ? void 0 : m.encoding
+  } : o.body.activeBody === "binary" ? {
+    body: o.body.binary,
+    contentType: (f = o.body.binary) == null ? void 0 : f.type
   } : {
     body: void 0,
     contentType: void 0
   };
 }
-const oe = ({
-  request: c,
-  auth: t,
+function Y(a) {
+  return a.startsWith("http://") || a.startsWith("https://") ? a : `http://${a}`;
+}
+const ne = ({
+  request: a,
+  auth: o,
   example: n,
   server: e,
-  securitySchemes: p,
-  selectedSecuritySchemeUids: h = [],
-  proxy: u,
-  status: r,
-  environment: a,
-  globalCookies: v
+  securitySchemes: m,
+  selectedSecuritySchemeUids: f = [],
+  proxy: l,
+  status: i,
+  environment: r,
+  globalCookies: P
 }) => {
   try {
-    const s = a ?? {}, m = new AbortController(), E = n.parameters.path.reduce((l, o) => (o.enabled && (l[o.key] = f(o.value, s)), l), {}), R = f((e == null ? void 0 : e.url) ?? "", s), w = f(c.path, E);
+    const s = r ?? {}, p = new AbortController(), T = n.parameters.path.reduce((u, t) => (t.enabled && (u[t.key] = h(t.value, s)), u), {}), R = h((e == null ? void 0 : e.url) ?? "", s), w = h(a.path, T);
     let d = R || w;
     if (!d) throw B.URL_EMPTY;
-    Object.entries((e == null ? void 0 : e.variables) ?? {}).forEach(([l, o]) => {
-      d = f(d, { [l]: o.default });
+    Object.entries((e == null ? void 0 : e.variables) ?? {}).forEach(([u, t]) => {
+      d = h(d, { [u]: t.default });
     });
-    const P = V(n, s), b = Q(n, s), { body: F } = I(c.method, n, s);
-    return W({
+    const E = V(n, s), b = Q(n, s), { body: $ } = N(a.method, n, s);
+    return I({
       example: n,
       env: s,
-      globalCookies: v,
+      globalCookies: P,
       domain: d,
-      proxy: u
-    }), h == null || h.forEach((l) => {
-      const o = t[l], y = p[l];
-      if (!(!o || !y)) {
-        if (y.type === "apiKey" && o.type === "apiKey") {
-          const i = f(o.value, s);
-          y.in === "header" && (b[o.name] = i), y.in === "query" && P.append(o.name, i), y.in === "cookie" && g.set(o.name, i);
+      proxy: l
+    }), f == null || f.forEach((u) => {
+      const t = o[u], y = m[u];
+      if (!(!t || !y)) {
+        if (y.type === "apiKey" && t.type === "apiKey") {
+          const c = h(t.value, s);
+          y.in === "header" && (b[t.name] = c), y.in === "query" && E.append(t.name, c), y.in === "cookie" && g.set(t.name, c);
         }
-        if (y.type === "http" && o.type === "http")
+        if (y.type === "http" && t.type === "http")
           if (y.scheme === "basic") {
-            const i = f(o.username, s), L = f(o.password, s), T = `${i}:${L}`;
-            b.Authorization = `Basic ${btoa(T)}`;
+            const c = h(t.username, s), v = h(t.password, s), L = `${c}:${v}`;
+            b.Authorization = `Basic ${btoa(L)}`;
           } else {
-            const i = f(o.token, s);
-            b.Authorization = `Bearer ${i}`;
+            const c = h(t.token, s);
+            b.Authorization = `Bearer ${c}`;
           }
-        y.type === "oauth2" && o.type.includes("oauth") && "token" in o && (o.token || console.error("OAuth token was not created"), b.Authorization = `Bearer ${o.token}`);
+        y.type === "oauth2" && t.type.includes("oauth") && "token" in t && (t.token || console.error("OAuth token was not created"), b.Authorization = `Bearer ${t.token}`);
       }
     }), [
       null,
       {
         sendRequest: async () => {
-          r == null || r.emit("start");
-          const l = Date.now();
+          i == null || i.emit("start");
+          const u = Date.now();
           try {
-            if (d && (!S(d) || typeof window < "u")) {
-              const z = S(d) ? window.location.origin + d : d, k = new URL(z), M = new URL(w, k.origin), D = new URL(k);
+            if (d && (!A(d) || typeof window < "u")) {
+              const z = A(d) ? K(window.location.origin, d) : Y(d), k = new URL(z), M = new URL(w, k.origin), D = new URL(k);
               e != null && e.url && (k.pathname === "/" ? D.pathname = w : D.pathname = k.pathname + w), D.search = new URLSearchParams([
                 ...k.searchParams,
                 ...M.searchParams,
-                ...P
+                ...E
               ]).toString(), d = D.toString();
             }
-            const o = new URLSearchParams([["scalar_url", d.toString()]]), y = A(u, d) ? `${u}?${o.toString()}` : d, i = await fetch(y, {
-              signal: m.signal,
-              method: c.method.toUpperCase(),
-              body: F,
+            const t = new URLSearchParams([["scalar_url", d.toString()]]), y = S(l, d) ? `${l}?${t.toString()}` : d, c = await fetch(y, {
+              signal: p.signal,
+              method: a.method.toUpperCase(),
+              body: $,
               headers: b
             });
-            r == null || r.emit("stop");
-            const L = H(
-              i.headers,
-              A(u, d)
-            ), T = i.headers.get("content-type") ?? "text/plain;charset=UTF-8", U = await i.arrayBuffer(), O = j(U, T), $ = "getSetCookie" in i.headers && typeof i.headers.getSetCookie == "function" ? i.headers.getSetCookie() : [];
+            i == null || i.emit("stop");
+            const v = H(
+              c.headers,
+              S(l, d)
+            ), L = c.headers.get("content-type") ?? "text/plain;charset=UTF-8", U = await c.arrayBuffer(), F = j(U, L), O = "getSetCookie" in c.headers && typeof c.headers.getSetCookie == "function" ? c.headers.getSetCookie() : [];
             return [
               null,
               {
                 timestamp: Date.now(),
                 request: n,
                 response: {
-                  ...i,
-                  headers: L,
-                  cookieHeaderKeys: $,
-                  data: O,
+                  ...c,
+                  headers: v,
+                  cookieHeaderKeys: O,
+                  data: F,
                   size: U.byteLength,
-                  duration: Date.now() - l,
-                  method: c.method,
-                  status: i.status,
+                  duration: Date.now() - u,
+                  method: a.method,
+                  status: c.status,
                   path: w
                 }
               }
             ];
-          } catch (o) {
-            return r == null || r.emit("abort"), [C(o, B.REQUEST_FAILED), null];
+          } catch (t) {
+            return i == null || i.emit("abort"), [C(t, B.REQUEST_FAILED), null];
           }
         },
-        controller: m
+        controller: p
       }
     ];
   } catch (s) {
-    return r == null || r.emit("abort"), [C(s), null];
+    return i == null || i.emit("abort"), [C(s), null];
   }
 };
 export {
-  I as createFetchBody,
+  N as createFetchBody,
   Q as createFetchHeaders,
   V as createFetchQueryParams,
-  oe as createRequestOperation,
+  ne as createRequestOperation,
   j as decodeBuffer,
-  W as setRequestCookies
+  I as setRequestCookies
 };

package/dist/libs/string-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"string-template.d.ts","sourceRoot":"","sources":["../../src/libs/string-template.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAQ5D;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,UAkBhB;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,sBAoBjD"}
+{"version":3,"file":"string-template.d.ts","sourceRoot":"","sources":["../../src/libs/string-template.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAQ5D;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,UAehB;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,sBAoBjD"}

package/dist/libs/string-template.js

@@ -1,30 +1,31 @@
-function l(n, a) {
-  const s = n.split(".").reduce(
-    (e, t) => e == null ? void 0 : e[t],
-    a
+import { REGEX as u } from "@scalar/oas-utils/helpers";
+function l(n, o) {
+  const t = n.split(".").reduce(
+    (e, c) => e == null ? void 0 : e[c],
+    o
   );
-  return typeof s == "string" ? s : JSON.stringify(s);
+  return typeof t == "string" ? t : JSON.stringify(t);
 }
-function u(n, a) {
-  const c = /{{\s*([^}\s]+?)\s*}}|{\s*([^}\s]+?)\s*}|:\b[\w.]+\b/g, s = n.match(c) ?? [];
-  let e = n;
-  return s.forEach((t) => {
-    const r = t.startsWith(":") ? t.slice(1) : t.replace(/[{}]/g, "").trim(), o = l(r, a);
-    o != null && (e = e.replaceAll(t, o));
-  }), e;
+function f(n, o) {
+  const r = n.match(u.TEMPLATE_VARIABLE) ?? [];
+  let t = n;
+  return r.forEach((e) => {
+    const c = e.startsWith(":") ? e.slice(1) : e.replace(/[{}]/g, "").trim(), s = l(c, o);
+    s != null && (t = t.replaceAll(e, s));
+  }), t;
 }
-function i(n) {
-  function a(c, s) {
-    const e = Object.keys(c), t = [];
-    return e.forEach((r) => {
-      const o = s ? `${s}.${r}` : r;
-      typeof c[r] == "object" ? t.push(...a(c[r], o)) : t.push([o, String(c[r])]);
-    }), t;
+function p(n) {
+  function o(r, t) {
+    const e = Object.keys(r), c = [];
+    return e.forEach((s) => {
+      const a = t ? `${t}.${s}` : s;
+      typeof r[s] == "object" ? c.push(...o(r[s], a)) : c.push([a, String(r[s])]);
+    }), c;
   }
-  return a(n);
+  return o(n);
 }
 export {
-  i as flattenEnvVars,
+  p as flattenEnvVars,
   l as getDotPathValue,
-  u as replaceTemplateVariables
+  f as replaceTemplateVariables
 };