@scalar/api-client 2.2.42 → 2.2.44

package/dist/views/Request/RequestSection/RequestSection.vue2.js

@@ -1,30 +1,36 @@
-import { defineComponent as E, computed as f, ref as H, watch as R, openBlock as d, createBlock as K, unref as o, withCtx as x, createElementVNode as g, createElementBlock as h, createCommentVNode as N, toDisplayString as D, createVNode as i, withDirectives as u, vShow as n } from "vue";
-import U from "../../../components/ContextBar.vue.js";
-import Q from "../../../components/ViewLayout/ViewLayoutSection.vue.js";
-import { matchesDomain as W } from "../../../libs/send-request/set-request-cookies.js";
-import { useActiveEntities as $ } from "../../../store/active-entities.js";
-import L from "./RequestBody.vue.js";
-import y from "./RequestParams.vue.js";
-import M from "./RequestPathParams.vue.js";
-import { canMethodHaveBody as _, isDefined as O } from "@scalar/oas-utils/helpers";
-import P from "./RequestAuth/RequestAuth.vue.js";
-import { useWorkspace as z } from "../../../store/store.js";
-import { useLayout as I } from "../../../hooks/useLayout.js";
-const j = { class: "flex-1 flex gap-1 items-center lg:pr-24 pointer-events-none group" }, F = {
+import { defineComponent as N, computed as h, ref as D, watch as U, openBlock as m, createBlock as b, unref as l, withCtx as q, createElementVNode as B, createElementBlock as y, createCommentVNode as w, toDisplayString as O, createVNode as i, withDirectives as u, vShow as n } from "vue";
+import Q from "../../../components/ContextBar.vue.js";
+import W from "../../../components/ViewLayout/ViewLayoutSection.vue.js";
+import { matchesDomain as $ } from "../../../libs/send-request/set-request-cookies.js";
+import { useActiveEntities as L } from "../../../store/active-entities.js";
+import M from "./RequestBody.vue.js";
+import k from "./RequestParams.vue.js";
+import P from "./RequestPathParams.vue.js";
+import { canMethodHaveBody as _, isDefined as j } from "@scalar/oas-utils/helpers";
+import z from "./RequestAuth/RequestAuth.vue.js";
+import { useWorkspace as I } from "../../../store/store.js";
+import { useLayout as F } from "../../../hooks/useLayout.js";
+const G = { class: "flex-1 flex gap-1 items-center lg:pr-24 pointer-events-none group" }, J = {
   key: 0,
   class: "absolute w-full h-full top-0 left-0 pointer-events-auto opacity-0 cursor-text",
   for: "requestname"
-}, G = ["value"], J = {
+}, T = ["value"], X = {
   key: 2,
   class: "flex items-center text-c-1 h-8"
-}, T = { class: "request-section-content custom-scroll flex flex-1 flex-col" }, ce = /* @__PURE__ */ E({
+}, Y = { class: "request-section-content custom-scroll flex flex-1 flex-col" }, de = /* @__PURE__ */ N({
   __name: "RequestSection",
   props: {
     selectedSecuritySchemeUids: {}
   },
-  setup(X) {
-    const { activeRequest: a, activeExample: k, activeWorkspace: q, activeServer: p } = $(), { requestMutators: B, cookies: b } = z(), { layout: v } = I(), w = f(() => {
-      var e, s;
+  setup(Z) {
+    const {
+      activeRequest: o,
+      activeCollection: S,
+      activeExample: A,
+      activeWorkspace: f,
+      activeServer: d
+    } = L(), { requestMutators: C, cookies: V, securitySchemes: E } = I(), { layout: p } = F(), H = h(() => {
+      var e, r;
       const t = /* @__PURE__ */ new Set([
         "All",
         "Query",
@@ -34,28 +40,28 @@ const j = { class: "flex-1 flex gap-1 items-center lg:pr-24 pointer-events-none
         "Headers",
         "Body"
       ]);
-      return (e = k.value) != null && e.parameters.path.length || t.delete("Variables"), _(((s = a.value) == null ? void 0 : s.method) ?? "get") || t.delete("Body"), S.value && t.delete("Auth"), [...t];
-    }), S = f(
+      return (e = A.value) != null && e.parameters.path.length || t.delete("Variables"), _(((r = o.value) == null ? void 0 : r.method) ?? "get") || t.delete("Body"), x.value && t.delete("Auth"), [...t];
+    }), x = h(
       () => {
         var t, e;
-        return v === "modal" && ((e = (t = a.value) == null ? void 0 : t.security) == null ? void 0 : e.length) === 0;
+        return p === "modal" && ((e = (t = o.value) == null ? void 0 : t.security) == null ? void 0 : e.length) === 0;
       }
-    ), l = H("All");
-    R(a, (t) => {
-      l.value === "Body" && t && !_(t.method) && (l.value = "All");
+    ), a = D("All");
+    U(o, (t) => {
+      a.value === "Body" && t && !_(t.method) && (a.value = "All");
     });
-    const C = (t) => {
-      if (!a.value) return;
+    const R = (t) => {
+      if (!o.value) return;
       const e = t.target;
-      B.edit(a.value.uid, "summary", e.value);
-    }, V = f(
+      C.edit(o.value.uid, "summary", e.value);
+    }, K = h(
       () => {
         var t;
-        return (((t = q.value) == null ? void 0 : t.cookies) ?? []).map((e) => b[e]).filter(O).filter((e) => e.name).filter(
+        return (((t = f.value) == null ? void 0 : t.cookies) ?? []).map((e) => V[e]).filter(j).filter((e) => e.name).filter(
           (e) => {
-            var s, r;
-            return W(
-              ((s = p == null ? void 0 : p.value) == null ? void 0 : s.url) || ((r = a.value) == null ? void 0 : r.path),
+            var r, s;
+            return $(
+              ((r = d == null ? void 0 : d.value) == null ? void 0 : r.url) || ((s = o.value) == null ? void 0 : s.path),
               e.domain
             );
           }
@@ -73,78 +79,83 @@ const j = { class: "flex-1 flex gap-1 items-center lg:pr-24 pointer-events-none
       }
     );
     return (t, e) => {
-      var s;
-      return d(), K(Q, {
-        "aria-label": `Request: ${(s = o(a)) == null ? void 0 : s.summary}`
+      var r;
+      return m(), b(W, {
+        "aria-label": `Request: ${(r = l(o)) == null ? void 0 : r.summary}`
       }, {
-        title: x(() => {
-          var r, c;
+        title: q(() => {
+          var s, c;
           return [
-            g("div", j, [
-              o(v) !== "modal" ? (d(), h("label", F)) : N("", !0),
-              o(v) !== "modal" ? (d(), h("input", {
+            B("div", G, [
+              l(p) !== "modal" ? (m(), y("label", J)) : w("", !0),
+              l(p) !== "modal" ? (m(), y("input", {
                 key: 1,
                 id: "requestname",
                 class: "text-c-1 rounded pointer-events-auto relative w-full pl-1.25 -ml-0.5 md:-ml-1.25 h-8 group-hover-input has-[:focus-visible]:outline z-10",
                 placeholder: "Request Name",
-                value: (r = o(a)) == null ? void 0 : r.summary,
-                onInput: C
-              }, null, 40, G)) : (d(), h("span", J, D((c = o(a)) == null ? void 0 : c.summary), 1))
+                value: (s = l(o)) == null ? void 0 : s.summary,
+                onInput: R
+              }, null, 40, T)) : (m(), y("span", X, O((c = l(o)) == null ? void 0 : c.summary), 1))
             ]),
-            i(U, {
-              activeSection: l.value,
-              sections: w.value,
-              onSetActiveSection: e[0] || (e[0] = (m) => l.value = m)
+            i(Q, {
+              activeSection: a.value,
+              sections: H.value,
+              onSetActiveSection: e[0] || (e[0] = (v) => a.value = v)
             }, null, 8, ["activeSection", "sections"])
           ];
         }),
-        default: x(() => {
-          var r, c, m, A;
+        default: q(() => {
+          var s, c, v, g;
           return [
-            g("div", T, [
-              u(i(P, {
+            B("div", Y, [
+              l(S) && l(f) && (l(p) !== "modal" || Object.keys(l(E) ?? {}).length) ? u((m(), b(z, {
+                key: 0,
+                collection: l(S),
                 layout: "client",
+                operation: l(o),
                 selectedSecuritySchemeUids: t.selectedSecuritySchemeUids,
-                title: "Authentication"
-              }, null, 8, ["selectedSecuritySchemeUids"]), [
+                server: l(d),
+                title: "Authentication",
+                workspace: l(f)
+              }, null, 8, ["collection", "operation", "selectedSecuritySchemeUids", "server", "workspace"])), [
                 [
                   n,
-                  !S.value && (l.value === "All" || l.value === "Auth")
+                  !x.value && (a.value === "All" || a.value === "Auth")
                 ]
-              ]),
-              u(i(M, {
+              ]) : w("", !0),
+              u(i(P, {
                 paramKey: "path",
                 title: "Variables"
               }, null, 512), [
                 [
                   n,
-                  (l.value === "All" || l.value === "Variables") && ((m = (c = (r = o(k)) == null ? void 0 : r.parameters) == null ? void 0 : c.path) == null ? void 0 : m.length)
+                  (a.value === "All" || a.value === "Variables") && ((v = (c = (s = l(A)) == null ? void 0 : s.parameters) == null ? void 0 : c.path) == null ? void 0 : v.length)
                 ]
               ]),
-              u(i(y, {
+              u(i(k, {
                 paramKey: "cookies",
-                readOnlyEntries: V.value,
+                readOnlyEntries: K.value,
                 title: "Cookies",
                 workspaceParamKey: "cookies"
               }, null, 8, ["readOnlyEntries"]), [
-                [n, l.value === "All" || l.value === "Cookies"]
+                [n, a.value === "All" || a.value === "Cookies"]
               ]),
-              u(i(y, {
+              u(i(k, {
                 paramKey: "headers",
                 title: "Headers"
               }, null, 512), [
-                [n, l.value === "All" || l.value === "Headers"]
+                [n, a.value === "All" || a.value === "Headers"]
               ]),
-              u(i(y, {
+              u(i(k, {
                 paramKey: "query",
                 title: "Query Parameters"
               }, null, 512), [
-                [n, l.value === "All" || l.value === "Query"]
+                [n, a.value === "All" || a.value === "Query"]
               ]),
-              u(i(L, { title: "Body" }, null, 512), [
+              u(i(M, { title: "Body" }, null, 512), [
                 [
                   n,
-                  ((A = o(a)) == null ? void 0 : A.method) && (l.value === "All" || l.value === "Body") && o(_)(o(a).method)
+                  ((g = l(o)) == null ? void 0 : g.method) && (a.value === "All" || a.value === "Body") && l(_)(l(o).method)
                 ]
               ])
             ])
@@ -156,5 +167,5 @@ const j = { class: "flex-1 flex gap-1 items-center lg:pr-24 pointer-events-none
   }
 });
 export {
-  ce as default
+  de as default
 };

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

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

package/dist/views/Request/libs/auth.d.ts

@@ -1,7 +1,27 @@
-import type { SecurityScheme } from '@scalar/oas-utils/entities/spec';
+import { type SecuritySchemeGroup, type SecuritySchemeOption } from '../../../views/Request/consts/index.js';
+import type { Collection, Operation, SecurityScheme } from '@scalar/oas-utils/entities/spec';
+type DisplayScheme = {
+    type: SecurityScheme['type'] | 'complex';
+    nameKey: SecurityScheme['nameKey'];
+    uid: SecurityScheme['uid'];
+};
 /** Format a scheme object into a display object */
-export declare const displaySchemeFormatter: (s: SecurityScheme) => {
+export declare const formatScheme: (s: DisplayScheme) => {
+    id: string;
+    label: string;
+};
+/** Formats complex security schemes */
+export declare const formatComplexScheme: (uids: string[], securitySchemes: Record<string, DisplayScheme>) => {
     id: string;
     label: string;
 };
+/** Compute what the security requirements should be for a request */
+export declare const getSecurityRequirements: (operation?: Operation, collection?: Collection) => Record<string, string[]>[];
+/**
+ * Generates the options for the security scheme combobox
+ *
+ * contains either a flat list, or different groups of required, available, and add new
+ */
+export declare const getSchemeOptions: (filteredRequirements: Collection["security"], collectionSchemeUids: Collection["securitySchemes"], securitySchemes: Record<string, DisplayScheme>, isReadOnly?: boolean) => SecuritySchemeOption[] | SecuritySchemeGroup[];
+export {};
 //# sourceMappingURL=auth.d.ts.map

package/dist/views/Request/libs/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../src/views/Request/libs/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAErE,mDAAmD;AACnD,eAAO,MAAM,sBAAsB,MAAO,cAAc;;;CAGtD,CAAA"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../src/views/Request/libs/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EAC1B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EACV,UAAU,EACV,SAAS,EACT,cAAc,EACf,MAAM,iCAAiC,CAAA;AAGxC,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;IACxC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,CAAA;IAClC,GAAG,EAAE,cAAc,CAAC,KAAK,CAAC,CAAA;CAC3B,CAAA;AAED,mDAAmD;AACnD,eAAO,MAAM,YAAY,MAAO,aAAa;;;CAG3C,CAAA;AAEF,uCAAuC;AACvC,eAAO,MAAM,mBAAmB,SACxB,MAAM,EAAE,mBACG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;;;CAc7C,CAAA;AAEH,qEAAqE;AACrE,eAAO,MAAM,uBAAuB,eACtB,SAAS,eACR,UAAU,+BAiBxB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,yBACL,UAAU,CAAC,UAAU,CAAC,wBACtB,UAAU,CAAC,iBAAiB,CAAC,mBAClC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,eAClC,OAAO,KAClB,oBAAoB,EAAE,GAAG,mBAAmB,EAyD9C,CAAA"}

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

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

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

@@ -1,8 +1,11 @@
-import { displaySchemeFormatter as o } from "./auth.js";
-import { authorizeOauth2 as a, authorizeServers as h, generateCodeChallenge as m } from "./oauth2.js";
+import { formatComplexScheme as t, formatScheme as o, getSchemeOptions as m, getSecurityRequirements as a } from "./auth.js";
+import { authorizeOauth2 as i, authorizeServers as u, generateCodeChallenge as S } from "./oauth2.js";
 export {
-  a as authorizeOauth2,
-  h as authorizeServers,
-  o as displaySchemeFormatter,
-  m as generateCodeChallenge
+  i as authorizeOauth2,
+  u as authorizeServers,
+  t as formatComplexScheme,
+  o as formatScheme,
+  S as generateCodeChallenge,
+  m as getSchemeOptions,
+  a as getSecurityRequirements
 };

package/package.json

@@ -18,7 +18,7 @@
     "rest",
     "testing"
   ],
-  "version": "2.2.42",
+  "version": "2.2.44",
   "engines": {
     "node": ">=18"
   },
@@ -189,20 +189,20 @@
     "yaml": "^2.4.5",
     "zod": "^3.23.8",
     "@scalar/draggable": "0.1.8",
-    "@scalar/components": "0.13.18",
     "@scalar/icons": "0.1.2",
-    "@scalar/import": "0.2.21",
+    "@scalar/components": "0.13.20",
+    "@scalar/import": "0.2.22",
+    "@scalar/oas-utils": "0.2.102",
     "@scalar/object-utils": "1.1.12",
-    "@scalar/oas-utils": "0.2.101",
+    "@scalar/openapi-types": "0.1.7",
+    "@scalar/themes": "0.9.64",
     "@scalar/openapi-parser": "0.10.4",
-    "@scalar/openapi-types": "0.1.6",
-    "@scalar/themes": "0.9.63",
-    "@scalar/postman-to-openapi": "0.1.24",
-    "@scalar/types": "0.0.29",
-    "@scalar/use-codemirror": "0.11.63",
-    "@scalar/use-hooks": "0.1.17",
-    "@scalar/use-tooltip": "1.0.5",
-    "@scalar/use-toasts": "0.7.8"
+    "@scalar/postman-to-openapi": "0.1.25",
+    "@scalar/types": "0.0.30",
+    "@scalar/use-codemirror": "0.11.65",
+    "@scalar/use-toasts": "0.7.8",
+    "@scalar/use-hooks": "0.1.18",
+    "@scalar/use-tooltip": "1.0.5"
   },
   "devDependencies": {
     "@types/shell-quote": "^1.7.5",

package/dist/views/Request/RequestSection/RequestAuth/RequestExampleAuth.vue.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RequestExampleAuth.vue.d.ts","sourceRoot":"","sources":["../../../../../src/views/Request/RequestSection/RequestAuth/RequestExampleAuth.vue"],"names":[],"mappings":"AAmNA,KAAK,WAAW,GAAG;IACjB,0BAA0B,EAAE,MAAM,EAAE,CAAA;IACpC,MAAM,EAAE,QAAQ,GAAG,WAAW,CAAA;CAC/B,CAAC;;AA+XF,wBAMG"}

package/dist/views/Request/RequestSection/RequestAuth/RequestExampleAuth.vue.js

@@ -1,7 +0,0 @@
-import t from "./RequestExampleAuth.vue2.js";
-/* empty css                        */
-import o from "../../../../_virtual/_plugin-vue_export-helper.js";
-const p = /* @__PURE__ */ o(t, [["__scopeId", "data-v-e78fca0c"]]);
-export {
-  p as default
-};