@scalar/api-client 2.5.32 → 2.5.34

package/dist/views/Request/handle-drag.js

@@ -1,46 +1,42 @@
-import { useLayout as I } from "../../hooks/useLayout.js";
-function F(f, { collections: l, collectionMutators: a, tags: o, tagMutators: p, workspaceMutators: x }) {
-  const { layout: b } = I(), y = (i, r) => {
-    i.type === "collection" ? a.edit(i.uid, "children", r) : i.type === "tag" && p.edit(i.uid, "children", r);
+import { useLayout as v } from "../../hooks/useLayout.js";
+function I(f, { collections: n, collectionMutators: a, tags: o, tagMutators: p, workspaceMutators: x }) {
+  const { layout: D } = v(), y = (i, d) => {
+    i.type === "collection" ? a.edit(i.uid, "children", d) : i.type === "tag" && p.edit(i.uid, "children", d);
   };
   return {
-    handleDragEnd: (i, r) => {
-      var D, U, v, C;
-      if (!i || !r)
+    handleDragEnd: (i, d) => {
+      if (!i || !d)
         return;
-      const { id: n, parentId: d } = i, { id: u, parentId: s, offset: c } = r;
-      if (d ? l[d] ? a.edit(
-        d,
+      const { id: l, parentId: r } = i, { id: u, parentId: s, offset: c } = d;
+      if (r ? n[r] ? a.edit(
+        r,
         "children",
-        l[d].children.filter((e) => e !== n)
-      ) : o[d] && p.edit(
-        d,
+        n[r].children.filter((e) => e !== l)
+      ) : o[r] && p.edit(
+        r,
         "children",
-        o[d].children.filter((e) => e !== n)
+        o[r].children.filter((e) => e !== l)
       ) : x.edit(
-        (D = f.value) == null ? void 0 : D.uid,
+        f.value?.uid,
         "collections",
-        ((U = f.value) == null ? void 0 : U.collections.filter((e) => e !== n)) ?? []
+        f.value?.collections.filter((e) => e !== l) ?? []
       ), c === 2) {
-        const e = l[u] || o[u];
-        e && y(e, [...e.children ?? [], n]);
+        const e = n[u] || o[u];
+        e && y(e, [...e.children ?? [], l]);
       } else if (s) {
-        const e = l[s] || o[s];
+        const e = n[s] || o[s];
         if (!e)
           return;
-        const t = [...e.children ?? []], h = t.findIndex((E) => u === E) ?? 0;
-        t.splice(h + c, 0, n), y(e, t);
+        const t = [...e.children ?? []], h = t.findIndex((U) => u === U) ?? 0;
+        t.splice(h + c, 0, l), y(e, t);
       } else {
-        const e = [...((v = f.value) == null ? void 0 : v.collections) ?? []], t = e.findIndex((h) => u === h) ?? 0;
-        e.splice(t + c, 0, n), x.edit((C = f.value) == null ? void 0 : C.uid, "collections", e);
+        const e = [...f.value?.collections ?? []], t = e.findIndex((h) => u === h) ?? 0;
+        e.splice(t + c, 0, l), x.edit(f.value?.uid, "collections", e);
       }
     },
-    isDroppable: (i, r) => {
-      var n, d;
-      return !(b === "modal" || !l[i.id] && r.offset !== 2 || l[i.id] && ((d = (n = l[r.id]) == null ? void 0 : n.info) == null ? void 0 : d.title) === "Drafts");
-    }
+    isDroppable: (i, d) => !(D === "modal" || !n[i.id] && d.offset !== 2 || n[i.id] && n[d.id]?.info?.title === "Drafts")
   };
 }
 export {
-  F as dragHandlerFactory
+  I as dragHandlerFactory
 };

package/dist/views/Request/hooks/useOpenApiWatcher.js

@@ -1,39 +1,38 @@
-import { useActiveEntities as d } from "../../../store/active-entities.js";
+import { useActiveEntities as A } from "../../../store/active-entities.js";
 import { specDictionary as f } from "../../../store/import-spec.js";
-import { combineRenameDiffs as D, mutateCollectionDiff as R, mutateSecuritySchemeDiff as g, mutateServerDiff as S, mutateTagDiff as T, mutateRequestDiff as M } from "../libs/watch-mode.js";
-import { fetchDocument as I, createHash as C } from "@scalar/oas-utils/helpers";
-import { parseSchema as O } from "@scalar/oas-utils/transforms";
-import { useToasts as L } from "@scalar/use-toasts";
-import { useTimeoutPoll as N } from "@vueuse/core";
-import U from "microdiff";
-import { watch as b } from "vue";
-import { useWorkspace as P } from "../../../store/store.js";
-const k = 5 * 1e3, q = 60 * 1e3, J = () => {
-  const { toast: h } = L(), c = d(), o = P(), { activeCollection: s, activeWorkspace: W } = c, { collectionMutators: n } = o, i = (e) => h(`[useOpenApiWatcher] Changes to the ${e} were not applied`, "error"), w = (e) => {
-    e.path[0] === "info" || e.path[0] === "security" ? R(e, c, o) || i("collection") : e.path[0] === "components" && e.path[1] === "securitySchemes" ? g(e, c, o) || i("securitySchemes") : e.path[0] === "servers" ? S(e, c, o) || i("servers") : e.path[0] === "tags" ? T(e, c, o) || i("tags") : e.path[0] === "paths" && (M(e, c, o) || i("requests"));
-  }, { pause: p, resume: m } = N(async () => {
-    var l, v;
-    const e = (l = s.value) == null ? void 0 : l.documentUrl;
+import { combineRenameDiffs as y, mutateCollectionDiff as E, mutateSecuritySchemeDiff as D, mutateServerDiff as R, mutateTagDiff as g, mutateRequestDiff as S } from "../libs/watch-mode.js";
+import { fetchDocument as T, createHash as M } from "@scalar/oas-utils/helpers";
+import { parseSchema as l } from "@scalar/oas-utils/transforms";
+import { useToasts as I } from "@scalar/use-toasts";
+import { useTimeoutPoll as C } from "@vueuse/core";
+import L from "microdiff";
+import { watch as N } from "vue";
+import { useWorkspace as U } from "../../../store/store.js";
+const b = 5 * 1e3, P = 60 * 1e3, B = () => {
+  const { toast: h } = I(), c = A(), o = U(), { activeCollection: s, activeWorkspace: v } = c, { collectionMutators: n } = o, i = (e) => h(`[useOpenApiWatcher] Changes to the ${e} were not applied`, "error"), O = (e) => {
+    e.path[0] === "info" || e.path[0] === "security" ? E(e, c, o) || i("collection") : e.path[0] === "components" && e.path[1] === "securitySchemes" ? D(e, c, o) || i("securitySchemes") : e.path[0] === "servers" ? R(e, c, o) || i("servers") : e.path[0] === "tags" ? g(e, c, o) || i("tags") : e.path[0] === "paths" && (S(e, c, o) || i("requests"));
+  }, { pause: p, resume: m } = C(async () => {
+    const e = s.value?.documentUrl;
     if (!e)
       return;
     const t = f[e];
     try {
-      const a = await I(e, (v = W.value) == null ? void 0 : v.proxyUrl, void 0, !1), u = C(a);
-      if (n.edit(s.value.uid, "watchModeStatus", "WATCHING"), t != null && t.hash)
+      const a = await T(e, v.value?.proxyUrl, void 0, !1), u = M(a);
+      if (n.edit(s.value.uid, "watchModeStatus", "WATCHING"), t?.hash)
         if (t.hash && t.hash !== u) {
-          const { schema: r } = await O(a), A = U(t.schema, r), y = D(A);
+          const { schema: r } = await l(a), W = L(t.schema, r), d = y(W);
           try {
-            y.forEach(w), f[e] = {
+            d.forEach(O), f[e] = {
               hash: u,
               schema: r
             };
-          } catch (E) {
-            console.error("[useOpenApiWatcher] Error:", E);
+          } catch (w) {
+            console.error("[useOpenApiWatcher] Error:", w);
           }
         } else
           console.log("[useOpenApiWatcher] No changes detected yet…");
       else {
-        const { schema: r } = await O(a);
+        const { schema: r } = await l(a);
         r && (f[e] = {
           hash: u,
           schema: r
@@ -42,17 +41,11 @@ const k = 5 * 1e3, q = 60 * 1e3, J = () => {
     } catch (a) {
       console.error("[useOpenApiWatcher] Error:", a), console.info("[useOpenApiWatcher] Pausing watcher for 60 seconds"), p(), n.edit(s.value.uid, "watchModeStatus", "ERROR"), h("[useOpenApiWatcher] Unable to fetch the spec file, paused the watcher for 60 seconds", "error"), setTimeout(() => {
         console.info("[useOpenApiWatcher] Resuming watcher"), m();
-      }, q);
+      }, P);
     }
-  }, k);
-  b(
-    [() => {
-      var e;
-      return (e = s.value) == null ? void 0 : e.documentUrl;
-    }, () => {
-      var e;
-      return (e = s.value) == null ? void 0 : e.watchMode;
-    }],
+  }, b);
+  N(
+    [() => s.value?.documentUrl, () => s.value?.watchMode],
     ([e, t]) => {
       e && t ? (console.info(`[useOpenApiWatcher] Watching ${e} …`), m()) : s.value && (p(), n.edit(s.value.uid, "watchModeStatus", "IDLE"));
     },
@@ -60,5 +53,5 @@ const k = 5 * 1e3, q = 60 * 1e3, J = () => {
   );
 };
 export {
-  J as useOpenApiWatcher
+  B as useOpenApiWatcher
 };

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

@@ -1,58 +1,52 @@
-import { isDefined as p } from "@scalar/oas-utils/helpers";
-import { ADD_AUTH_OPTIONS as O } from "../consts/new-auth-options.js";
-const d = (t) => ({
-  id: t.uid,
-  label: t.type === "openIdConnect" ? `${t.nameKey} (coming soon)` : t.nameKey
-}), b = (t, e) => d(
-  t.reduce(
-    (r, a, i) => {
-      const m = e[a];
-      return m && (r.nameKey += `${i > 0 ? " & " : ""}${m.nameKey}`, r.uid = `${r.uid}${i > 0 ? "," : ""}${m.uid}`), r;
+import { isDefined as l } from "@scalar/oas-utils/helpers";
+import { ADD_AUTH_OPTIONS as p } from "../consts/new-auth-options.js";
+const c = (e) => ({
+  id: e.uid,
+  label: e.type === "openIdConnect" ? `${e.nameKey} (coming soon)` : e.nameKey
+}), y = (e, n) => c(
+  e.reduce(
+    (i, u, a) => {
+      const s = n[u];
+      return s && (i.nameKey += `${a > 0 ? " & " : ""}${s.nameKey}`, i.uid = `${i.uid}${a > 0 ? "," : ""}${s.uid}`), i;
     },
     { type: "complex", nameKey: "", uid: "" }
   )
-), A = (t, e) => {
-  var r;
-  return JSON.stringify(t == null ? void 0 : t.security) === "[{}]" && ((r = e == null ? void 0 : e.security) != null && r.length) ? !!(e != null && e.security.find((i) => JSON.stringify(i) === "{}")) ? e.security : [...e.security, {}] : (t == null ? void 0 : t.security) ?? (e == null ? void 0 : e.security) ?? [];
-}, D = (t, e, r, a = !1) => {
+), O = (e, n) => JSON.stringify(e?.security) === "[{}]" && n?.security?.length ? !!n?.security.find((u) => JSON.stringify(u) === "{}") ? n.security : [...n.security, {}] : e?.security ?? n?.security ?? [], b = (e, n, i, u = !1) => {
   {
-    const i = e.reduce(
-      (n, s) => {
-        const u = r[s];
-        return u && (n[u.nameKey] = u), n;
+    const a = n.reduce(
+      (r, t) => {
+        const o = i[t];
+        return o && (r[o.nameKey] = o), r;
       },
       {}
-    ), m = t.flatMap((n) => {
-      const s = Object.keys(n);
-      if (s.length > 1) {
-        const u = s.map((g) => {
-          var h;
-          return (h = i[g]) == null ? void 0 : h.uid;
-        }).filter(p);
-        return b(u, r);
+    ), s = e.flatMap((r) => {
+      const t = Object.keys(r);
+      if (t.length > 1) {
+        const o = t.map((d) => a[d]?.uid).filter(l);
+        return y(o, i);
       }
-      if (s[0]) {
-        const u = i[s[0]];
-        if (u)
-          return d(u);
+      if (t[0]) {
+        const o = a[t[0]];
+        if (o)
+          return c(o);
       }
       return [];
-    }), y = e.filter((n) => !m.some((s) => s.id === n)).map((n) => {
-      const s = r[n];
-      return s ? d(s) : null;
-    }).filter(p), f = [
-      { label: "Required authentication", options: m },
-      { label: "Available authentication", options: y }
+    }), f = n.filter((r) => !s.some((t) => t.id === r)).map((r) => {
+      const t = i[r];
+      return t ? c(t) : null;
+    }).filter(l), m = [
+      { label: "Required authentication", options: s },
+      { label: "Available authentication", options: f }
     ];
-    return a ? m.length ? f : y : (f.push({
+    return u ? s.length ? m : f : (m.push({
       label: "Add new authentication",
-      options: O
-    }), f);
+      options: p
+    }), m);
   }
 };
 export {
-  b as formatComplexScheme,
-  d as formatScheme,
-  D as getSchemeOptions,
-  A as getSecurityRequirements
+  y as formatComplexScheme,
+  c as formatScheme,
+  b as getSchemeOptions,
+  O as getSecurityRequirements
 };

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

@@ -1,28 +1,28 @@
-import { shouldUseProxy as k } from "@scalar/oas-utils/helpers";
-import { fromUint8Array as S, encode as U } from "js-base64";
-const w = () => {
+import { shouldUseProxy as S } from "@scalar/oas-utils/helpers";
+import { fromUint8Array as P, encode as k } from "js-base64";
+const U = () => {
   const e = new Uint8Array(32);
-  return crypto.getRandomValues(e), S(e, !0);
-}, A = async (e, l) => {
+  return crypto.getRandomValues(e), P(e, !0);
+}, w = async (e, l) => {
   if (l === "plain")
     return e;
-  const n = new TextEncoder().encode(e), i = await crypto.subtle.digest("SHA-256", n);
-  return S(new Uint8Array(i), !0);
-}, b = async (e, l, u) => {
+  const n = new TextEncoder().encode(e), c = await crypto.subtle.digest("SHA-256", n);
+  return P(new Uint8Array(c), !0);
+}, C = async (e, l, u) => {
   try {
     if (!e)
       return [new Error("Flow not found"), null];
     const n = e.selectedScopes.join(" ");
     if (e.type === "clientCredentials" || e.type === "password")
-      return P(e, n, {
+      return x(e, n, {
         proxyUrl: u
       });
-    const i = (Math.random() + 1).toString(36).substring(2, 10), t = new URL(e.authorizationUrl);
+    const c = (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 = w(), s = await A(r, e["x-usePkce"]);
+      const r = U(), s = await w(r, e["x-usePkce"]);
       m = {
         codeVerifier: r,
         codeChallenge: s,
@@ -35,29 +35,27 @@ const w = () => {
     } 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 c;
-      const s = (c = e["x-scalar-security-query"]) == null ? void 0 : c[r];
+      const s = e["x-scalar-security-query"]?.[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);
+    }), t.searchParams.set("client_id", e["x-scalar-client-id"]), t.searchParams.set("state", c), 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 c = null, d = null, h = null, y = null;
+        let o = null, d = null, h = null, y = null;
         try {
-          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"), y = o.get("error_description");
+          const i = new URL(a.location.href).searchParams, _ = e["x-tokenName"] || "access_token";
+          o = i.get(_), d = i.get("code"), h = i.get("error"), y = i.get("error_description");
           const g = new URLSearchParams(a.location.href.split("#")[1]);
-          c || (c = g.get(x)), d || (d = g.get("code")), h || (h = g.get("error")), y || (y = g.get("error_description"));
+          o ||= g.get(_), d ||= g.get("code"), h ||= g.get("error"), y ||= g.get("error_description");
         } catch {
         }
-        if (a.closed || c || d || h)
+        if (a.closed || o || d || h)
           if (clearInterval(s), a.close(), h)
             r([new Error(`OAuth error: ${h}${y ? ` (${y})` : ""}`), 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, {
+          else if (o) {
+            const i = a.location.href.match(/state=([^&]*)/)?.[1];
+            r(i === c ? [null, o] : [new Error("State mismatch"), null]);
+          } else d ? new URL(a.location.href).searchParams.get("state") === c ? x(e, n, {
             code: d,
             pkce: m,
             proxyUrl: u
@@ -67,10 +65,10 @@ const w = () => {
   } catch {
     return [new Error("Failed to authorize oauth2 flow"), null];
   }
-}, P = async (e, l, {
+}, x = async (e, l, {
   code: u,
   pkce: n,
-  proxyUrl: i
+  proxyUrl: c
 } = {}) => {
   if (!e)
     return [new Error("OAuth2 flow was not defined"), null];
@@ -82,19 +80,19 @@ const w = () => {
     const p = {
       "Content-Type": "application/x-www-form-urlencoded"
     };
-    e.clientSecret && (!e["x-scalar-credentials-location"] || e["x-scalar-credentials-location"] === "header") && (p.Authorization = `Basic ${U(`${e["x-scalar-client-id"]}:${e.clientSecret}`)}`);
-    const r = k(i, e.tokenUrl) ? `${i}?${new URLSearchParams([["scalar_url", e.tokenUrl]]).toString()}` : e.tokenUrl, c = await (await fetch(r, {
+    e.clientSecret && (!e["x-scalar-credentials-location"] || e["x-scalar-credentials-location"] === "header") && (p.Authorization = `Basic ${k(`${e["x-scalar-client-id"]}:${e.clientSecret}`)}`);
+    const r = S(c, e.tokenUrl) ? `${c}?${new URLSearchParams([["scalar_url", e.tokenUrl]]).toString()}` : e.tokenUrl, o = await (await fetch(r, {
       method: "POST",
       headers: p,
       body: t
     })).json(), d = e["x-tokenName"] || "access_token";
-    return [null, c[d]];
+    return [null, o[d]];
   } catch {
     return [new Error("Failed to get an access token. Please check your credentials."), null];
   }
 };
 export {
-  b as authorizeOauth2,
-  P as authorizeServers,
-  A as generateCodeChallenge
+  C as authorizeOauth2,
+  x as authorizeServers,
+  w as generateCodeChallenge
 };