@scalar/api-client 2.2.31 → 2.2.32

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @scalar/api-client
 
+## 2.2.32
+
+### Patch Changes
+
+- d3199be: fix: duplicate query params
+
 ## 2.2.31
 
 ### Patch Changes

package/dist/libs/send-request/send-request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"send-request.d.ts","sourceRoot":"","sources":["../../../src/libs/send-request/send-request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,aAAa,EAAkB,MAAM,eAAe,CAAA;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAIhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAA;AAC/D,OAAO,KAAK;AACV,4DAA4D;AAC5D,OAAO,IAAI,UAAU,EACrB,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,MAAM,EACP,MAAM,iCAAiC,CAAA;AAWxC,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAA;AAGtD,sDAAsD;AACtD,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAapE;AAED,mDAAmD;AACnD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,EAC3C,GAAG,EAAE,MAAM,0BAgBZ;AAED,sDAAsD;AACtD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,EAC3C,GAAG,EAAE,MAAM,mBASZ;AAED,4EAA4E;AAC5E,wBAAgB,iBAAiB,CAAC,EAChC,OAAO,EACP,GAAG,EACH,aAAa,EACb,MAAM,EACN,QAAQ,GACT,EAAE;IACD,OAAO,EAAE,cAAc,CAAA;IACvB,GAAG,EAAE,MAAM,CAAA;IACX,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;;;;;;EA+DA;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,cAAc,EACvB,GAAG,EAAE,MAAM;;;;;;;;;EAgDZ;AAED,uGAAuG;AACvG,KAAK,mBAAmB,GAAG,OAAO,CAChC,aAAa,CAAC;IACZ,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,OAAO,EAAE,cAAc,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAC,CACH,CAAA;AAkBD,0BAA0B;AAC1B,eAAO,MAAM,sBAAsB,6HAUhC;IACD,OAAO,EAAE,UAAU,CAAA;IACnB,OAAO,EAAE,cAAc,CAAA;IACvB,0BAA0B,CAAC,EAAE,MAAM,EAAE,CAAA;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;IAChC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IAC/C,aAAa,EAAE,MAAM,EAAE,CAAA;CACxB,KAAG,aAAa,CAAC;IAChB,UAAU,EAAE,eAAe,CAAA;IAC3B,WAAW,EAAE,MAAM,mBAAmB,CAAA;IACtC,OAAO,EAAE,OAAO,CAAA;CACjB,CA2MA,CAAA"}
+{"version":3,"file":"send-request.d.ts","sourceRoot":"","sources":["../../../src/libs/send-request/send-request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,aAAa,EAAkB,MAAM,eAAe,CAAA;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAIhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAA;AAC/D,OAAO,KAAK;AACV,4DAA4D;AAC5D,OAAO,IAAI,UAAU,EACrB,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,MAAM,EACP,MAAM,iCAAiC,CAAA;AAWxC,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAA;AAGtD,sDAAsD;AACtD,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAapE;AAED,mDAAmD;AACnD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,EAC3C,GAAG,EAAE,MAAM,0BAgBZ;AAED,sDAAsD;AACtD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,EAC3C,GAAG,EAAE,MAAM,mBASZ;AAED,4EAA4E;AAC5E,wBAAgB,iBAAiB,CAAC,EAChC,OAAO,EACP,GAAG,EACH,aAAa,EACb,MAAM,EACN,QAAQ,GACT,EAAE;IACD,OAAO,EAAE,cAAc,CAAA;IACvB,GAAG,EAAE,MAAM,CAAA;IACX,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;;;;;;EA+DA;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,cAAc,EACvB,GAAG,EAAE,MAAM;;;;;;;;;EAgDZ;AAED,uGAAuG;AACvG,KAAK,mBAAmB,GAAG,OAAO,CAChC,aAAa,CAAC;IACZ,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,OAAO,EAAE,cAAc,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAC,CACH,CAAA;AAkBD,0BAA0B;AAC1B,eAAO,MAAM,sBAAsB,6HAUhC;IACD,OAAO,EAAE,UAAU,CAAA;IACnB,OAAO,EAAE,cAAc,CAAA;IACvB,0BAA0B,CAAC,EAAE,MAAM,EAAE,CAAA;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;IAChC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IAC/C,aAAa,EAAE,MAAM,EAAE,CAAA;CACxB,KAAG,aAAa,CAAC;IAChB,UAAU,EAAE,eAAe,CAAA;IAC3B,WAAW,EAAE,MAAM,mBAAmB,CAAA;IACtC,OAAO,EAAE,OAAO,CAAA;CACjB,CA6MA,CAAA"}

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

@@ -1,31 +1,31 @@
-import { ERRORS as v, normalizeError as B } from "../errors.js";
+import { ERRORS as B, normalizeError as C } from "../errors.js";
 import { normalizeHeaders as $ } from "../normalize-headers.js";
 import { replaceTemplateVariables as f } from "../string-template.js";
-import { canMethodHaveBody as q, isRelativePath as C, concatenateUrlAndPath as F, shouldUseProxy as U, REGEX as H } from "@scalar/oas-utils/helpers";
+import { canMethodHaveBody as q, isRelativePath as U, concatenateUrlAndPath as F, shouldUseProxy as O, 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 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, t) {
+  const o = new M(t);
+  return z.includes(o.essence) ? new TextDecoder(o.parameters.get("charset")).decode(n) : new Blob([n], { type: o.essence });
 }
-function W(n, o) {
-  const t = {};
+function W(n, t) {
+  const o = {};
   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;
+    r.enabled && (h !== "content-type" || r.value !== "multipart/form-data") && (o[h] = f(r.value, t));
+  }), o;
 }
-function j(n, o) {
-  const t = new URLSearchParams();
+function j(n, t) {
+  const o = new URLSearchParams();
   return n.parameters.query.forEach((r) => {
-    r.enabled && t.append(r.key, f(r.value ?? "", o));
-  }), t;
+    r.enabled && o.append(r.key, f(r.value ?? "", t));
+  }), o;
 }
 function N({
   example: n,
-  env: o,
-  globalCookies: t,
+  env: t,
+  globalCookies: o,
   domain: r,
   proxyUrl: h
 }) {
@@ -44,11 +44,11 @@ function N({
     secure: !0
   }, 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 l;
+    a.enabled && g.set(a.key, f(a.value, t));
+  }), o.forEach((a) => {
+    var b;
     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, {
+    (p.domain === r || ((b = p.domain) == null ? void 0 : b.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,22 +61,22 @@ function N({
     cookieParams: i
   };
 }
-function Y(n, o, t) {
+function Y(n, t, o) {
   var r, h, m;
   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", y = o.body.formData.encoding === "form-data" ? new FormData() : new URLSearchParams();
-    return o.body.formData.value.forEach((a) => {
-      !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)));
+  if (t.body.activeBody === "formData" && t.body.formData) {
+    const i = t.body.formData.encoding === "form-data" ? "multipart/form-data" : "application/x-www-form-urlencoded", y = t.body.formData.encoding === "form-data" ? new FormData() : new URLSearchParams();
+    return t.body.formData.value.forEach((a) => {
+      !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, o)));
     }), { body: y, contentType: i };
   }
-  return o.body.activeBody === "raw" ? {
-    body: f(((r = o.body.raw) == null ? void 0 : r.value) ?? "", t),
-    contentType: (h = o.body.raw) == null ? void 0 : h.encoding
-  } : o.body.activeBody === "binary" ? {
-    body: o.body.binary,
-    contentType: (m = o.body.binary) == null ? void 0 : m.type
+  return t.body.activeBody === "raw" ? {
+    body: f(((r = t.body.raw) == null ? void 0 : r.value) ?? "", o),
+    contentType: (h = t.body.raw) == null ? void 0 : h.encoding
+  } : t.body.activeBody === "binary" ? {
+    body: t.body.binary,
+    contentType: (m = t.body.binary) == null ? void 0 : m.type
   } : {
     body: void 0,
     contentType: void 0
@@ -87,8 +87,8 @@ function Q(n) {
 }
 const T = "YOUR_SECRET_TOKEN", oe = ({
   request: n,
-  example: o,
-  server: t,
+  example: t,
+  server: o,
   securitySchemes: r,
   selectedSecuritySchemeUids: h = [],
   proxyUrl: m,
@@ -97,53 +97,51 @@ const T = "YOUR_SECRET_TOKEN", oe = ({
   globalCookies: a
 }) => {
   try {
-    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, {
+    const c = y ?? {}, k = new AbortController(), p = t.parameters.path.reduce((u, e) => (e.enabled && (u[e.key] = f(e.value, c)), u), {}), D = f((o == null ? void 0 : o.url) ?? "", c), b = f(n.path, p);
+    let s = D || b;
+    if (!s) throw B.URL_EMPTY;
+    Object.entries((o == null ? void 0 : o.variables) ?? {}).forEach(([u, e]) => {
+      s = f(s, {
         [u]: p[u] || e.default
       });
     });
-    const D = j(o, c), E = W(o, c), { body: O } = Y(n.method, o, c);
+    const P = j(t, c), E = W(t, c), { body: v } = Y(n.method, t, c);
     if (N({
-      example: o,
+      example: t,
       env: c,
       globalCookies: a,
-      domain: d,
+      domain: s,
       proxyUrl: m
     }), h == null || h.forEach((u) => {
-      var w;
+      var R;
       const e = r[u];
       if (e) {
         if (e.type === "apiKey") {
-          const s = f(e.value, c) || T;
-          e.in === "header" && (E[e.name] = s), e.in === "query" && D.append(e.name, s), e.in === "cookie" && g.set(e.name, s);
+          const d = f(e.value, c) || T;
+          e.in === "header" && (E[e.name] = d), e.in === "query" && P.append(e.name, d), e.in === "cookie" && g.set(e.name, d);
         }
         if (e.type === "http")
           if (e.scheme === "basic") {
-            const s = f(e.username, c), b = f(e.password, c), R = `${s}:${b}`;
-            E.Authorization = `Basic ${R === ":" ? "username:password" : btoa(R)}`;
+            const d = f(e.username, c), l = f(e.password, c), w = `${d}:${l}`;
+            E.Authorization = `Basic ${w === ":" ? "username:password" : btoa(w)}`;
           } else {
-            const s = f(e.token, c);
-            E.Authorization = `Bearer ${s || T}`;
+            const d = f(e.token, c);
+            E.Authorization = `Bearer ${d || T}`;
           }
         if (e.type === "oauth2") {
-          const b = (w = Object.values(e.flows).find((R) => R.token)) == null ? void 0 : w.token;
-          E.Authorization = `Bearer ${b || T}`;
+          const l = (R = Object.values(e.flows).find((w) => w.token)) == null ? void 0 : R.token;
+          E.Authorization = `Bearer ${l || T}`;
         }
       }
-    }), d && (!C(d) || typeof window < "u")) {
-      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();
+    }), s && (!U(s) || typeof window < "u")) {
+      const u = U(s) ? F(window.location.origin, s) : Q(s), e = new URL(u), R = new URL(b, e.origin), d = b.split("?")[0] ?? "", l = new URL(e);
+      o != null && o.url && (e.pathname === "/" ? l.pathname = d : l.pathname = e.pathname + d);
+      const w = o != null && o.url ? [...e.searchParams, ...R.searchParams, ...P] : [...R.searchParams, ...P];
+      l.search = new URLSearchParams(w).toString(), s = l.toString();
     }
-    const S = new URLSearchParams([["scalar_url", d.toString()]]), A = U(m, d) ? `${m}?${S.toString()}` : d, L = new Request(A, {
+    const S = new URLSearchParams([["scalar_url", s.toString()]]), A = O(m, s) ? `${m}?${S.toString()}` : s, L = new Request(A, {
       method: n.method.toUpperCase(),
-      body: O,
+      body: v,
       headers: E
     });
     return [
@@ -158,37 +156,37 @@ const T = "YOUR_SECRET_TOKEN", oe = ({
               signal: k.signal
             });
             i == null || i.emit("stop");
-            const w = $(
+            const R = $(
               e.headers,
-              U(m, d)
-            ), 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() : [];
+              O(m, s)
+            ), d = e.headers.get("content-type") ?? "text/plain;charset=UTF-8", l = await e.arrayBuffer(), w = K(l, d), _ = "getSetCookie" in e.headers && typeof e.headers.getSetCookie == "function" ? e.headers.getSetCookie() : [];
             return [
               null,
               {
                 timestamp: Date.now(),
-                request: o,
+                request: t,
                 response: {
                   ...e,
-                  headers: w,
+                  headers: R,
                   cookieHeaderKeys: _,
-                  data: R,
-                  size: b.byteLength,
+                  data: w,
+                  size: l.byteLength,
                   duration: Date.now() - u,
                   method: n.method,
                   status: e.status,
-                  path: l
+                  path: b
                 }
               }
             ];
           } catch (e) {
-            return i == null || i.emit("abort"), [B(e, v.REQUEST_FAILED), null];
+            return i == null || i.emit("abort"), [C(e, B.REQUEST_FAILED), null];
           }
         },
         controller: k
       }
     ];
   } catch (c) {
-    return console.error(c), i == null || i.emit("abort"), [B(c), null];
+    return console.error(c), i == null || i.emit("abort"), [C(c), null];
   }
 };
 export {

package/dist/views/Request/ResponseSection/ResponseEmpty.vue2.js

@@ -17,7 +17,7 @@ const K = { class: "relative col-1 flex-center gap-6 p-2 capitalize" }, A = {
       a.commandPalette.emit({ commandName: "Create Request" });
     }, y = (i) => {
       i != null && i.createNew && v.name === "request" && f();
-    }, h = "2.2.31";
+    }, h = "2.2.32";
     return R(() => a.hotKeys.on(y)), C(() => a.hotKeys.off(y)), (i, e) => (r(), l("div", K, [
       o("div", {
         class: k(["flex h-[calc(100%_-_50px)] flex-col items-center justify-center", {

package/package.json

@@ -18,7 +18,7 @@
     "rest",
     "testing"
   ],
-  "version": "2.2.31",
+  "version": "2.2.32",
   "engines": {
     "node": ">=18"
   },
@@ -179,21 +179,21 @@
     "whatwg-mimetype": "^4.0.0",
     "yaml": "^2.4.5",
     "zod": "^3.23.8",
-    "@scalar/components": "0.13.13",
-    "@scalar/draggable": "0.1.8",
     "@scalar/icons": "0.1.2",
     "@scalar/import": "0.2.16",
-    "@scalar/oas-utils": "0.2.96",
     "@scalar/object-utils": "1.1.12",
-    "@scalar/openapi-types": "0.1.5",
+    "@scalar/oas-utils": "0.2.96",
     "@scalar/openapi-parser": "0.10.3",
-    "@scalar/themes": "0.9.59",
+    "@scalar/openapi-types": "0.1.5",
     "@scalar/postman-to-openapi": "0.1.19",
+    "@scalar/themes": "0.9.59",
+    "@scalar/use-codemirror": "0.11.57",
     "@scalar/types": "0.0.25",
+    "@scalar/components": "0.13.13",
     "@scalar/use-hooks": "0.1.13",
-    "@scalar/use-codemirror": "0.11.57",
+    "@scalar/use-tooltip": "1.0.5",
     "@scalar/use-toasts": "0.7.8",
-    "@scalar/use-tooltip": "1.0.5"
+    "@scalar/draggable": "0.1.8"
   },
   "devDependencies": {
     "@types/js-cookie": "^3.0.6",