@scalar/api-client 2.1.51 → 2.2.0

package/dist/views/Request/libs/live-sync.js

@@ -1,66 +1,66 @@
 import { isHTTPMethod as D } from "../../../components/HttpMethod/helpers.js";
-import { collectionSchema as b, requestSchema as O, serverSchema as V, tagSchema as M, oasOauthFlowSchema as H, securitySchemeSchema as S, createExampleFromRequest as j } from "@scalar/oas-utils/entities/spec";
+import { collectionSchema as b, requestSchema as O, serverSchema as V, tagSchema as M, securitySchemeSchema as S, createExampleFromRequest as H } from "@scalar/oas-utils/entities/spec";
 import { schemaModel as R } from "@scalar/oas-utils/helpers";
-import { getNestedValue as N } from "@scalar/object-utils/nested";
-import G from "microdiff";
+import { getNestedValue as Z } from "@scalar/object-utils/nested";
+import j from "microdiff";
 import { z as i } from "zod";
-const x = (e, r = []) => {
+const x = (e, s = []) => {
   const t = [];
-  let s = !1;
-  for (let u = 0; u < e.length; u++) {
-    if (s) {
-      s = !1;
+  let a = !1;
+  for (let n = 0; n < e.length; n++) {
+    if (a) {
+      a = !1;
       continue;
     }
-    const a = e[u], n = e[u + 1];
-    if (r.length)
-      a.path = [...r, ...a.path], n && (n.path = [...r, ...n.path]);
-    else if (a.path[0] !== "paths") {
-      t.push(a);
+    const r = e[n], u = e[n + 1];
+    if (s.length)
+      r.path = [...s, ...r.path], u && (u.path = [...s, ...u.path]);
+    else if (r.path[0] !== "paths") {
+      t.push(r);
       continue;
     }
-    if (a.type === "REMOVE" && (n == null ? void 0 : n.type) === "CREATE") {
-      const [, h, p] = a.path, [, o, l] = n.path, c = ["paths", o];
-      if (h !== o && t.push({
+    if (r.type === "REMOVE" && (u == null ? void 0 : u.type) === "CREATE") {
+      const [, l, p] = r.path, [, o, h] = u.path, c = ["paths", o];
+      if (l !== o && t.push({
         type: "CHANGE",
         path: ["paths", "path"],
-        oldValue: h,
+        oldValue: l,
         value: o
-      }), p && l && p !== l && (t.push({
+      }), p && h && p !== h && (t.push({
         type: "CHANGE",
         path: ["paths", o, "method"],
         oldValue: p,
-        value: l
-      }), c.push(l)), r.length === 0) {
-        const m = G(a.oldValue, n.value);
-        if (m.length) {
-          const E = x(m, c);
-          t.push(...E);
+        value: h
+      }), c.push(h)), s.length === 0) {
+        const y = j(r.oldValue, u.value);
+        if (y.length) {
+          const f = x(y, c);
+          t.push(...f);
         }
       }
-      s = !0;
-    } else a.type === "CREATE" && a.path.length > 3 && typeof a.path.at(-1) != "number" ? t.push({ ...a, type: "CHANGE", oldValue: void 0 }) : a.type === "REMOVE" && a.path.length > 3 && typeof a.path.at(-1) != "number" ? t.push({ ...a, type: "CHANGE", value: void 0 }) : t.push(a);
+      a = !0;
+    } else r.type === "CREATE" && r.path.length > 3 && typeof r.path.at(-1) != "number" ? t.push({ ...r, type: "CHANGE", oldValue: void 0 }) : r.type === "REMOVE" && r.path.length > 3 && typeof r.path.at(-1) != "number" ? t.push({ ...r, type: "CHANGE", value: void 0 }) : t.push(r);
   }
   return t;
-}, v = (e, r, t) => {
-  for (const s of e) {
-    const u = r[s];
-    if (t(u)) return u;
+}, v = (e, s, t) => {
+  for (const a of e) {
+    const n = s[a];
+    if (t(n)) return n;
   }
   return null;
-}, y = (e) => e instanceof i.ZodOptional ? y(e.unwrap()) : e instanceof i.ZodDefault ? y(e._def.innerType) : e, C = (e, r) => {
+}, d = (e) => e instanceof i.ZodOptional ? d(e.unwrap()) : e instanceof i.ZodDefault ? d(e._def.innerType) : e, G = (e, s) => {
   let t = e;
-  for (const s of r) {
-    if (t = y(t), t instanceof i.ZodAny)
+  for (const a of s) {
+    if (t = d(t), t instanceof i.ZodAny)
       return t;
-    if (t instanceof i.ZodObject && typeof s == "string" && s in t.shape)
-      t = t.shape[s];
+    if (t instanceof i.ZodObject && typeof a == "string" && a in t.shape)
+      t = t.shape[a];
     else if (t instanceof i.ZodArray)
-      if (typeof s == "number")
+      if (typeof a == "number")
         t = t.element;
-      else if (typeof s == "string")
-        if (t = t.element, t instanceof i.ZodObject && s in t.shape)
-          t = t.shape[s];
+      else if (typeof a == "string")
+        if (t = t.element, t instanceof i.ZodObject && a in t.shape)
+          t = t.shape[a];
         else
           return null;
       else
@@ -69,209 +69,188 @@ const x = (e, r = []) => {
       t = t.valueSchema;
     else
       return null;
-    t = y(t);
+    t = d(t);
   }
   return t;
-}, f = (e, r) => {
-  const t = C(e, r.path);
+}, m = (e, s) => {
+  const t = G(e, s.path);
   if (!t) return null;
-  const s = r.path.join("."), u = r.path.slice(0, -1).join(".");
-  if (r.type === "REMOVE")
+  const a = s.path.join("."), n = s.path.slice(0, -1).join(".");
+  if (s.type === "REMOVE")
     return {
-      path: s,
-      pathMinusOne: u,
+      path: a,
+      pathMinusOne: n,
       value: void 0
     };
-  const a = R(r.value, t, !1);
-  return a ? {
-    path: s,
-    pathMinusOne: u,
-    value: a
+  const r = R(s.value, t, !1);
+  return r ? {
+    path: a,
+    pathMinusOne: n,
+    value: r
   } : null;
-}, K = (e, { activeCollection: r, collectionMutators: t }) => {
-  if (!r.value) return !1;
+}, K = (e, { activeCollection: s }, { collectionMutators: t }) => {
+  if (!s.value) return !1;
   if (typeof e.path[e.path.length - 1] == "number" && (e.type === "CREATE" || e.type === "REMOVE")) {
-    const s = f(b, {
+    const a = m(b, {
       ...e,
       path: e.path
     });
-    if (!s) return !1;
-    const u = [
-      ...N(r.value, s.pathMinusOne)
+    if (!a) return !1;
+    const n = [
+      ...Z(s.value, a.pathMinusOne)
     ];
-    e.type === "CREATE" ? u.push(s.value) : e.type === "REMOVE" && u.pop(), t.edit(
-      r.value.uid,
-      s.pathMinusOne,
-      u
+    e.type === "CREATE" ? n.push(a.value) : e.type === "REMOVE" && n.pop(), t.edit(
+      s.value.uid,
+      a.pathMinusOne,
+      n
     );
   } else {
-    const s = f(b, e);
-    if (!s) return !1;
+    const a = m(b, e);
+    if (!a) return !1;
     t.edit(
-      r.value.uid,
-      s.path,
-      s.value
+      s.value.uid,
+      a.path,
+      a.value
     );
   }
   return !0;
-}, T = (e, r) => {
-  const { requests: t, requestExamples: s, requestExampleMutators: u } = r, a = t[e];
-  a == null || a.examples.forEach((n) => {
-    const h = j(
-      a,
-      s[n].name
+}, T = (e, s) => {
+  const { requests: t, requestExamples: a, requestExampleMutators: n } = s, r = t[e];
+  r == null || r.examples.forEach((u) => {
+    const l = H(
+      r,
+      a[u].name
     );
-    h && u.set({
-      ...h,
-      uid: n
+    l && n.set({
+      ...l,
+      uid: u
     });
   });
-}, L = (e, r) => {
-  const { activeCollection: t, requests: s, requestMutators: u } = r;
-  if (!t.value) return !1;
-  const [, a, n, ...h] = e.path;
-  if (a === "path" && e.type === "CHANGE")
-    t.value.requests.forEach((p) => {
-      s[p].path === e.oldValue && u.edit(p, "path", e.value);
+}, L = (e, { activeCollection: s }, t) => {
+  if (!s.value) return !1;
+  const { requests: a, requestMutators: n } = t, [, r, u, ...l] = e.path;
+  if (r === "path" && e.type === "CHANGE")
+    s.value.requests.forEach((p) => {
+      a[p].path === e.oldValue && n.edit(p, "path", e.value);
     });
-  else if (n === "method" && e.type === "CHANGE")
-    t.value.requests.forEach((p) => {
-      s[p].method === e.oldValue && s[p].path === a && u.edit(p, "method", e.value);
+  else if (u === "method" && e.type === "CHANGE")
+    s.value.requests.forEach((p) => {
+      a[p].method === e.oldValue && a[p].path === r && n.edit(p, "method", e.value);
     });
-  else if (e.type !== "CHANGE" && typeof h.at(-1) == "number") {
+  else if (e.type !== "CHANGE" && typeof l.at(-1) == "number") {
     const p = v(
-      t.value.requests,
-      s,
-      (c) => c.path === a && c.method === n
-    ), o = f(O, {
+      s.value.requests,
+      a,
+      (c) => c.path === r && c.method === u
+    ), o = m(O, {
       ...e,
       path: e.path.slice(3)
     });
     if (!p || !o) return !1;
-    const l = [...N(p, o.pathMinusOne)];
-    e.type === "CREATE" ? l.push(o.value) : e.type === "REMOVE" && l.pop(), u.edit(p.uid, o.pathMinusOne, l), (e.path[3] === "parameters" || e.path[3] === "requestBody") && T(p.uid, r);
+    const h = [...Z(p, o.pathMinusOne)];
+    e.type === "CREATE" ? h.push(o.value) : e.type === "REMOVE" && h.pop(), n.edit(p.uid, o.pathMinusOne, h), (e.path[3] === "parameters" || e.path[3] === "requestBody") && T(p.uid, t);
   } else if (e.type === "CREATE") {
-    const [[p, o]] = Object.entries(e.value), l = n ? e.value : o, c = n || p, m = V.array().parse(l.servers ?? []), { security: E, ...Z } = l, g = {
-      ...Z,
+    const [[p, o]] = Object.entries(e.value), h = u ? e.value : o, c = u || p, y = V.array().parse(h.servers ?? []), { security: f, ...N } = h, g = {
+      ...N,
       method: D(c) ? c : "get",
-      path: a,
-      parameters: l.parameters ?? [],
-      servers: m.map((d) => d.uid)
+      path: r,
+      parameters: h.parameters ?? [],
+      servers: y.map((E) => E.uid)
     };
-    E != null && E.length && (g.security = E.map((d) => {
-      if (Object.keys(d).length) {
-        const [q] = Object.keys(d);
+    f != null && f.length && (g.security = f.map((E) => {
+      if (Object.keys(E).length) {
+        const [A] = Object.keys(E);
         return {
-          [q]: d[q]
+          [A]: E[A]
         };
-      } else return d;
+      } else return E;
     }));
-    const A = R(g, O, !1);
-    if (!A) return !1;
-    u.add(A, t.value.uid);
+    const q = R(g, O, !1);
+    if (!q) return !1;
+    n.add(q, s.value.uid);
   } else if (e.type === "REMOVE") {
     const p = v(
-      t.value.requests,
-      s,
-      (o) => o.path === a && o.method === n
+      s.value.requests,
+      a,
+      (o) => o.path === r && o.method === u
     );
     if (!p) return !1;
-    u.delete(p, t.value.uid);
+    n.delete(p, s.value.uid);
   } else if (e.type === "CHANGE") {
     const p = v(
-      t.value.requests,
-      s,
-      (l) => l.path === a && l.method === n
-    ), o = f(O, { ...e, path: h });
+      s.value.requests,
+      a,
+      (h) => h.path === r && h.method === u
+    ), o = m(O, { ...e, path: l });
     if (!p || !o) return !1;
-    u.edit(p.uid, o.path, o.value), (e.path[3] === "parameters" || e.path[3] === "requestBody") && T(p.uid, r);
+    n.edit(p.uid, o.path, o.value), (e.path[3] === "parameters" || e.path[3] === "requestBody") && T(p.uid, t);
   }
   return !0;
-}, W = (e, { activeCollection: r, servers: t, serverMutators: s }) => {
-  if (!r.value) return !1;
-  const [, u, ...a] = e.path;
-  if (a != null && a.length) {
-    const n = r.value.servers[u], h = t[n], p = f(V, { ...e, path: a });
-    if (!h || !p) return !1;
-    const l = e.type === "REMOVE" && a[a.length - 1] === "variables" ? {} : p.value;
-    s.edit(n, p.path, l);
+}, W = (e, { activeCollection: s }, { servers: t, serverMutators: a }) => {
+  if (!s.value) return !1;
+  const [, n, ...r] = e.path;
+  if (r != null && r.length) {
+    const u = s.value.servers[n], l = t[u], p = m(V, { ...e, path: r });
+    if (!l || !p) return !1;
+    const h = e.type === "REMOVE" && r[r.length - 1] === "variables" ? {} : p.value;
+    a.edit(u, p.path, h);
   } else if (e.type === "REMOVE") {
-    if (!r.value.servers[u]) return !1;
-    s.delete(
-      r.value.servers[u],
-      r.value.uid
+    if (!s.value.servers[n]) return !1;
+    a.delete(
+      s.value.servers[n],
+      s.value.uid
     );
   } else if (e.type === "CREATE") {
-    const n = R(e.value, V, !1);
-    if (!n) return !1;
-    s.add(n, r.value.uid);
+    const u = R(e.value, V, !1);
+    if (!u) return !1;
+    a.add(u, s.value.uid);
   }
   return !0;
-}, I = (e, { activeCollection: r, tags: t, tagMutators: s }) => {
-  if (!r.value) return !1;
-  const [, u, ...a] = e.path;
-  if (a != null && a.length) {
-    const n = r.value.tags[u], h = t[n], p = f(M, { ...e, path: a });
-    if (!h || !p) return !1;
-    s.edit(n, p.path, p.value);
+}, I = (e, { activeCollection: s }, { tags: t, tagMutators: a }) => {
+  if (!s.value) return !1;
+  const [, n, ...r] = e.path;
+  if (r != null && r.length) {
+    const u = s.value.tags[n], l = t[u], p = m(M, { ...e, path: r });
+    if (!l || !p) return !1;
+    a.edit(u, p.path, p.value);
   } else if (e.type === "REMOVE") {
-    const n = r.value.tags[u], h = t[n];
-    if (!h) return !1;
-    s.delete(h, r.value.uid);
+    const u = s.value.tags[n], l = t[u];
+    if (!l) return !1;
+    a.delete(l, s.value.uid);
   } else if (e.type === "CREATE") {
-    const n = R(e.value, M, !1);
-    if (!n) return !1;
-    s.add(n, r.value.uid);
+    const u = R(e.value, M, !1);
+    if (!u) return !1;
+    a.add(u, s.value.uid);
   }
   return !0;
-}, w = (e, r, t) => {
-  const s = y(e);
-  if (s instanceof i.ZodUnion || s instanceof i.ZodDiscriminatedUnion) {
-    for (const u of s.options)
-      if (u instanceof i.ZodObject && r in u.shape && u.shape[r] instanceof i.ZodLiteral && u.shape[r].value === t)
-        return u;
+}, w = (e, s, t) => {
+  const a = d(e);
+  if (a instanceof i.ZodUnion || a instanceof i.ZodDiscriminatedUnion) {
+    for (const n of a.options)
+      if (n instanceof i.ZodObject && s in n.shape && n.shape[s] instanceof i.ZodLiteral && n.shape[s].value === t)
+        return n;
   }
   return null;
-}, J = (e, { activeCollection: r, securitySchemes: t, securitySchemeMutators: s }) => {
-  var h;
-  if (!r.value) return !1;
-  const [, , u, ...a] = e.path, n = t[u] ?? v(
-    r.value.securitySchemes,
+}, J = (e, { activeCollection: s }, { securitySchemes: t, securitySchemeMutators: a }) => {
+  if (!s.value) return !1;
+  const [, , n, ...r] = e.path, u = t[n] ?? v(
+    s.value.securitySchemes,
     t,
-    (p) => p.nameKey === u
+    (l) => l.nameKey === n
   );
-  if (a != null && a.length) {
-    if (!n) return !1;
-    const { schema: p, _path: o } = a[0] === "flows" && n.type === "oauth2" ? {
-      schema: w(
-        H,
-        "type",
-        (h = n == null ? void 0 : n.flow) == null ? void 0 : h.type
-      ),
-      _path: a.slice(2)
-    } : {
-      schema: w(
-        S,
-        "type",
-        n == null ? void 0 : n.type
-      ),
-      _path: a
-    };
-    if (o[0] === "scopes" && n.type === "oauth2") {
-      const m = { ...n.flow.scopes };
-      return e.type === "CREATE" || e.type === "CHANGE" ? m[o[1]] = e.value : delete m[o[1]], s.edit(n.uid, "flow.scopes", m), !0;
-    }
-    if (!p) return !1;
-    const l = f(p, { ...e, path: o });
+  if (r != null && r.length) {
+    const l = w(S, "type", u == null ? void 0 : u.type);
     if (!l) return !1;
-    const c = a[0] === "flows" ? ["flow", ...o].join(".") : l.path;
-    s.edit(n.uid, c, l.value);
+    const p = m(l, { ...e, path: r });
+    if (!p) return !1;
+    const o = p.path;
+    a.edit(u.uid, o, p.value);
   } else if (e.type === "REMOVE") {
-    if (!n) return !1;
-    s.delete(n.uid);
-  } else e.type === "CREATE" && s.add(
+    if (!u) return !1;
+    a.delete(u.uid);
+  } else e.type === "CREATE" && a.add(
     S.parse(e.value),
-    r.value.uid
+    s.value.uid
   );
   return !0;
 };
@@ -284,6 +263,6 @@ export {
   W as mutateServerDiff,
   I as mutateTagDiff,
   w as narrowUnionSchema,
-  f as parseDiff,
-  C as traverseZodSchema
+  m as parseDiff,
+  G as traverseZodSchema
 };

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

@@ -1,13 +1,9 @@
 import type { ErrorResponse } from '../../../libs/index.js';
-import type { SecuritySchemeExampleValue, SecuritySchemeOauth2, SecuritySchemeOauth2ExampleValue, Server } from '@scalar/oas-utils/entities/spec';
+import type { Oauth2Flow, Server } from '@scalar/oas-utils/entities/spec';
 /** Oauth2 security schemes which are not implicit */
-type SecuritySchemeOauth2NonImplicit = Omit<SecuritySchemeOauth2, 'flow'> & {
-    flow: Exclude<SecuritySchemeOauth2['flow'], {
-        type: 'implicit';
-    }>;
-};
-/** Type guard to check for oauth2 example */
-export declare const isOauth2Example: (example: SecuritySchemeExampleValue) => example is SecuritySchemeOauth2ExampleValue;
+type NonImplicitFlow = Exclude<Oauth2Flow, {
+    type: 'implicit';
+}>;
 type PKCEState = {
     codeVerifier: string;
     codeChallenge: string;
@@ -22,11 +18,11 @@ export declare const generateCodeChallenge: (verifier: string, encoding: "SHA-25
  *
  * @returns the accessToken
  */
-export declare const authorizeOauth2: (scheme: SecuritySchemeOauth2, example: SecuritySchemeOauth2ExampleValue, activeServer: Server) => Promise<ErrorResponse<string>>;
+export declare const authorizeOauth2: (flow: Oauth2Flow, activeServer: Server) => Promise<ErrorResponse<string>>;
 /**
  * Makes the BE authorization call to grab the token server to server
  * Used for clientCredentials and authorizationCode
  */
-export declare const authorizeServers: (scheme: SecuritySchemeOauth2NonImplicit, example: SecuritySchemeOauth2ExampleValue, scopes: string, code?: string, pkce?: PKCEState | null) => Promise<ErrorResponse<string>>;
+export declare const authorizeServers: (flow: NonImplicitFlow, scopes: string, code?: string, pkce?: PKCEState | null) => Promise<ErrorResponse<string>>;
 export {};
 //# sourceMappingURL=oauth2.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"oauth2.d.ts","sourceRoot":"","sources":["../../../../src/views/Request/libs/oauth2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AAC3C,OAAO,KAAK,EACV,0BAA0B,EAC1B,oBAAoB,EACpB,gCAAgC,EAChC,MAAM,EACP,MAAM,iCAAiC,CAAA;AAExC,qDAAqD;AACrD,KAAK,+BAA+B,GAAG,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,GAAG;IAC1E,IAAI,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,CAAA;CAClE,CAAA;AAED,6CAA6C;AAC7C,eAAO,MAAM,eAAe,YACjB,0BAA0B,KAClC,OAAO,IAAI,gCACoB,CAAA;AAElC,KAAK,SAAS,GAAG;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,mBAAmB,EAAE,MAAM,CAAA;CAC5B,CAAA;AAmBD;;GAEG;AACH,eAAO,MAAM,qBAAqB,aACtB,MAAM,YACN,SAAS,GAAG,OAAO,KAC5B,OAAO,CAAC,MAAM,CAahB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,WAClB,oBAAoB,WACnB,gCAAgC,gBAE3B,MAAM,KACnB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CA8J/B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,WACnB,+BAA+B,WAC9B,gCAAgC,UACjC,MAAM,SACP,MAAM,SACN,SAAS,GAAG,IAAI,KACtB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAgE/B,CAAA"}
+{"version":3,"file":"oauth2.d.ts","sourceRoot":"","sources":["../../../../src/views/Request/libs/oauth2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AAC3C,OAAO,KAAK,EACV,UAAU,EAEV,MAAM,EACP,MAAM,iCAAiC,CAAA;AAExC,qDAAqD;AACrD,KAAK,eAAe,GAAG,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,CAAA;AAEhE,KAAK,SAAS,GAAG;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,mBAAmB,EAAE,MAAM,CAAA;CAC5B,CAAA;AAmBD;;GAEG;AACH,eAAO,MAAM,qBAAqB,aACtB,MAAM,YACN,SAAS,GAAG,OAAO,KAC5B,OAAO,CAAC,MAAM,CAahB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,SACpB,UAAU,gBAEF,MAAM,KACnB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAqJ/B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,SACrB,eAAe,UACb,MAAM,SACP,MAAM,SACN,SAAS,GAAG,IAAI,KACtB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAwD/B,CAAA"}