@scalar/api-client 2.5.18 → 2.5.20

package/dist/views/Request/libs/oauth2.js

@@ -2,98 +2,98 @@ import { shouldUseProxy as S } from "@scalar/oas-utils/helpers";
 const k = () => {
   const e = new Uint8Array(32);
   return crypto.getRandomValues(e), btoa(String.fromCharCode(...e)).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
-}, w = async (e, d) => {
-  if (d === "plain")
+}, C = async (e, l) => {
+  if (l === "plain")
     return e;
-  const s = new TextEncoder().encode(e), c = await crypto.subtle.digest("SHA-256", s);
-  return btoa(String.fromCharCode(...new Uint8Array(c))).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}, U = async (e, d, u) => {
+  const n = new TextEncoder().encode(e), i = await crypto.subtle.digest("SHA-256", n);
+  return btoa(String.fromCharCode(...new Uint8Array(i))).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+}, b = async (e, l, u) => {
   try {
     if (!e)
       return [new Error("Flow not found"), null];
-    const s = e.selectedScopes.join(" ");
+    const n = e.selectedScopes.join(" ");
     if (e.type === "clientCredentials" || e.type === "password")
-      return x(e, s, {
+      return P(e, n, {
         proxyUrl: u
       });
-    const c = (Math.random() + 1).toString(36).substring(2, 10), t = new URL(e.authorizationUrl);
-    let i = null;
+    const i = (Math.random() + 1).toString(36).substring(2, 10), t = new URL(e.authorizationUrl);
+    let m = null;
     if (e.type === "implicit")
       t.searchParams.set("response_type", "token");
     else if (e.type === "authorizationCode" && (t.searchParams.set("response_type", "code"), e["x-usePkce"] !== "no")) {
-      const r = k(), a = await w(r, e["x-usePkce"]);
-      i = {
+      const r = k(), s = await C(r, e["x-usePkce"]);
+      m = {
         codeVerifier: r,
-        codeChallenge: a,
+        codeChallenge: s,
         codeChallengeMethod: e["x-usePkce"] === "SHA-256" ? "S256" : "plain"
-      }, t.searchParams.set("code_challenge", a), t.searchParams.set("code_challenge_method", i.codeChallengeMethod);
+      }, t.searchParams.set("code_challenge", s), t.searchParams.set("code_challenge_method", m.codeChallengeMethod);
     }
     if (e["x-scalar-redirect-uri"].startsWith("/")) {
-      const r = d.url || window.location.origin + window.location.pathname, a = new URL(e["x-scalar-redirect-uri"], r).toString();
-      t.searchParams.set("redirect_uri", a);
+      const r = l.url || window.location.origin + window.location.pathname, s = new URL(e["x-scalar-redirect-uri"], r).toString();
+      t.searchParams.set("redirect_uri", s);
     } else
       t.searchParams.set("redirect_uri", e["x-scalar-redirect-uri"]);
     e["x-scalar-security-query"] && Object.keys(e["x-scalar-security-query"]).forEach((r) => {
-      var n;
-      const a = (n = e["x-scalar-security-query"]) == null ? void 0 : n[r];
-      a && t.searchParams.set(r, a);
-    }), t.searchParams.set("client_id", e["x-scalar-client-id"]), t.searchParams.set("state", c), s && t.searchParams.set("scope", s);
-    const o = window.open(t, "openAuth2Window", "left=100,top=100,width=800,height=600");
-    return o ? new Promise((r) => {
-      const a = setInterval(() => {
+      var c;
+      const s = (c = e["x-scalar-security-query"]) == null ? void 0 : c[r];
+      s && t.searchParams.set(r, s);
+    }), t.searchParams.set("client_id", e["x-scalar-client-id"]), t.searchParams.set("state", i), n && t.searchParams.set("scope", n);
+    const a = window.open(t, "openAuth2Window", "left=100,top=100,width=800,height=600");
+    return a ? new Promise((r) => {
+      const s = setInterval(() => {
         var _;
-        let n = null, p = null, m = null, g = null;
+        let c = null, d = null, h = null, g = null;
         try {
-          const l = new URL(o.location.href).searchParams, P = e["x-tokenName"] || "access_token";
-          n = l.get(P), p = l.get("code"), m = l.get("error"), g = l.get("error_description");
-          const y = new URLSearchParams(o.location.href.split("#")[1]);
-          n || (n = y.get(P)), p || (p = y.get("code")), m || (m = y.get("error")), g || (g = y.get("error_description"));
+          const o = new URL(a.location.href).searchParams, x = e["x-tokenName"] || "access_token";
+          c = o.get(x), d = o.get("code"), h = o.get("error"), g = o.get("error_description");
+          const y = new URLSearchParams(a.location.href.split("#")[1]);
+          c || (c = y.get(x)), d || (d = y.get("code")), h || (h = y.get("error")), g || (g = y.get("error_description"));
         } catch {
         }
-        if (o.closed || n || p || m)
-          if (clearInterval(a), o.close(), m)
-            r([new Error(`OAuth error: ${m}${g ? ` (${g})` : ""}`), null]);
-          else if (n) {
-            const l = (_ = o.location.href.match(/state=([^&]*)/)) == null ? void 0 : _[1];
-            r(l === c ? [null, n] : [new Error("State mismatch"), null]);
-          } else p ? new URL(o.location.href).searchParams.get("state") === c ? x(e, s, {
-            code: p,
-            pkce: i,
+        if (a.closed || c || d || h)
+          if (clearInterval(s), a.close(), h)
+            r([new Error(`OAuth error: ${h}${g ? ` (${g})` : ""}`), null]);
+          else if (c) {
+            const o = (_ = a.location.href.match(/state=([^&]*)/)) == null ? void 0 : _[1];
+            r(o === i ? [null, c] : [new Error("State mismatch"), null]);
+          } else d ? new URL(a.location.href).searchParams.get("state") === i ? P(e, n, {
+            code: d,
+            pkce: m,
             proxyUrl: u
-          }).then(r) : r([new Error("State mismatch"), null]) : (clearInterval(a), r([new Error("Window was closed without granting authorization"), null]));
+          }).then(r) : r([new Error("State mismatch"), null]) : (clearInterval(s), r([new Error("Window was closed without granting authorization"), null]));
       }, 200);
     }) : [new Error("Failed to open auth window"), null];
   } catch {
     return [new Error("Failed to authorize oauth2 flow"), null];
   }
-}, x = async (e, d, {
+}, P = async (e, l, {
   code: u,
-  pkce: s,
-  proxyUrl: c
+  pkce: n,
+  proxyUrl: i
 } = {}) => {
   if (!e)
     return [new Error("OAuth2 flow was not defined"), null];
   const t = new URLSearchParams();
-  t.set("client_id", e["x-scalar-client-id"]), d && (e.type === "clientCredentials" || e.type === "password") && t.set("scope", d), e.clientSecret && t.set("client_secret", e.clientSecret), "x-scalar-redirect-uri" in e && e["x-scalar-redirect-uri"] && t.set("redirect_uri", e["x-scalar-redirect-uri"]), u ? (t.set("code", u), t.set("grant_type", "authorization_code"), s && t.set("code_verifier", s.codeVerifier)) : e.type === "password" ? (t.set("grant_type", "password"), t.set("username", e.username), t.set("password", e.password)) : t.set("grant_type", "client_credentials"), e["x-scalar-security-body"] && Object.entries(e["x-scalar-security-body"]).forEach(([i, h]) => {
-    h && t.set(i, h);
+  t.set("client_id", e["x-scalar-client-id"]), l && (e.type === "clientCredentials" || e.type === "password") && t.set("scope", l), e.clientSecret && (!e["x-scalar-credentials-location"] || e["x-scalar-credentials-location"] === "body") && t.set("client_secret", e.clientSecret), "x-scalar-redirect-uri" in e && e["x-scalar-redirect-uri"] && t.set("redirect_uri", e["x-scalar-redirect-uri"]), u ? (t.set("code", u), t.set("grant_type", "authorization_code"), n && t.set("code_verifier", n.codeVerifier)) : e.type === "password" ? (t.set("grant_type", "password"), t.set("username", e.username), t.set("password", e.password)) : t.set("grant_type", "client_credentials"), e["x-scalar-security-body"] && Object.entries(e["x-scalar-security-body"]).forEach(([p, a]) => {
+    a && t.set(p, a);
   });
   try {
-    const i = {
+    const p = {
       "Content-Type": "application/x-www-form-urlencoded"
     };
-    e.clientSecret && (i.Authorization = `Basic ${btoa(`${e["x-scalar-client-id"]}:${e.clientSecret}`)}`);
-    const h = S(c, e.tokenUrl) ? `${c}?${new URLSearchParams([["scalar_url", e.tokenUrl]]).toString()}` : e.tokenUrl, r = await (await fetch(h, {
+    e.clientSecret && (!e["x-scalar-credentials-location"] || e["x-scalar-credentials-location"] === "header") && (p.Authorization = `Basic ${btoa(`${e["x-scalar-client-id"]}:${e.clientSecret}`)}`);
+    const r = S(i, e.tokenUrl) ? `${i}?${new URLSearchParams([["scalar_url", e.tokenUrl]]).toString()}` : e.tokenUrl, c = await (await fetch(r, {
       method: "POST",
-      headers: i,
+      headers: p,
       body: t
-    })).json(), a = e["x-tokenName"] || "access_token";
-    return [null, r[a]];
+    })).json(), d = e["x-tokenName"] || "access_token";
+    return [null, c[d]];
   } catch {
     return [new Error("Failed to get an access token. Please check your credentials."), null];
   }
 };
 export {
-  U as authorizeOauth2,
-  x as authorizeServers,
-  w as generateCodeChallenge
+  b as authorizeOauth2,
+  P as authorizeServers,
+  C as generateCodeChallenge
 };

package/dist/views/Request/libs/watch-mode.d.ts

@@ -1,5 +1,5 @@
-import type { WorkspaceStore } from '../../../store';
-import type { ActiveEntitiesStore } from '../../../store/active-entities';
+import type { WorkspaceStore } from '../../../store/index.js';
+import type { ActiveEntitiesStore } from '../../../store/active-entities.js';
 import { type Path, type PathValue } from '@scalar/object-utils/nested';
 import { type Difference } from 'microdiff';
 import { type ZodSchema, type ZodTypeDef } from 'zod';

package/dist/vitest.setup.d.ts

@@ -1,12 +1,26 @@
-import { useLayout } from './hooks/useLayout';
-import { useSidebar } from './hooks/useSidebar';
-import { type Mock } from 'vitest';
-export declare const mockUseLayout: Mock<[], ReturnType<typeof useLayout>>;
-export declare const mockUseSidebar: Mock<[], ReturnType<typeof useSidebar>>;
+export declare const mockUseLayout: () => {
+    layout: import("./hooks/useLayout.js").ClientLayout;
+};
+export declare const mockUseSidebar: () => {
+    collapsedSidebarFolders: {
+        readonly [x: string]: boolean;
+    };
+    isSidebarOpen: Readonly<import("vue").Ref<boolean, boolean>>;
+    setCollapsedSidebarFolder: (uid: string, value: boolean) => boolean;
+    toggleSidebarFolder: (key: string) => boolean;
+    setSidebarOpen: (value: boolean) => boolean;
+    toggleSidebarOpen: () => boolean;
+};
 /** Spy on console.warn */
-export declare const consoleWarnSpy: import("vitest").MockInstance<[message?: any, ...optionalParams: any[]], void>;
+export declare const consoleWarnSpy: import("vitest").MockInstance<{
+    (...data: any[]): void;
+    (message?: any, ...optionalParams: any[]): void;
+}>;
 /** Spy on console.error */
-export declare const consoleErrorSpy: import("vitest").MockInstance<[message?: any, ...optionalParams: any[]], void>;
+export declare const consoleErrorSpy: import("vitest").MockInstance<{
+    (...data: any[]): void;
+    (message?: any, ...optionalParams: any[]): void;
+}>;
 /** Reset the spies */
 export declare const resetConsoleSpies: () => void;
 /** Helper to re-enable console warn checks */

package/dist/vitest.setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vitest.setup.d.ts","sourceRoot":"","sources":["../src/vitest.setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAqC,KAAK,IAAI,EAAE,MAAM,QAAQ,CAAA;AAOrE,eAAO,MAAM,aAAa,EAAgB,IAAI,CAAC,EAAE,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAA;AAMhF,eAAO,MAAM,cAAc,EAAiB,IAAI,CAAC,EAAE,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAA;AAEnF,0BAA0B;AAC1B,eAAO,MAAM,cAAc,gFAA4B,CAAA;AAGvD,2BAA2B;AAC3B,eAAO,MAAM,eAAe,gFAA6B,CAAA;AAGzD,sBAAsB;AACtB,eAAO,MAAM,iBAAiB,YAG7B,CAAA;AAED,8CAA8C;AAC9C,eAAO,MAAM,iBAAiB,eAAsC,CAAA;AAEpE,4CAA4C;AAC5C,eAAO,MAAM,kBAAkB,eAAuC,CAAA;AAEtE,4CAA4C;AAC5C,eAAO,MAAM,kBAAkB,eAAuC,CAAA;AAEtE,6CAA6C;AAC7C,eAAO,MAAM,mBAAmB,eAAwC,CAAA"}
+{"version":3,"file":"vitest.setup.d.ts","sourceRoot":"","sources":["../src/vitest.setup.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,aAAa;;CAAY,CAAA;AAMtC,eAAO,MAAM,cAAc;;;;;;;;;CAAa,CAAA;AAExC,0BAA0B;AAC1B,eAAO,MAAM,cAAc;;;EAA4B,CAAA;AAGvD,2BAA2B;AAC3B,eAAO,MAAM,eAAe;;;EAA6B,CAAA;AAGzD,sBAAsB;AACtB,eAAO,MAAM,iBAAiB,YAG7B,CAAA;AAED,8CAA8C;AAC9C,eAAO,MAAM,iBAAiB,eAAsC,CAAA;AAEpE,4CAA4C;AAC5C,eAAO,MAAM,kBAAkB,eAAuC,CAAA;AAEtE,4CAA4C;AAC5C,eAAO,MAAM,kBAAkB,eAAuC,CAAA;AAEtE,6CAA6C;AAC7C,eAAO,MAAM,mBAAmB,eAAwC,CAAA"}

package/package.json

@@ -18,7 +18,7 @@
     "rest",
     "testing"
   ],
-  "version": "2.5.18",
+  "version": "2.5.20",
   "engines": {
     "node": ">=20"
   },
@@ -190,7 +190,7 @@
     "@headlessui/tailwindcss": "^0.2.2",
     "@headlessui/vue": "^1.7.23",
     "@types/har-format": "^1.2.15",
-    "@vueuse/core": "^10.10.0",
+    "@vueuse/core": "^11.2.0",
     "@vueuse/integrations": "^11.2.0",
     "focus-trap": "^7",
     "fuse.js": "^7.1.0",
@@ -205,37 +205,37 @@
     "whatwg-mimetype": "^4.0.0",
     "yaml": "2.8.0",
     "zod": "3.24.1",
-    "@scalar/draggable": "0.2.0",
-    "@scalar/components": "0.14.19",
+    "@scalar/components": "0.14.21",
     "@scalar/icons": "0.4.6",
-    "@scalar/helpers": "0.0.6",
-    "@scalar/import": "0.4.13",
-    "@scalar/oas-utils": "0.4.14",
-    "@scalar/object-utils": "1.2.2",
-    "@scalar/openapi-parser": "0.18.1",
-    "@scalar/openapi-types": "0.3.6",
-    "@scalar/postman-to-openapi": "0.3.17",
-    "@scalar/themes": "0.13.10",
-    "@scalar/types": "0.2.9",
-    "@scalar/use-codemirror": "0.12.20",
+    "@scalar/draggable": "0.2.0",
+    "@scalar/import": "0.4.15",
+    "@scalar/oas-utils": "0.4.16",
+    "@scalar/object-utils": "1.2.3",
+    "@scalar/openapi-parser": "0.18.3",
+    "@scalar/helpers": "0.0.7",
+    "@scalar/openapi-types": "0.3.7",
+    "@scalar/postman-to-openapi": "0.3.19",
+    "@scalar/snippetz": "0.4.4",
+    "@scalar/themes": "0.13.12",
+    "@scalar/types": "0.2.11",
+    "@scalar/use-codemirror": "0.12.22",
     "@scalar/use-hooks": "0.2.4",
-    "@scalar/use-tooltip": "1.1.0",
     "@scalar/use-toasts": "0.8.0",
-    "@scalar/snippetz": "0.4.2"
+    "@scalar/use-tooltip": "1.1.0"
   },
   "devDependencies": {
     "@tailwindcss/vite": "^4.1.7",
     "@types/shell-quote": "^1.7.5",
     "@types/whatwg-mimetype": "^3.0.2",
-    "@vitejs/plugin-vue": "^5.0.4",
+    "@vitejs/plugin-vue": "^5.2.4",
     "@vue/test-utils": "^2.4.1",
     "jsdom": "^22.1.0",
     "tailwindcss": "^4.1.7",
-    "vite": "5.4.19",
+    "vite": "6.1.6",
     "vite-svg-loader": "^5.1.0",
-    "vitest": "^1.6.1",
-    "@scalar/build-tooling": "0.2.4",
-    "@scalar/galaxy": "0.5.4"
+    "vitest": "^3.2.4",
+    "@scalar/galaxy": "0.5.5",
+    "@scalar/build-tooling": "0.2.4"
   },
   "scripts": {
     "build": "scalar-build-vite",