@scalar/api-client 2.34.1 → 2.36.1

package/dist/v2/blocks/scalar-auth-selector-block/helpers/extract-security-scheme-secrets.js

@@ -1,73 +1,88 @@
-import { isObject as u } from "@scalar/helpers/object/is-object";
-import { objectEntries as p } from "@scalar/helpers/object/object-entries";
+import { isObject as p } from "@scalar/helpers/object/is-object";
+import { objectEntries as u } from "@scalar/helpers/object/object-entries";
 const f = {
   "x-scalar-secret-client-id": "x-scalar-client-id",
   "x-scalar-secret-client-secret": "clientSecret",
   "x-scalar-secret-password": "password",
   "x-scalar-secret-redirect-uri": "x-scalar-redirect-uri",
   "x-scalar-secret-token": "token",
-  "x-scalar-secret-username": "username"
-}, n = (t, s, i = {}) => Object.fromEntries(
-  t.map((a) => {
-    const r = i[a] || s[a] || s[f[a]] || "";
-    return [a, r];
+  "x-scalar-secret-username": "username",
+  "x-scalar-secret-auth-url": "authorizationUrl",
+  "x-scalar-secret-token-url": "tokenUrl"
+}, i = (t, s, n = {}) => Object.fromEntries(
+  t.map((c) => {
+    const r = n[c] || s[c] || s[f[c]] || "";
+    return [c, r];
   })
-), o = (t = {}) => {
+), l = (t = {}) => {
   const s = t["x-scalar-secret-refresh-token"];
   return typeof s == "string" ? { "x-scalar-secret-refresh-token": s } : {};
 }, x = (t, s) => {
-  const i = /* @__PURE__ */ new Set();
-  return { flows: p(t ?? {}).reduce((r, [e, c]) => {
-    if (!u(c))
+  const n = /* @__PURE__ */ new Set();
+  return { flows: u(t ?? {}).reduce((r, [e, a]) => {
+    if (!p(a))
       return r;
-    const l = c.selectedScopes;
-    return Array.isArray(l) && l.forEach((d) => typeof d == "string" && i.add(d)), e === "implicit" && (r.implicit = {
-      ...c,
-      ...n(
-        ["x-scalar-secret-client-id", "x-scalar-secret-redirect-uri", "x-scalar-secret-token"],
-        c,
+    const o = a.selectedScopes;
+    return Array.isArray(o) && o.forEach((d) => typeof d == "string" && n.add(d)), e === "implicit" && (r.implicit = {
+      ...a,
+      ...i(
+        [
+          "x-scalar-secret-client-id",
+          "x-scalar-secret-redirect-uri",
+          "x-scalar-secret-token",
+          "x-scalar-secret-auth-url"
+        ],
+        a,
         s?.implicit
       ),
-      ...o(s?.implicit)
+      ...l(s?.implicit)
     }), e === "password" && (r[e] = {
-      ...c,
-      ...n(
+      ...a,
+      ...i(
         [
           "x-scalar-secret-client-id",
           "x-scalar-secret-client-secret",
           "x-scalar-secret-username",
           "x-scalar-secret-password",
-          "x-scalar-secret-token"
+          "x-scalar-secret-token",
+          "x-scalar-secret-token-url"
         ],
-        c,
+        a,
         s?.password
       ),
-      ...o(s?.password)
+      ...l(s?.password)
     }), e === "clientCredentials" && (r[e] = {
-      ...c,
-      ...n(
-        ["x-scalar-secret-client-id", "x-scalar-secret-client-secret", "x-scalar-secret-token"],
-        c,
+      ...a,
+      ...i(
+        [
+          "x-scalar-secret-client-id",
+          "x-scalar-secret-client-secret",
+          "x-scalar-secret-token",
+          "x-scalar-secret-token-url"
+        ],
+        a,
         s?.clientCredentials
       ),
-      ...o(s?.clientCredentials)
+      ...l(s?.clientCredentials)
     }), e === "authorizationCode" && (r[e] = {
-      ...c,
-      ...n(
+      ...a,
+      ...i(
         [
           "x-scalar-secret-client-id",
           "x-scalar-secret-client-secret",
           "x-scalar-secret-redirect-uri",
-          "x-scalar-secret-token"
+          "x-scalar-secret-token",
+          "x-scalar-secret-auth-url",
+          "x-scalar-secret-token-url"
         ],
-        c,
+        a,
         s?.authorizationCode
       ),
-      ...o(s?.authorizationCode)
+      ...l(s?.authorizationCode)
     }), r;
-  }, {}), selectedScopes: Array.from(i) };
-}, S = (t, s, i, a) => {
-  const r = s.getAuthSecrets(a, i);
+  }, {}), selectedScopes: Array.from(n) };
+}, C = (t, s, n, c) => {
+  const r = s.getAuthSecrets(c, n);
   if (t.type === "apiKey") {
     const e = r?.type === "apiKey" ? r : void 0;
     return {
@@ -85,15 +100,15 @@ const f = {
     };
   }
   if (t.type === "oauth2") {
-    const e = r?.type === "oauth2" ? r : void 0, c = x(t.flows, e);
+    const e = r?.type === "oauth2" ? r : void 0, a = x(t.flows, e);
     return {
       ...t,
-      flows: c.flows,
-      "x-default-scopes": c.selectedScopes
+      flows: a.flows,
+      "x-default-scopes": a.selectedScopes
     };
   }
   if (t.type === "openIdConnect") {
-    const e = r?.type === "openIdConnect" ? r : void 0, c = x(
+    const e = r?.type === "openIdConnect" ? r : void 0, a = x(
       {
         implicit: e?.implicit,
         password: e?.password,
@@ -104,11 +119,11 @@ const f = {
     );
     return {
       ...t,
-      ...p(c.flows).length ? { flows: c.flows } : {}
+      ...u(a.flows).length ? { flows: a.flows } : {}
     };
   }
   return t;
 };
 export {
-  S as extractSecuritySchemeSecrets
+  C as extractSecuritySchemeSecrets
 };

package/dist/v2/blocks/scalar-auth-selector-block/helpers/oauth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../../../src/v2/blocks/scalar-auth-selector-block/helpers/oauth.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAA;AAGhG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6DAA6D,CAAA;AAYzG,MAAM,MAAM,YAAY,GAAG;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAqDD;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAC1B,OAAO,sBAAsB,EAC7B,MAAM,MAAM,sBAAsB,EAClC,gBAAgB,MAAM,EAAE;AACxB,wEAAwE;AACxE,cAAc,YAAY,GAAG,IAAI;AACjC,kCAAkC;AAClC,UAAU,MAAM;AAChB,6FAA6F;AAC7F,uBAAsB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,KAChD,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAwLrC,CAAA"}
+{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../../../src/v2/blocks/scalar-auth-selector-block/helpers/oauth.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAA;AAGhG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAElD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6DAA6D,CAAA;AAWzG,MAAM,MAAM,YAAY,GAAG;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAqDD;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAC1B,OAAO,sBAAsB,EAC7B,MAAM,MAAM,sBAAsB,EAClC,gBAAgB,MAAM,EAAE;AACxB,wEAAwE;AACxE,cAAc,YAAY,GAAG,IAAI;AACjC,kCAAkC;AAClC,UAAU,MAAM;AAChB,6FAA6F;AAC7F,uBAAsB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,KAChD,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAwLrC,CAAA"}

package/dist/v2/blocks/scalar-auth-selector-block/helpers/oauth.js

@@ -33,52 +33,52 @@ const z = (t, e = {}) => {
         u,
         g
       );
-    const s = (Math.random() + 1).toString(36).substring(2, 10), n = A(
-      t[e].authorizationUrl,
+    const r = (Math.random() + 1).toString(36).substring(2, 10), a = A(
+      t[e]["x-scalar-secret-auth-url"] ?? t[e].authorizationUrl,
       z(u, g)
-    ), a = new URL(n);
+    ), n = new URL(a);
     let c = null;
     if (e === "implicit")
-      a.searchParams.set("response_type", "token");
+      n.searchParams.set("response_type", "token");
     else if (e === "authorizationCode") {
-      const r = t[e];
-      if (a.searchParams.set("response_type", "code"), r["x-usePkce"] !== "no") {
-        const o = $(), d = await L(o, r["x-usePkce"]);
+      const s = t[e];
+      if (n.searchParams.set("response_type", "code"), s["x-usePkce"] !== "no") {
+        const o = $(), d = await L(o, s["x-usePkce"]);
         c = {
           codeVerifier: o,
           codeChallenge: d,
-          codeChallengeMethod: r["x-usePkce"] === "SHA-256" ? "S256" : "plain"
-        }, a.searchParams.set("code_challenge", d), a.searchParams.set("code_challenge_method", c.codeChallengeMethod);
+          codeChallengeMethod: s["x-usePkce"] === "SHA-256" ? "S256" : "plain"
+        }, n.searchParams.set("code_challenge", d), n.searchParams.set("code_challenge_method", c.codeChallengeMethod);
       }
     }
     const l = t[e];
     if (l["x-scalar-secret-redirect-uri"].startsWith("/")) {
-      const r = b(u, g) || window.location.origin + window.location.pathname, o = new URL(l["x-scalar-secret-redirect-uri"], r).toString();
-      a.searchParams.set("redirect_uri", o);
+      const s = b(u, g) || window.location.origin + window.location.pathname, o = new URL(l["x-scalar-secret-redirect-uri"], s).toString();
+      n.searchParams.set("redirect_uri", o);
     } else
-      a.searchParams.set("redirect_uri", l["x-scalar-secret-redirect-uri"]);
-    f["x-scalar-security-query"] && Object.keys(f["x-scalar-security-query"]).forEach((r) => {
-      const o = f["x-scalar-security-query"]?.[r];
-      o && a.searchParams.set(r, o);
-    }), a.searchParams.set("client_id", f["x-scalar-secret-client-id"]), a.searchParams.set("state", s), p && a.searchParams.set("scope", p);
-    const w = window.open(a, "openAuth2Window", "left=100,top=100,width=800,height=600");
-    return w ? new Promise((r) => {
+      n.searchParams.set("redirect_uri", l["x-scalar-secret-redirect-uri"]);
+    f["x-scalar-security-query"] && Object.keys(f["x-scalar-security-query"]).forEach((s) => {
+      const o = f["x-scalar-security-query"]?.[s];
+      o && n.searchParams.set(s, o);
+    }), n.searchParams.set("client_id", f["x-scalar-secret-client-id"]), n.searchParams.set("state", r), p && n.searchParams.set("scope", p);
+    const w = window.open(n, "openAuth2Window", "left=100,top=100,width=800,height=600");
+    return w ? new Promise((s) => {
       const o = setInterval(() => {
-        let d = null, _ = null, x = null, P = null, k = null;
+        let d = null, _ = null, x = null, P = null, y = null;
         try {
           const h = new URL(w.location.href).searchParams, S = f["x-tokenName"] || "access_token";
-          d = h.get(S), _ = h.get("refresh_token"), x = h.get("code"), P = h.get("error"), k = h.get("error_description");
-          const y = new URLSearchParams(w.location.href.split("#")[1]);
-          d ||= y.get(S), _ ||= y.get("refresh_token"), x ||= y.get("code"), P ||= y.get("error"), k ||= y.get("error_description");
+          d = h.get(S), _ = h.get("refresh_token"), x = h.get("code"), P = h.get("error"), y = h.get("error_description");
+          const k = new URLSearchParams(w.location.href.split("#")[1]);
+          d ||= k.get(S), _ ||= k.get("refresh_token"), x ||= k.get("code"), P ||= k.get("error"), y ||= k.get("error_description");
         } catch {
         }
         if (w.closed || d || x || P)
           if (clearInterval(o), w.close(), P)
-            r([new Error(`OAuth error: ${P}${k ? ` (${k})` : ""}`), null]);
+            s([new Error(`OAuth error: ${P}${y ? ` (${y})` : ""}`), null]);
           else if (d) {
             const h = w.location.href.match(/state=([^&]*)/)?.[1];
-            r(h === s ? [null, { accessToken: d, ..._ ? { refreshToken: _ } : {} }] : [new Error("State mismatch"), null]);
-          } else x && e === "authorizationCode" ? new URL(w.location.href).searchParams.get("state") === s ? C(
+            s(h === r ? [null, { accessToken: d, ..._ ? { refreshToken: _ } : {} }] : [new Error("State mismatch"), null]);
+          } else x && e === "authorizationCode" ? new URL(w.location.href).searchParams.get("state") === r ? C(
             t,
             e,
             p,
@@ -89,7 +89,7 @@ const z = (t, e = {}) => {
             },
             u,
             g
-          ).then(r) : r([new Error("State mismatch"), null]) : (clearInterval(o), r([new Error("Window was closed without granting authorization"), null]));
+          ).then(s) : s([new Error("State mismatch"), null]) : (clearInterval(o), s([new Error("Window was closed without granting authorization"), null]));
       }, 200);
     }) : [new Error("Failed to open auth window"), null];
   } catch {
@@ -100,32 +100,35 @@ const z = (t, e = {}) => {
   pkce: m,
   proxyUrl: g
 } = {}, f, p = {}) => {
-  const s = t[e];
-  if (!s)
+  const r = t[e];
+  if (!r)
     return [new Error("OAuth2 flow was not defined"), null];
-  const n = new URLSearchParams();
-  i && (e === "clientCredentials" || e === "password") && n.set("scope", i);
-  const a = s["x-scalar-credentials-location"] === "body";
-  if (a && (n.set("client_id", s["x-scalar-secret-client-id"]), n.set("client_secret", s["x-scalar-secret-client-secret"])), "x-scalar-secret-redirect-uri" in s && s["x-scalar-secret-redirect-uri"] && n.set("redirect_uri", s["x-scalar-secret-redirect-uri"]), u)
-    n.set("code", u), n.set("grant_type", "authorization_code"), m && n.set("code_verifier", m.codeVerifier);
+  const a = new URLSearchParams();
+  i && (e === "clientCredentials" || e === "password") && a.set("scope", i);
+  const n = r["x-scalar-credentials-location"] === "body";
+  if (n && (a.set("client_id", r["x-scalar-secret-client-id"]), a.set("client_secret", r["x-scalar-secret-client-secret"])), "x-scalar-secret-redirect-uri" in r && r["x-scalar-secret-redirect-uri"] && a.set("redirect_uri", r["x-scalar-secret-redirect-uri"]), u)
+    a.set("code", u), a.set("grant_type", "authorization_code"), m && a.set("code_verifier", m.codeVerifier);
   else if (e === "password") {
     const c = t[e];
-    n.set("grant_type", "password"), n.set("username", c["x-scalar-secret-username"]), n.set("password", c["x-scalar-secret-password"]);
+    a.set("grant_type", "password"), a.set("username", c["x-scalar-secret-username"]), a.set("password", c["x-scalar-secret-password"]);
   } else
-    n.set("grant_type", "client_credentials");
-  s["x-scalar-security-body"] && Object.entries(s["x-scalar-security-body"]).forEach(([c, l]) => {
-    l && n.set(c, String(l));
+    a.set("grant_type", "client_credentials");
+  r["x-scalar-security-body"] && Object.entries(r["x-scalar-security-body"]).forEach(([c, l]) => {
+    l && a.set(c, String(l));
   });
   try {
     const c = {
       "Content-Type": "application/x-www-form-urlencoded"
     };
-    a || (c.Authorization = `Basic ${T(`${s["x-scalar-secret-client-id"]}:${s["x-scalar-secret-client-secret"]}`)}`);
-    const l = A(s.tokenUrl, z(f, p)), U = R(g, l) ? `${g}?${new URLSearchParams([["scalar_url", l]]).toString()}` : l, r = await (await fetch(U, {
+    n || (c.Authorization = `Basic ${T(`${r["x-scalar-secret-client-id"]}:${r["x-scalar-secret-client-secret"]}`)}`);
+    const l = A(
+      r["x-scalar-secret-token-url"] ?? r.tokenUrl,
+      z(f, p)
+    ), U = R(g, l) ? `${g}?${new URLSearchParams([["scalar_url", l]]).toString()}` : l, s = await (await fetch(U, {
       method: "POST",
       headers: c,
-      body: n
-    })).json(), o = s["x-tokenName"] || "access_token", d = r[o], _ = r.refresh_token;
+      body: a
+    })).json(), o = r["x-tokenName"] || "access_token", d = s[o], _ = s.refresh_token;
     return [null, { accessToken: d, ...typeof _ == "string" ? { refreshToken: _ } : {} }];
   } catch {
     return [new Error("Failed to get an access token. Please check your credentials."), null];

package/dist/v2/blocks/scalar-auth-selector-block/helpers/secret-types.d.ts

@@ -1,7 +1,7 @@
-import type { XScalarSecretClientId, XScalarSecretClientSecret, XScalarSecretHTTP, XScalarSecretRedirectUri, XScalarSecretRefreshToken, XScalarSecretToken } from '@scalar/workspace-store/schemas/extensions/security';
+import type { XScalarAuthUrl, XScalarSecretClientId, XScalarSecretClientSecret, XScalarSecretHTTP, XScalarSecretRedirectUri, XScalarSecretRefreshToken, XScalarSecretToken, XScalarTokenUrl } from '@scalar/workspace-store/schemas/extensions/security';
 import type { OAuthFlowAuthorizationCode, OAuthFlowClientCredentials, OAuthFlowImplicit, OAuthFlowPassword } from '@scalar/workspace-store/schemas/v3.1/strict/oauth-flow';
 import type { ApiKeyObject, HttpObject, OAuth2Object, OpenIdConnectObject } from '@scalar/workspace-store/schemas/v3.1/strict/openapi-document';
-type OAuthFlowCommonSecret = XScalarSecretClientId & XScalarSecretToken & XScalarSecretRefreshToken;
+type OAuthFlowCommonSecret = XScalarSecretClientId & XScalarSecretToken & XScalarSecretRefreshToken & XScalarAuthUrl & XScalarTokenUrl;
 export type OAuthFlowImplicitSecret = OAuthFlowImplicit & OAuthFlowCommonSecret & XScalarSecretRedirectUri;
 export type OAuthFlowPasswordSecret = OAuthFlowPassword & OAuthFlowCommonSecret & XScalarSecretHTTP & XScalarSecretClientSecret;
 export type OAuthFlowClientCredentialsSecret = OAuthFlowClientCredentials & OAuthFlowCommonSecret & XScalarSecretClientSecret;

package/dist/v2/blocks/scalar-auth-selector-block/helpers/secret-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secret-types.d.ts","sourceRoot":"","sources":["../../../../../src/v2/blocks/scalar-auth-selector-block/helpers/secret-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EACzB,iBAAiB,EACjB,wBAAwB,EACxB,yBAAyB,EACzB,kBAAkB,EACnB,MAAM,qDAAqD,CAAA;AAC5D,OAAO,KAAK,EACV,0BAA0B,EAC1B,0BAA0B,EAC1B,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,wDAAwD,CAAA;AAC/D,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,mBAAmB,EACpB,MAAM,8DAA8D,CAAA;AAErE,KAAK,qBAAqB,GAAG,qBAAqB,GAAG,kBAAkB,GAAG,yBAAyB,CAAA;AAEnG,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG,qBAAqB,GAAG,wBAAwB,CAAA;AAE1G,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GACrD,qBAAqB,GACrB,iBAAiB,GACjB,yBAAyB,CAAA;AAE3B,MAAM,MAAM,gCAAgC,GAAG,0BAA0B,GACvE,qBAAqB,GACrB,yBAAyB,CAAA;AAE3B,MAAM,MAAM,gCAAgC,GAAG,0BAA0B,GACvE,qBAAqB,GACrB,yBAAyB,GACzB,wBAAwB,CAAA;AAE1B,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,EAAE,uBAAuB,CAAA;IAClC,QAAQ,CAAC,EAAE,uBAAuB,CAAA;IAClC,iBAAiB,CAAC,EAAE,gCAAgC,CAAA;IACpD,iBAAiB,CAAC,EAAE,gCAAgC,CAAA;CACrD,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG,kBAAkB,CAAA;AAClE,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,iBAAiB,GAAG,kBAAkB,CAAA;AAClF,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG;IAAE,KAAK,EAAE,sBAAsB,CAAA;CAAE,CAAA;AAChG,MAAM,MAAM,yBAAyB,GAAG,mBAAmB,GAAG;IAAE,KAAK,CAAC,EAAE,sBAAsB,CAAA;CAAE,CAAA;AAEhG,MAAM,MAAM,0BAA0B,GAClC,kBAAkB,GAClB,gBAAgB,GAChB,kBAAkB,GAClB,yBAAyB,CAAA"}
+{"version":3,"file":"secret-types.d.ts","sourceRoot":"","sources":["../../../../../src/v2/blocks/scalar-auth-selector-block/helpers/secret-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EACrB,yBAAyB,EACzB,iBAAiB,EACjB,wBAAwB,EACxB,yBAAyB,EACzB,kBAAkB,EAClB,eAAe,EAChB,MAAM,qDAAqD,CAAA;AAC5D,OAAO,KAAK,EACV,0BAA0B,EAC1B,0BAA0B,EAC1B,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,wDAAwD,CAAA;AAC/D,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,mBAAmB,EACpB,MAAM,8DAA8D,CAAA;AAErE,KAAK,qBAAqB,GAAG,qBAAqB,GAChD,kBAAkB,GAClB,yBAAyB,GACzB,cAAc,GACd,eAAe,CAAA;AAEjB,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG,qBAAqB,GAAG,wBAAwB,CAAA;AAE1G,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GACrD,qBAAqB,GACrB,iBAAiB,GACjB,yBAAyB,CAAA;AAE3B,MAAM,MAAM,gCAAgC,GAAG,0BAA0B,GACvE,qBAAqB,GACrB,yBAAyB,CAAA;AAE3B,MAAM,MAAM,gCAAgC,GAAG,0BAA0B,GACvE,qBAAqB,GACrB,yBAAyB,GACzB,wBAAwB,CAAA;AAE1B,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,EAAE,uBAAuB,CAAA;IAClC,QAAQ,CAAC,EAAE,uBAAuB,CAAA;IAClC,iBAAiB,CAAC,EAAE,gCAAgC,CAAA;IACpD,iBAAiB,CAAC,EAAE,gCAAgC,CAAA;CACrD,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG,kBAAkB,CAAA;AAClE,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,iBAAiB,GAAG,kBAAkB,CAAA;AAClF,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG;IAAE,KAAK,EAAE,sBAAsB,CAAA;CAAE,CAAA;AAChG,MAAM,MAAM,yBAAyB,GAAG,mBAAmB,GAAG;IAAE,KAAK,CAAC,EAAE,sBAAsB,CAAA;CAAE,CAAA;AAEhG,MAAM,MAAM,0BAA0B,GAClC,kBAAkB,GAClB,gBAAgB,GAChB,kBAAkB,GAClB,yBAAyB,CAAA"}

package/dist/v2/components/sidebar/Sidebar.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sidebar.vue.d.ts","sourceRoot":"","sources":["../../../../src/v2/components/sidebar/Sidebar.vue"],"names":[],"mappings":"AA4LA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,YAAY,EAClB,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAA;AAKhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAIrD,KAAK,WAAW,GAAG;IACjB,iDAAiD;IACjD,YAAY,EAAE,YAAY,CAAC,cAAc,CAAC,CAAA;IAC1C,4BAA4B;IAC5B,MAAM,EAAE,YAAY,CAAA;IACpB,qCAAqC;IACrC,eAAe,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;IAC/B,2CAA2C;IAC3C,UAAU,EAAE,cAAc,EAAE,CAAA;IAC5B,+CAA+C;IAC/C,SAAS,EAAE,iBAAiB,EAAE,CAAA;IAC9B;;;;OAIG;IACH,WAAW,CAAC,EACR,OAAO,GACP,CAAC,CAAC,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,CAAA;CACxE,CAAC;AAkBF,KAAK,WAAW,GAAG;IACjB,uCAAuC;IACvC,eAAe,CAAC,IAAI,OAAO,CAAA;IAC3B,sDAAsD;IACtD,SAAS,CAAC,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,cAAc,CAAA;KAAE,GAAG,OAAO,CAAA;IACpD,mDAAmD;IACnD,MAAM,CAAC,IAAI,OAAO,CAAA;IAClB,yDAAyD;IACzD,KAAK,CAAC,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,cAAc,CAAA;KAAE,GAAG,OAAO,CAAA;IAChD,oEAAoE;IACpE,kBAAkB,CAAC,IAAI,OAAO,CAAA;IAC9B,iDAAiD;IACjD,IAAI,CAAC,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,cAAc,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAA;CAC/D,CAAC;AAiCF,KAAK,gBAAgB,GAAG;IACxB,wCAAwC;IACxC,cAAc,EAAE,MAAM,CAAC;CACtB,CAAC;AAKF,KAAK,iBAAiB,GAAG,WAAW,GAAG,gBAAgB,CAAC;AAkRxD,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;kFAGd,CAAC;AACH,QAAA,MAAM,YAAY,EAAS,eAAe,CAAC,OAAO,UAAU,EAAE,WAAW,CAAC,CAAC;wBACtD,OAAO,YAAY;AAAxC,wBAAyC;AACzC,KAAK,eAAe,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IAChC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KACV,CAAA;CACD,CAAC"}
+{"version":3,"file":"Sidebar.vue.d.ts","sourceRoot":"","sources":["../../../../src/v2/components/sidebar/Sidebar.vue"],"names":[],"mappings":"AAqMA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,YAAY,EAClB,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAA;AAKhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAIrD,KAAK,WAAW,GAAG;IACjB,iDAAiD;IACjD,YAAY,EAAE,YAAY,CAAC,cAAc,CAAC,CAAA;IAC1C,4BAA4B;IAC5B,MAAM,EAAE,YAAY,CAAA;IACpB,qCAAqC;IACrC,eAAe,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;IAC/B,2CAA2C;IAC3C,UAAU,EAAE,cAAc,EAAE,CAAA;IAC5B,+CAA+C;IAC/C,SAAS,EAAE,iBAAiB,EAAE,CAAA;IAC9B;;;;OAIG;IACH,WAAW,CAAC,EACR,OAAO,GACP,CAAC,CAAC,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,CAAA;CACxE,CAAC;AAkBF,KAAK,WAAW,GAAG;IACjB,uCAAuC;IACvC,eAAe,CAAC,IAAI,OAAO,CAAA;IAC3B,sDAAsD;IACtD,SAAS,CAAC,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,cAAc,CAAA;KAAE,GAAG,OAAO,CAAA;IACpD,mDAAmD;IACnD,MAAM,CAAC,IAAI,OAAO,CAAA;IAClB,yDAAyD;IACzD,KAAK,CAAC,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,cAAc,CAAA;KAAE,GAAG,OAAO,CAAA;IAChD,oEAAoE;IACpE,kBAAkB,CAAC,IAAI,OAAO,CAAA;IAC9B,iDAAiD;IACjD,IAAI,CAAC,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,cAAc,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAA;CAC/D,CAAC;AAiCF,KAAK,gBAAgB,GAAG;IACxB,wCAAwC;IACxC,cAAc,EAAE,MAAM,CAAC;CACtB,CAAC;AAKF,KAAK,iBAAiB,GAAG,WAAW,GAAG,gBAAgB,CAAC;AAkSxD,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;kFAGd,CAAC;AACH,QAAA,MAAM,YAAY,EAAS,eAAe,CAAC,OAAO,UAAU,EAAE,WAAW,CAAC,CAAC;wBACtD,OAAO,YAAY;AAAxC,wBAAyC;AACzC,KAAK,eAAe,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IAChC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KACV,CAAA;CACD,CAAC"}

package/dist/v2/components/sidebar/Sidebar.vue.js

@@ -1,13 +1,13 @@
-import { defineComponent as V, mergeModels as S, useSlots as h, ref as B, useModel as M, computed as C, createBlock as u, openBlock as l, unref as r, withCtx as s, createVNode as y, createSlots as E, renderSlot as i, createElementBlock as g, createCommentVNode as m, Fragment as N, normalizeProps as f, guardReactiveProps as p, createElementVNode as w, isRef as R } from "vue";
-import { ScalarIconButton as z, ScalarSidebarSearchInput as F } from "@scalar/components";
-import { ScalarIconFileDashed as q, ScalarIconMagnifyingGlass as A } from "@scalar/icons";
-import { ScalarSidebar as U } from "@scalar/sidebar";
-import j from "./SidebarMenu.vue.js";
-import { useSearchIndex as G } from "../../features/search/hooks/use-search-index.js";
-import H from "../resize/Resize.vue.js";
-const J = { class: "bg-sidebar-b-1 z-1 flex flex-col gap-1.5 px-3 pb-1.5" }, K = { class: "flex items-center justify-between" }, L = { key: 1 }, _ = /* @__PURE__ */ V({
+import { defineComponent as V, mergeModels as g, useSlots as B, ref as C, useModel as M, computed as E, createBlock as u, openBlock as r, unref as l, withCtx as s, createVNode as y, createSlots as z, renderSlot as i, createElementBlock as w, createCommentVNode as c, Fragment as N, normalizeProps as f, guardReactiveProps as b, createElementVNode as p, normalizeClass as R, isRef as h } from "vue";
+import { ScalarIconButton as F, ScalarSidebarSearchInput as q } from "@scalar/components";
+import { ScalarIconFileDashed as A, ScalarIconMagnifyingGlass as U } from "@scalar/icons";
+import { ScalarSidebar as j } from "@scalar/sidebar";
+import G from "./SidebarMenu.vue.js";
+import { useSearchIndex as H } from "../../features/search/hooks/use-search-index.js";
+import J from "../resize/Resize.vue.js";
+const K = { class: "flex items-center justify-between" }, L = { key: 1 }, _ = /* @__PURE__ */ V({
   __name: "Sidebar",
-  props: /* @__PURE__ */ S({
+  props: /* @__PURE__ */ g({
     sidebarState: {},
     layout: {},
     activeWorkspace: {},
@@ -21,19 +21,19 @@ const J = { class: "bg-sidebar-b-1 z-1 flex flex-col gap-1.5 px-3 pb-1.5" }, K =
     },
     sidebarWidthModifiers: {}
   }),
-  emits: /* @__PURE__ */ S(["selectItem", "select:workspace", "create:workspace", "reorder", "navigate:to:settings"], ["update:sidebarWidth"]),
+  emits: /* @__PURE__ */ g(["selectItem", "select:workspace", "create:workspace", "reorder", "navigate:to:settings"], ["update:sidebarWidth"]),
   setup(a, { emit: x }) {
-    const n = x, b = h(), d = B(!1), v = M(a, "sidebarWidth"), k = (o) => o.type === "example" && o.title === "draft", { query: c, results: $ } = G(() => a.documents), I = C(() => $.value ?? a.sidebarState.items.value), W = (o) => {
-      n("selectItem", o), c.value = "", d.value = !1;
+    const n = x, v = B(), d = C(!1), k = M(a, "sidebarWidth"), S = (o) => o.type === "example" && o.title === "draft", { query: m, results: $ } = H(() => a.documents), I = E(() => $.value ?? a.sidebarState.items.value), W = (o) => {
+      n("selectItem", o), m.value = "", d.value = !1;
     };
-    return (o, t) => (l(), u(r(H), {
-      width: v.value,
-      "onUpdate:width": t[6] || (t[6] = (e) => v.value = e),
+    return (o, e) => (r(), u(l(J), {
+      width: k.value,
+      "onUpdate:width": e[6] || (e[6] = (t) => k.value = t),
       class: "flex flex-col"
     }, {
       default: s(() => [
-        y(r(U), {
-          class: "mac:pt-10 flex w-auto flex-1 pt-2",
+        y(l(j), {
+          class: "flex w-auto flex-1",
           indent: 20,
           isDraggable: a.layout !== "modal",
           isDroppable: a.isDroppable,
@@ -41,47 +41,53 @@ const J = { class: "bg-sidebar-b-1 z-1 flex flex-col gap-1.5 px-3 pb-1.5" }, K =
           isSelected: a.sidebarState.isSelected,
           items: I.value,
           layout: "client",
-          onReorder: t[5] || (t[5] = (e, D) => n("reorder", e, D)),
+          onReorder: e[5] || (e[5] = (t, D) => n("reorder", t, D)),
           onSelectItem: W
-        }, E({
+        }, z({
           header: s(() => [
-            w("div", J, [
-              w("div", K, [
-                a.layout !== "modal" ? (l(), u(j, {
+            e[7] || (e[7] = p("div", { class: "mac:h-12 mac:app-drag-region h-2" }, null, -1)),
+            p("div", {
+              class: R(["bg-sidebar-b-1 z-1 flex flex-col gap-1.5 px-3 pb-1.5", { "max-md:pt-12": a.layout !== "modal" }])
+            }, [
+              p("div", K, [
+                a.layout !== "modal" ? (r(), u(G, {
                   key: 0,
                   activeWorkspace: a.activeWorkspace,
                   workspaces: a.workspaces,
-                  "onCreate:workspace": t[0] || (t[0] = (e) => n("create:workspace")),
-                  "onNavigate:to:settings": t[1] || (t[1] = (e) => n("navigate:to:settings")),
-                  "onSelect:workspace": t[2] || (t[2] = (e) => n("select:workspace", e))
+                  "onCreate:workspace": e[0] || (e[0] = (t) => n("create:workspace")),
+                  "onNavigate:to:settings": e[1] || (e[1] = (t) => n("navigate:to:settings")),
+                  "onSelect:workspace": e[2] || (e[2] = (t) => n("select:workspace", t))
                 }, {
                   sidebarMenuActions: s(() => [
                     i(o.$slots, "sidebarMenuActions")
                   ]),
                   _: 3
-                }, 8, ["activeWorkspace", "workspaces"])) : a.layout === "modal" ? (l(), g("div", L)) : m("", !0),
-                y(r(z), {
-                  icon: r(A),
+                }, 8, ["activeWorkspace", "workspaces"])) : a.layout === "modal" ? (r(), w("div", L)) : c("", !0),
+                y(l(F), {
+                  icon: l(U),
                   label: "Search",
-                  onClick: t[3] || (t[3] = (e) => d.value = !d.value)
+                  onClick: e[3] || (e[3] = (t) => d.value = !d.value)
                 }, null, 8, ["icon"])
               ]),
-              d.value ? (l(), u(r(F), {
+              d.value ? (r(), u(l(q), {
                 key: 0,
-                modelValue: r(c),
-                "onUpdate:modelValue": t[4] || (t[4] = (e) => R(c) ? c.value = e : null),
+                modelValue: l(m),
+                "onUpdate:modelValue": e[4] || (e[4] = (t) => h(m) ? m.value = t : null),
                 autofocus: ""
-              }, null, 8, ["modelValue"])) : m("", !0)
-            ])
+              }, null, 8, ["modelValue"])) : c("", !0)
+            ], 2)
           ]),
-          decorator: s((e) => [
-            i(o.$slots, "decorator", f(p(e)))
+          spacer: s(() => [
+            e[8] || (e[8] = p("div", { class: "mac:app-drag-region flex-1" }, null, -1))
           ]),
-          icon: s((e) => [
-            b.icon || k(e.item) ? (l(), g(N, { key: 0 }, [
-              k(e.item) ? (l(), u(r(q), { key: 0 })) : m("", !0),
-              i(o.$slots, "icon", f(p(e)))
-            ], 64)) : m("", !0)
+          decorator: s((t) => [
+            i(o.$slots, "decorator", f(b(t)))
+          ]),
+          icon: s((t) => [
+            v.icon || S(t.item) ? (r(), w(N, { key: 0 }, [
+              S(t.item) ? (r(), u(l(A), { key: 0 })) : c("", !0),
+              i(o.$slots, "icon", f(b(t)))
+            ], 64)) : c("", !0)
           ]),
           before: s(() => [
             i(o.$slots, "workspaceButton")
@@ -91,10 +97,10 @@ const J = { class: "bg-sidebar-b-1 z-1 flex flex-col gap-1.5 px-3 pb-1.5" }, K =
           ]),
           _: 2
         }, [
-          b.empty ? {
+          v.empty ? {
             name: "empty",
-            fn: s((e) => [
-              i(o.$slots, "empty", f(p(e)))
+            fn: s((t) => [
+              i(o.$slots, "empty", f(b(t)))
             ]),
             key: "0"
           } : void 0

package/dist/v2/features/app/App.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.vue.d.ts","sourceRoot":"","sources":["../../../../src/v2/features/app/App.vue"],"names":[],"mappings":"AA4OA,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAW7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+DAA+D,CAAA;AAIxG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAErD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAA;AAK3C;;;;GAIG;wBACkB,OAAO,YAAY;AAAxC,wBAAyC;AAGzC,QAAA,MAAM,YAAY;YAER,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC;cAC5B,YAAY,EAAE;iBACX,MAAM,QAAQ;4BACH,MAAM,mBAAmB;;;;YAHzC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC;cAC5B,YAAY,EAAE;iBACX,MAAM,QAAQ;4BACH,MAAM,mBAAmB;;IAWjD;;;OAGG;4BACqB,MAAM,OAAO;IACrC;;;OAGG;yBACkB,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,KAAK,OAAO;EAgU9D,CAAC;AACL,KAAK,eAAe,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IAChC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KACV,CAAA;CACD,CAAC"}
+{"version":3,"file":"App.vue.d.ts","sourceRoot":"","sources":["../../../../src/v2/features/app/App.vue"],"names":[],"mappings":"AAgPA,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAY7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+DAA+D,CAAA;AAIxG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAErD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAA;AAK3C;;;;GAIG;wBACkB,OAAO,YAAY;AAAxC,wBAAyC;AAGzC,QAAA,MAAM,YAAY;YAER,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC;cAC5B,YAAY,EAAE;iBACX,MAAM,QAAQ;4BACH,MAAM,mBAAmB;;;;YAHzC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC;cAC5B,YAAY,EAAE;iBACX,MAAM,QAAQ;4BACH,MAAM,mBAAmB;;IAWjD;;;OAGG;4BACqB,MAAM,OAAO;IACrC;;;OAGG;yBACkB,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,KAAK,OAAO;EAmV9D,CAAC;AACL,KAAK,eAAe,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IAChC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KACV,CAAA;CACD,CAAC"}