@scalar/api-client 2.6.1 → 2.7.0

package/dist/views/Request/libs/watch-mode.js

@@ -1,282 +1,337 @@
-import { collectionSchema as M, requestSchema as O, serverSchema as V, tagSchema as S, securitySchemeSchema as Z, createExampleFromRequest as x } from "@scalar/oas-utils/entities/spec";
-import { schemaModel as v, isHttpMethod as k } from "@scalar/oas-utils/helpers";
-import { getNestedValue as D } from "@scalar/object-utils/nested";
-import H from "microdiff";
-import { z as i } from "zod";
-const j = (e, s = []) => {
+import { collectionSchema as A, requestSchema as O, serverSchema as R, tagSchema as b, securitySchemeSchema as S, createExampleFromRequest as D } from "@scalar/oas-utils/entities/spec";
+import { schemaModel as v, isHttpMethod as N } from "@scalar/oas-utils/helpers";
+import { getNestedValue as M } from "@scalar/object-utils/nested";
+import k from "microdiff";
+import { z as p } from "zod";
+const x = (e, n = []) => {
   const t = [];
-  let a = !1;
-  for (let r = 0; r < e.length; r++) {
-    if (a) {
-      a = !1;
+  let s = !1;
+  for (let u = 0; u < e.length; u++) {
+    if (s) {
+      s = !1;
       continue;
     }
-    const n = e[r], u = e[r + 1];
-    if (n) {
-      if (s.length)
-        n.path = [...s, ...n.path], u && (u.path = [...s, ...u.path]);
-      else if (n.path[0] !== "paths") {
-        t.push(n);
+    const a = e[u], r = e[u + 1];
+    if (a) {
+      if (n.length)
+        a.path = [...n, ...a.path], r && (r.path = [...n, ...r.path]);
+      else if (a.path[0] !== "paths") {
+        t.push(a);
         continue;
       }
-      if (n.type === "REMOVE" && u?.type === "CREATE") {
-        const [, l, p] = n.path, [, o, h] = u.path, c = ["paths", o].filter((f) => typeof f == "string");
-        if (l !== o && t.push({
+      if (a.type === "REMOVE" && r?.type === "CREATE") {
+        const [, i, o] = a.path, [, l, f] = r.path, c = ["paths", l].filter((d) => typeof d == "string");
+        if (i !== l && t.push({
           type: "CHANGE",
           path: ["paths", "path"],
-          oldValue: l,
-          value: o
-        }), p && typeof h == "string" && p !== h && o && (t.push({
+          oldValue: i,
+          value: l
+        }), o && typeof f == "string" && o !== f && l && (t.push({
           type: "CHANGE",
-          path: ["paths", o, "method"],
-          oldValue: p,
-          value: h
-        }), c.push(h)), s.length === 0) {
-          const f = H(n.oldValue, u.value);
-          if (f.length) {
-            const R = j(f, c);
-            t.push(...R);
+          path: ["paths", l, "method"],
+          oldValue: o,
+          value: f
+        }), c.push(f)), n.length === 0) {
+          const d = k(a.oldValue, r.value);
+          if (d.length) {
+            const T = x(d, c);
+            t.push(...T);
           }
         }
-        a = !0;
-      } else n.type === "CREATE" && n.path.length > 3 && typeof n.path.at(-1) != "number" ? t.push({ ...n, type: "CHANGE", oldValue: void 0 }) : n.type === "REMOVE" && n.path.length > 3 && typeof n.path.at(-1) != "number" ? t.push({ ...n, type: "CHANGE", value: void 0 }) : t.push(n);
+        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);
     }
   }
   return t;
-}, E = (e, s, t) => {
-  for (const a of e) {
-    const r = s[a];
-    if (r && t(r))
-      return r;
+}, E = (e, n, t) => {
+  for (const s of e) {
+    const u = n[s];
+    if (u && t(u))
+      return u;
   }
   return null;
-}, y = (e) => e instanceof i.ZodOptional ? y(e.unwrap()) : e instanceof i.ZodDefault ? y(e._def.innerType) : e instanceof i.ZodEffects ? y(e._def.schema) : e instanceof i.ZodCatch ? y(e._def.innerType) : e, G = (e, s) => {
+}, h = (e) => {
+  if (e instanceof p.ZodOptional) {
+    const n = e.unwrap();
+    if (n instanceof p.ZodType)
+      return h(n);
+  }
+  if (e instanceof p.ZodDefault) {
+    const n = e._zod.def.innerType;
+    if (n instanceof p.ZodType)
+      return h(n);
+  }
+  if (e instanceof p.ZodCatch) {
+    const n = e._zod.def.innerType;
+    if (n instanceof p.ZodType)
+      return h(n);
+  }
+  if (e instanceof p.ZodPipe) {
+    const n = e._zod.def.in;
+    if (n instanceof p.ZodType)
+      return h(n);
+  }
+  return e;
+}, H = (e, n) => {
   let t = e;
-  for (const a of s) {
-    if (t = y(t), t instanceof i.ZodAny)
+  for (const s of n) {
+    if (t = h(t), t instanceof p.ZodAny)
       return t;
-    if (t instanceof i.ZodObject && typeof a == "string" && a in t.shape)
-      t = t.shape[a];
-    else if (t instanceof i.ZodArray)
-      if (typeof a == "number")
-        t = t.element;
-      else if (typeof a == "string")
-        if (t = t.element, t instanceof i.ZodObject && a in t.shape)
-          t = t.shape[a];
+    if (t instanceof p.ZodObject && typeof s == "string" && s in t.shape) {
+      const u = t.shape[s];
+      if (u instanceof p.ZodType)
+        t = u;
+      else
+        return null;
+    } else if (t instanceof p.ZodArray)
+      if (typeof s == "number")
+        if (t.element instanceof p.ZodType)
+          t = t.element;
         else
           return null;
-      else
+      else if (typeof s == "string") {
+        if (t.element instanceof p.ZodType)
+          t = t.element;
+        else
+          return null;
+        if (t instanceof p.ZodObject && s in t.shape) {
+          const u = t.shape[s];
+          if (u instanceof p.ZodType)
+            t = u;
+          else
+            return null;
+        } else
+          return null;
+      } else
+        return null;
+    else if (t instanceof p.ZodRecord) {
+      const u = t._zod.def.valueType;
+      if (!u || !(u instanceof p.ZodType))
         return null;
-    else if (t instanceof i.ZodRecord)
-      t = t.valueSchema;
-    else
+      if (typeof s == "string")
+        t = u, t = h(t);
+      else if (typeof s == "number") {
+        if (t = u, t = h(t), t instanceof p.ZodArray)
+          if (t.element instanceof p.ZodType)
+            t = t.element;
+          else
+            return null;
+      } else
+        t = u;
+    } else
       return null;
-    t = y(t);
+    t = h(t);
   }
   return t;
-}, d = (e, s) => {
-  const t = G(e, s.path);
+}, m = (e, n) => {
+  const t = H(e, n.path);
   if (!t)
     return null;
-  const a = s.path.join("."), r = s.path.slice(0, -1).join(".");
-  if (s.type === "REMOVE")
+  const s = n.path.join("."), u = n.path.slice(0, -1).join(".");
+  if (n.type === "REMOVE")
     return {
-      path: a,
-      pathMinusOne: r,
+      path: s,
+      pathMinusOne: u,
       value: void 0
     };
-  const n = v(s.value, t, !1);
-  return typeof n > "u" || n === null ? null : {
-    path: a,
-    pathMinusOne: r,
-    value: n
+  const a = v(n.value, t, !1);
+  return typeof a > "u" || a === null ? null : {
+    path: s,
+    pathMinusOne: u,
+    value: a
   };
-}, L = (e, { activeCollection: s }, { collectionMutators: t }) => {
-  if (!s.value)
+}, F = (e, { activeCollection: n }, { collectionMutators: t }) => {
+  if (!n.value)
     return !1;
   if (typeof e.path[e.path.length - 1] == "number" && (e.type === "CREATE" || e.type === "REMOVE")) {
-    const a = d(M, {
+    const s = m(A, {
       ...e,
       path: e.path
     });
-    if (!a)
+    if (!s)
       return !1;
-    const r = [...D(s.value, a.pathMinusOne)];
-    e.type === "CREATE" ? r.push(a.value) : e.type === "REMOVE" && r.pop(), t.edit(s.value.uid, a.pathMinusOne, r);
+    const u = [...M(n.value, s.pathMinusOne)];
+    e.type === "CREATE" ? u.push(s.value) : e.type === "REMOVE" && u.pop(), t.edit(n.value.uid, s.pathMinusOne, u);
   } else {
-    const a = d(M, e);
-    if (!a)
+    const s = m(A, e);
+    if (!s)
       return !1;
-    t.edit(s.value.uid, a.path, a.value);
+    t.edit(n.value.uid, s.path, s.value);
   }
   return !0;
-}, T = (e, s) => {
-  const { requests: t, requestExamples: a, requestExampleMutators: r } = s, n = t[e];
-  n?.examples.forEach((u) => {
-    const l = x(n, a[u]?.name ?? "Default");
-    l && r.set({
-      ...l,
-      uid: u
+}, _ = (e, n) => {
+  const { requests: t, requestExamples: s, requestExampleMutators: u } = n, a = t[e];
+  a?.examples.forEach((r) => {
+    const i = D(a, s[r]?.name ?? "Default");
+    i && u.set({
+      ...i,
+      uid: r
     });
   });
-}, P = (e, { activeCollection: s }, t) => {
-  if (!s.value)
+}, K = (e, { activeCollection: n }, t) => {
+  if (!n.value)
     return !1;
-  const { requests: a, requestMutators: r } = t, [, n, u, ...l] = e.path;
-  if (n === "path" && e.type === "CHANGE")
-    s.value.requests.forEach((p) => {
-      a[p]?.path === e.oldValue && r.edit(p, "path", e.value);
+  const { requests: s, requestMutators: u } = t, [, a, r, ...i] = e.path;
+  if (a === "path" && e.type === "CHANGE")
+    n.value.requests.forEach((o) => {
+      s[o]?.path === e.oldValue && u.edit(o, "path", e.value);
     });
-  else if (u === "method" && e.type === "CHANGE")
-    s.value.requests.forEach((p) => {
-      a[p]?.method === e.oldValue && a[p]?.path === n && r.edit(p, "method", e.value);
+  else if (r === "method" && e.type === "CHANGE")
+    n.value.requests.forEach((o) => {
+      s[o]?.method === e.oldValue && s[o]?.path === a && u.edit(o, "method", e.value);
     });
-  else if (e.type !== "CHANGE" && typeof l.at(-1) == "number") {
-    const p = E(
-      s.value.requests,
-      a,
-      (c) => c.path === n && c.method === u
-    ), o = d(O, {
+  else if (e.type !== "CHANGE" && typeof i.at(-1) == "number") {
+    const o = E(
+      n.value.requests,
+      s,
+      (c) => c.path === a && c.method === r
+    ), l = m(O, {
       ...e,
       path: e.path.slice(3)
     });
-    if (!p || !o)
+    if (!o || !l)
       return !1;
-    const h = [...D(p, o.pathMinusOne)];
-    e.type === "CREATE" ? h.push(o.value) : e.type === "REMOVE" && h.pop(), r.edit(p.uid, o.pathMinusOne, h), (e.path[3] === "parameters" || e.path[3] === "requestBody") && T(p.uid, t);
+    const f = [...M(o, l.pathMinusOne)];
+    e.type === "CREATE" ? f.push(l.value) : e.type === "REMOVE" && f.pop(), u.edit(o.uid, l.pathMinusOne, f), (e.path[3] === "parameters" || e.path[3] === "requestBody") && _(o.uid, t);
   } else if (e.type === "CREATE") {
-    const [p] = Object.entries(e.value ?? {}), [o, h] = p ?? [], c = u ? e.value : h, f = u || o, R = V.array().parse(c.servers ?? []), { security: q, ...N } = c, A = {
-      ...N,
-      method: k(f) ? f : "get",
-      path: n,
+    const [o] = Object.entries(e.value ?? {}), [l, f] = o ?? [], c = r ? e.value : f, d = r || l, T = R.array().parse(c.servers ?? []), { security: g, ...z } = c, V = {
+      ...z,
+      method: N(d) ? d : "get",
+      path: a,
       parameters: c.parameters ?? [],
-      servers: R.map((m) => m.uid)
+      servers: T.map((y) => y.uid)
     };
-    q?.length && (A.security = q.map((m) => {
-      if (Object.keys(m).length) {
-        const [g] = Object.keys(m);
-        return g ? {
-          [g]: m[g]
-        } : m;
+    g?.length && (V.security = g.map((y) => {
+      if (Object.keys(y).length) {
+        const [Z] = Object.keys(y);
+        return Z ? {
+          [Z]: y[Z]
+        } : y;
       }
-      return m;
+      return y;
     }));
-    const b = v(A, O, !1);
-    if (!b)
+    const q = v(V, O, !1);
+    if (!q)
       return !1;
-    r.add(b, s.value.uid);
+    u.add(q, n.value.uid);
   } else if (e.type === "REMOVE") {
-    const p = E(
-      s.value.requests,
-      a,
-      (o) => o.path === n && o.method === u
+    const o = E(
+      n.value.requests,
+      s,
+      (l) => l.path === a && l.method === r
     );
-    if (!p)
+    if (!o)
       return !1;
-    r.delete(p, s.value.uid);
+    u.delete(o, n.value.uid);
   } else if (e.type === "CHANGE") {
-    const p = E(
-      s.value.requests,
-      a,
-      (h) => h.path === n && h.method === u
-    ), o = d(O, { ...e, path: l });
-    if (!p || !o)
+    const o = E(
+      n.value.requests,
+      s,
+      (f) => f.path === a && f.method === r
+    ), l = m(O, { ...e, path: i });
+    if (!o || !l)
       return !1;
-    r.edit(p.uid, o.path, o.value), (e.path[3] === "parameters" || e.path[3] === "requestBody") && T(p.uid, t);
+    u.edit(o.uid, l.path, l.value), (e.path[3] === "parameters" || e.path[3] === "requestBody") && _(o.uid, t);
   }
   return !0;
-}, W = (e, { activeCollection: s }, { servers: t, serverMutators: a }) => {
-  if (!s.value)
+}, W = (e, { activeCollection: n }, { servers: t, serverMutators: s }) => {
+  if (!n.value)
     return !1;
-  const [, r, ...n] = e.path;
-  if (n?.length) {
-    const u = s.value.servers[r];
-    if (!u)
+  const [, u, ...a] = e.path;
+  if (a?.length) {
+    const r = n.value.servers[u];
+    if (!r)
       return !1;
-    const l = t[u], p = d(V, { ...e, path: n });
-    if (!l || !p)
+    const i = t[r], o = m(R, { ...e, path: a });
+    if (!i || !o)
       return !1;
-    const h = e.type === "REMOVE" && n[n.length - 1] === "variables" ? {} : p.value;
-    a.edit(u, p.path, h);
+    const f = e.type === "REMOVE" && a[a.length - 1] === "variables" ? {} : o.value;
+    s.edit(r, o.path, f);
   } else if (e.type === "REMOVE") {
-    if (!s.value.servers[r])
+    if (!n.value.servers[u])
       return !1;
-    a.delete(s.value.servers[r], s.value.uid);
+    s.delete(n.value.servers[u], n.value.uid);
   } else if (e.type === "CREATE") {
-    const u = v(e.value, V, !1);
-    if (!u)
+    const r = v(e.value, R, !1);
+    if (!r)
       return !1;
-    a.add(u, s.value.uid);
+    s.add(r, n.value.uid);
   }
   return !0;
-}, I = (e, { activeCollection: s }, { tags: t, tagMutators: a }) => {
-  if (!s.value)
+}, I = (e, { activeCollection: n }, { tags: t, tagMutators: s }) => {
+  if (!n.value)
     return !1;
-  const [, r, ...n] = e.path;
-  if (n?.length) {
-    const u = s.value.tags[r];
-    if (!u)
+  const [, u, ...a] = e.path;
+  if (a?.length) {
+    const r = n.value.tags[u];
+    if (!r)
       return !1;
-    const l = t[u], p = d(S, { ...e, path: n });
-    if (!l || !p)
+    const i = t[r], o = m(b, { ...e, path: a });
+    if (!i || !o)
       return !1;
-    a.edit(u, p.path, p.value);
+    s.edit(r, o.path, o.value);
   } else if (e.type === "REMOVE") {
-    const u = s.value.tags[r];
-    if (!u)
+    const r = n.value.tags[u];
+    if (!r)
       return !1;
-    const l = t[u];
-    if (!l)
+    const i = t[r];
+    if (!i)
       return !1;
-    a.delete(l, s.value.uid);
+    s.delete(i, n.value.uid);
   } else if (e.type === "CREATE") {
-    const u = v(e.value, S, !1);
-    if (!u)
+    const r = v(e.value, b, !1);
+    if (!r)
       return !1;
-    a.add(u, s.value.uid);
+    s.add(r, n.value.uid);
   }
   return !0;
-}, _ = (e, s, t) => {
-  const a = y(e);
-  if (a instanceof i.ZodUnion || a instanceof i.ZodDiscriminatedUnion) {
-    for (const r of a.options)
-      if (r instanceof i.ZodObject && s in r.shape && r.shape[s] instanceof i.ZodLiteral && r.shape[s].value === t)
-        return r;
-  }
+}, j = (e, n, t) => {
+  const s = h(e);
+  if (s instanceof p.ZodUnion || s instanceof p.ZodDiscriminatedUnion)
+    for (const u of s.options) {
+      if (!(u instanceof p.ZodType))
+        continue;
+      const a = h(u);
+      if (a instanceof p.ZodObject && n in a.shape) {
+        const r = h(a.shape[n]);
+        if (r instanceof p.ZodLiteral && r.value === t || r instanceof p.ZodDefault && r._zod.def.innerType instanceof p.ZodLiteral && r._zod.def.innerType.value === t || r instanceof p.ZodOptional && r._zod.def.innerType instanceof p.ZodLiteral && r._zod.def.innerType.value === t || r instanceof p.ZodDefault && r._zod.def.innerType instanceof p.ZodOptional && r._zod.def.innerType._zod.def.innerType instanceof p.ZodLiteral && r._zod.def.innerType._zod.def.innerType.value === t)
+          return a;
+      }
+    }
   return null;
-}, J = (e, { activeCollection: s }, { securitySchemes: t, securitySchemeMutators: a }) => {
-  if (!s.value)
+}, J = (e, { activeCollection: n }, { securitySchemes: t, securitySchemeMutators: s }) => {
+  if (!n.value)
     return !1;
-  const [, , r, ...n] = e.path, u = t[r] ?? E(
-    s.value.securitySchemes,
+  const [, , u, ...a] = e.path, r = t[u] ?? E(
+    n.value.securitySchemes,
     t,
-    (l) => l.nameKey === r
+    (i) => i.nameKey === u
   );
-  if (n?.length) {
-    const l = _(Z, "type", u?.type ?? "");
-    if (!l || !u)
+  if (a?.length) {
+    const i = j(S, "type", r?.type ?? "");
+    if (!i || !r)
       return !1;
-    const p = d(l, { ...e, path: n });
-    if (!p)
+    const o = m(i, { ...e, path: a });
+    if (!o)
       return !1;
-    const o = p.path;
-    a.edit(u.uid, o, p.value);
+    const l = o.path;
+    s.edit(r.uid, l, o.value);
   } else if (e.type === "REMOVE") {
-    if (!u)
+    if (!r)
       return !1;
-    a.delete(u.uid);
-  } else e.type === "CREATE" && a.add(Z.parse(e.value), s.value.uid);
+    s.delete(r.uid);
+  } else e.type === "CREATE" && s.add(S.parse(e.value), n.value.uid);
   return !0;
 };
 export {
-  j as combineRenameDiffs,
+  x as combineRenameDiffs,
   E as findResource,
-  L as mutateCollectionDiff,
-  P as mutateRequestDiff,
+  F as mutateCollectionDiff,
+  K as mutateRequestDiff,
   J as mutateSecuritySchemeDiff,
   W as mutateServerDiff,
   I as mutateTagDiff,
-  _ as narrowUnionSchema,
-  d as parseDiff,
-  G as traverseZodSchema
+  j as narrowUnionSchema,
+  m as parseDiff,
+  H as traverseZodSchema
 };

package/package.json

@@ -18,7 +18,7 @@
     "rest",
     "testing"
   ],
-  "version": "2.6.1",
+  "version": "2.7.0",
   "engines": {
     "node": ">=20"
   },
@@ -179,6 +179,11 @@
       "import": "./dist/views/Request/types/index.js",
       "types": "./dist/views/Request/types/index.d.ts",
       "default": "./dist/views/Request/types/index.js"
+    },
+    "./v2/blocks/operation-code-sample": {
+      "import": "./dist/v2/blocks/operation-code-sample/index.js",
+      "types": "./dist/v2/blocks/operation-code-sample/index.d.ts",
+      "default": "./dist/v2/blocks/operation-code-sample/index.js"
     }
   },
   "files": [
@@ -205,26 +210,26 @@
     "vue-router": "^4.3.0",
     "whatwg-mimetype": "^4.0.0",
     "yaml": "2.8.0",
-    "zod": "3.24.1",
+    "zod": "4.1.11",
     "@scalar/analytics-client": "1.0.0",
-    "@scalar/draggable": "0.2.0",
-    "@scalar/helpers": "0.0.11",
-    "@scalar/json-magic": "0.5.2",
+    "@scalar/components": "0.14.40",
     "@scalar/icons": "0.4.7",
-    "@scalar/components": "0.14.38",
-    "@scalar/import": "0.4.27",
-    "@scalar/oas-utils": "0.4.33",
+    "@scalar/helpers": "0.0.11",
+    "@scalar/draggable": "0.2.0",
+    "@scalar/import": "0.4.29",
+    "@scalar/oas-utils": "0.5.0",
     "@scalar/object-utils": "1.2.7",
-    "@scalar/openapi-parser": "0.21.2",
-    "@scalar/openapi-types": "0.3.7",
-    "@scalar/postman-to-openapi": "0.3.36",
-    "@scalar/snippetz": "0.4.10",
-    "@scalar/use-codemirror": "0.12.39",
-    "@scalar/types": "0.2.16",
-    "@scalar/themes": "0.13.19",
+    "@scalar/json-magic": "0.6.0",
+    "@scalar/openapi-parser": "0.22.1",
+    "@scalar/postman-to-openapi": "0.3.38",
+    "@scalar/themes": "0.13.20",
+    "@scalar/snippetz": "0.4.11",
+    "@scalar/use-codemirror": "0.12.41",
+    "@scalar/openapi-types": "0.4.0",
     "@scalar/use-hooks": "0.2.5",
+    "@scalar/types": "0.3.0",
     "@scalar/use-toasts": "0.8.0",
-    "@scalar/workspace-store": "0.16.0"
+    "@scalar/workspace-store": "0.16.2"
   },
   "devDependencies": {
     "@tailwindcss/vite": "^4.1.7",
@@ -237,8 +242,8 @@
     "vite": "7.1.5",
     "vite-svg-loader": "^5.1.0",
     "vitest": "3.2.4",
-    "@scalar/build-tooling": "0.2.7",
-    "@scalar/galaxy": "0.5.8"
+    "@scalar/galaxy": "0.5.8",
+    "@scalar/build-tooling": "0.2.7"
   },
   "scripts": {
     "build": "scalar-build-vite",
@@ -251,8 +256,8 @@
     "preview": "vite preview",
     "test": "vitest",
     "test:benchmark": "vitest bench",
-    "test:benchmark:compare": "vitest bench --compare test/results/main.json",
-    "test:benchmark:save": "vitest bench --outputJson test/results/branch.json",
+    "test:benchmark:compare": "vitest bench --compare test-results/test-benchmark.json",
+    "test:benchmark:save": "vitest bench --outputJson test-results/test-benchmark.json",
     "types:build": "scalar-types-build-vue",
     "types:check": "scalar-types-check-vue"
   }