@scalar/api-client 2.36.1 → 2.37.0

package/dist/v2/features/editor/hooks/use-three-way-merge-editor.js

@@ -0,0 +1,316 @@
+import { apply as _ } from "@scalar/json-magic/diff";
+import { deepClone as A } from "@scalar/workspace-store/helpers/deep-clone";
+import * as i from "monaco-editor";
+import { ref as ae, shallowRef as L, computed as E, toValue as h, watch as ge, markRaw as pe } from "vue";
+import { createJsonModel as V } from "../helpers/json/create-json-model.js";
+import { ensureJsonPointerLinkSupport as he } from "../helpers/json/json-pointer-links.js";
+import { parseJsonPointerPath as ve } from "../helpers/json/json-pointer-path.js";
+import { rangeToWholeLine as Ce } from "../helpers/range-to-whole-line.js";
+function Je(se) {
+  const { baseDocument: ie, resolvedDocument: P, conflicts: w, onApplyChanges: le, onError: F } = se, f = ae([]), S = L([]), Y = L([]), z = L([]), H = ae(-1), M = L(), N = L(), v = L();
+  let b, O;
+  const x = [];
+  let J = [];
+  const g = E(() => h(w).map((s) => {
+    const r = s[0], d = s[1];
+    let u = r[0].path;
+    for (const m of r)
+      m.path.length < u.length && (u = m.path);
+    for (const m of d)
+      m.path.length < u.length && (u = m.path);
+    return {
+      local: {
+        path: u,
+        changes: r,
+        type: r[0].type
+      },
+      remote: {
+        path: u,
+        changes: d,
+        type: d[0].type
+      }
+    };
+  })), re = E(
+    () => _(
+      A(h(P)),
+      h(w).flatMap((o) => o[0])
+    )
+  ), ce = E(
+    () => _(
+      A(h(P)),
+      h(w).flatMap((o) => o[1])
+    )
+  ), U = E(() => f.value.filter((o) => o === "idle").length);
+  ge(
+    g,
+    (o) => {
+      f.value = o.map((s, r) => f.value[r] ?? "idle");
+    },
+    { immediate: !0 }
+  );
+  const j = (o, s) => {
+    if (!o || !s)
+      return;
+    const r = o.getModifiedEditor(), d = new i.Range(s.startLineNumber, s.startColumn, s.endLineNumber, s.endColumn);
+    r.setSelection(d), r.revealRangeNearTop(d);
+  };
+  return {
+    init: (o) => {
+      const s = h(ie), r = h(P), d = re.value, u = ce.value, m = i.editor.createModel(JSON.stringify(r, null, 2), "json"), c = V(JSON.stringify(d, null, 2)), D = i.editor.createModel(JSON.stringify(r, null, 2), "json"), I = V(JSON.stringify(u, null, 2)), $ = i.editor.createModel(JSON.stringify(s, null, 2), "json"), p = V(JSON.stringify(r, null, 2));
+      J = [
+        m,
+        c.model,
+        D,
+        I.model,
+        $,
+        p.model
+      ];
+      const q = i.editor.createDiffEditor(o.local, {
+        originalEditable: !1,
+        readOnly: !0,
+        automaticLayout: !0,
+        renderSideBySide: !1
+      });
+      q.setModel({
+        original: m,
+        modified: c.model
+      }), M.value = q;
+      const G = i.editor.createDiffEditor(o.remote, {
+        originalEditable: !1,
+        readOnly: !0,
+        automaticLayout: !0,
+        renderSideBySide: !1
+      });
+      G.setModel({
+        original: D,
+        modified: I.model
+      }), N.value = G;
+      const T = i.editor.createDiffEditor(o.result, {
+        originalEditable: !1,
+        readOnly: !1,
+        renderSideBySide: !1,
+        automaticLayout: !0
+      });
+      T.setModel({
+        original: $,
+        modified: p.model
+      });
+      const C = T.getModifiedEditor();
+      C.updateOptions({ codeLens: !0 });
+      const de = async (t) => {
+        const e = await p.getRangeFromPath(t);
+        if (!e)
+          return;
+        const n = new i.Range(e.startLineNumber, e.startColumn, e.endLineNumber, e.endColumn);
+        C.setSelection(n), C.revealRangeNearTop(n);
+      };
+      O = he(async (t) => {
+        const e = ve(t);
+        e && await de(e);
+      }).dispose;
+      let K = [], W = 0;
+      const Q = "scalar.conflict.applyCurrent", X = "scalar.conflict.applyRemote", Z = "scalar.conflict.ignore", ue = C.addCommand(0, () => {
+      }) ?? "scalar.conflict.status.noop", me = (t) => {
+        const e = t.startLineNumber, n = t.endLineNumber;
+        if (e === n)
+          return [
+            {
+              range: t,
+              options: {
+                isWholeLine: !0,
+                className: "json-focus-highlight-box-single"
+              }
+            }
+          ];
+        const a = new i.Range(e, 1, e, t.endColumn), l = new i.Range(e + 1, 1, Math.max(e + 1, n - 1), 1), R = new i.Range(n, 1, n, t.endColumn), y = [
+          {
+            range: a,
+            options: {
+              isWholeLine: !0,
+              className: "json-focus-highlight-box-top"
+            }
+          },
+          {
+            range: R,
+            options: {
+              isWholeLine: !0,
+              className: "json-focus-highlight-box-bottom"
+            }
+          }
+        ];
+        return n - e > 1 && y.push({
+          range: l,
+          options: {
+            isWholeLine: !0,
+            className: "json-focus-highlight-box-middle"
+          }
+        }), y;
+      }, k = () => {
+        b?.dispose(), b = i.languages.registerCodeLensProvider("json", {
+          provideCodeLenses: (t) => t.uri.toString() !== p.model.uri.toString() ? { lenses: [], dispose: () => {
+          } } : {
+            lenses: S.value.flatMap((e) => {
+              const n = new i.Range(
+                e.range.startLineNumber,
+                1,
+                e.range.startLineNumber,
+                1
+              );
+              return [
+                {
+                  range: n,
+                  command: {
+                    id: ue,
+                    title: `Status: ${f.value[e.index] ?? "idle"}`
+                  }
+                },
+                {
+                  range: n,
+                  command: {
+                    id: Q,
+                    title: "Accept Current",
+                    arguments: [e.index]
+                  }
+                },
+                {
+                  range: n,
+                  command: {
+                    id: X,
+                    title: "Accept Remote",
+                    arguments: [e.index]
+                  }
+                },
+                {
+                  range: n,
+                  command: {
+                    id: Z,
+                    title: "Ignore",
+                    arguments: [e.index]
+                  }
+                }
+              ];
+            }),
+            dispose: () => {
+            }
+          }
+        });
+      }, B = async (t, e, n) => {
+        const { model: a } = t, l = new i.Range(1, 1, 1, a.getLineMaxColumn(1));
+        let R = null;
+        for (let y = n.length; y >= 0; y -= 1) {
+          const fe = n.slice(0, y), ne = await t.getRangeFromPath(fe);
+          if (ne) {
+            R = Ce(a, ne);
+            break;
+          }
+        }
+        return {
+          index: e,
+          path: n,
+          range: pe(R ?? l)
+        };
+      }, ee = async () => {
+        const [t, e, n] = await Promise.all([
+          Promise.all(
+            g.value.map(
+              (a, l) => B(p, l, a.local.path)
+            )
+          ),
+          Promise.all(
+            g.value.map(
+              (a, l) => B(c, l, a.local.path)
+            )
+          ),
+          Promise.all(
+            g.value.map(
+              (a, l) => B(I, l, a.local.path)
+            )
+          )
+        ]);
+        S.value = t.filter((a) => !!a), Y.value = e.filter((a) => !!a), z.value = n.filter((a) => !!a), K = C.deltaDecorations(
+          K,
+          S.value.flatMap((a) => me(a.range))
+        ), k();
+      }, oe = (t, e) => {
+        f.value[t] = e, k();
+      }, te = async (t, e) => {
+        const n = g.value[t];
+        if (!n)
+          return;
+        let a = null;
+        try {
+          a = JSON.parse(p.model.getValue());
+        } catch {
+          return;
+        }
+        const l = e === "local" ? n.local.changes : n.remote.changes, R = _(A(a), l);
+        W += 1, p.model.setValue(JSON.stringify(R, null, 2)), oe(t, e), await ee();
+      };
+      x.push(
+        i.editor.registerCommand(Q, (t, e) => {
+          te(e, "local");
+        })
+      ), x.push(
+        i.editor.registerCommand(X, (t, e) => {
+          te(e, "remote");
+        })
+      ), x.push(
+        i.editor.registerCommand(Z, (t, e) => {
+          oe(e, "ignore");
+        })
+      ), ee(), C.onDidChangeModelContent((t) => {
+        if (W > 0) {
+          W -= 1;
+          return;
+        }
+        let e = !1;
+        for (const n of t.changes) {
+          const a = S.value.filter(
+            (l) => i.Range.areIntersectingOrTouching(n.range, l.range)
+          );
+          a.length && a.forEach((l) => {
+            f.value[l.index] !== "manual" && (f.value[l.index] = "manual", e = !0);
+          });
+        }
+        e && k();
+      }), v.value = T;
+    },
+    dispose: () => {
+      M.value?.dispose(), M.value = void 0, N.value?.dispose(), N.value = void 0, v.value?.dispose(), v.value = void 0;
+      for (const o of J)
+        o.dispose();
+      J = [], b?.dispose(), b = void 0, O?.(), O = void 0, x.forEach((o) => o.dispose()), x.length = 0;
+    },
+    conflictsLeft: U,
+    goToNextConflict: () => {
+      const o = g.value.map((c, D) => D).filter((c) => f.value[c] === "idle");
+      if (!o.length)
+        return;
+      const s = o.find((c) => c > H.value) ?? o[0];
+      if (s === void 0 || !g.value[s])
+        return;
+      const d = Y.value.find((c) => c.index === s)?.range, u = z.value.find((c) => c.index === s)?.range, m = S.value.find((c) => c.index === s)?.range;
+      j(M.value, d), j(N.value, u), j(v.value, m), v.value?.getModifiedEditor().focus(), H.value = s;
+    },
+    applyResolvedConflicts: () => {
+      if (U.value > 0) {
+        F?.("You have conflicts left");
+        return;
+      }
+      const o = v.value?.getModel()?.modified;
+      if (!o)
+        return;
+      let s = null;
+      try {
+        s = JSON.parse(o.getValue());
+      } catch {
+        F?.("You have formatting errors");
+        return;
+      }
+      le(s);
+    }
+  };
+}
+export {
+  Je as useThreeWayMergeEditor
+};

package/dist/v2/features/editor/index.d.ts

@@ -0,0 +1,5 @@
+export { useMonacoEditorConfiguration } from './config.js';
+export { rangeToWholeLine } from './helpers/range-to-whole-line.js';
+export { useEditor } from './hooks/use-editor.js';
+export { useJsonPointerLinkSupport } from './hooks/use-json-pointer-link-support.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/v2/features/editor/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/v2/features/editor/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAA"}

package/dist/v2/features/editor/index.js

@@ -0,0 +1,10 @@
+import { useMonacoEditorConfiguration as e } from "./config.js";
+import { rangeToWholeLine as n } from "./helpers/range-to-whole-line.js";
+import { useEditor as p } from "./hooks/use-editor.js";
+import { useJsonPointerLinkSupport as u } from "./hooks/use-json-pointer-link-support.js";
+export {
+  n as rangeToWholeLine,
+  p as useEditor,
+  u as useJsonPointerLinkSupport,
+  e as useMonacoEditorConfiguration
+};

package/dist/v2/features/operation/Operation.vue.js

@@ -5,12 +5,12 @@ import { combineParams as M } from "./helpers/combine-params.js";
 import { getSelectedServer as N } from "./helpers/get-selected-server.js";
 import { getActiveProxyUrl as A } from "../../helpers/get-active-proxy-url.js";
 import { getServers as E } from "../../helpers/get-servers.js";
-import V from "../../blocks/operation-block/OperationBlock.vue.js";
-const P = {
+import R from "../../blocks/operation-block/OperationBlock.vue.js";
+const V = {
   key: 1,
   class: "flex h-full w-full items-center justify-center"
-}, R = {}, W = /* @__PURE__ */ w({
-  ...R,
+}, P = {}, L = /* @__PURE__ */ w({
+  ...P,
   __name: "Operation",
   props: {
     documentSlug: {},
@@ -28,19 +28,20 @@ const P = {
     customThemes: {},
     currentTheme: {},
     isDarkMode: { type: Boolean },
+    fetchRegistryDocument: { type: Function },
     options: {}
   },
   setup(e) {
-    const l = t(() => e.path ? s(e.document?.paths?.[e.path]) : null), r = t(() => {
+    const u = t(() => e.path ? s(e.document?.paths?.[e.path]) : null), r = t(() => {
       if (!e.path || !e.method)
         return null;
       const n = s(e.document?.paths?.[e.path]?.[e.method]);
       if (!n)
         return null;
-      if (!l.value)
+      if (!u.value)
         return n;
       const o = M(
-        l.value.parameters,
+        u.value.parameters,
         n.parameters
       );
       return { ...n, parameters: o };
@@ -53,7 +54,7 @@ const P = {
         ...n,
         location: "document"
       }))
-    ]), u = t(() => {
+    ]), l = t(() => {
       const n = a(e.options)?.servers ?? r.value?.servers ?? // pathItem.value?.servers ?? TODO: add support for pathItem servers
       e.document?.servers;
       return E(n, {
@@ -61,7 +62,7 @@ const P = {
         documentUrl: e.document?.["x-scalar-original-source-url"]
       });
     }), v = t(() => a(e.options)?.servers != null ? e.document?.["x-scalar-selected-server"] : r.value?.servers != null ? r.value["x-scalar-selected-server"] : e.document?.["x-scalar-selected-server"]), h = t(
-      () => N(u.value, v.value)
+      () => N(l.value, v.value)
     ), S = t(() => r.value?.servers != null ? { type: "operation", path: e.path ?? "", method: e.method ?? "get" } : { type: "document" }), y = t(() => e.workspaceStore.auth.getAuthSelectedSchemas({
       type: "document",
       documentName: e.documentSlug
@@ -81,13 +82,13 @@ const P = {
           ...e.workspaceStore.workspace["x-scalar-environments"]
         })
       )
-    )), x = t(
+    )), g = t(
       () => b(a(e.options)?.hiddenClients)
-    ), g = "2.36.1";
-    return (n, o) => e.path && e.method && e.exampleName && r.value ? (m(), C(c(V), {
+    ), x = "2.37.0";
+    return (n, o) => e.path && e.method && e.exampleName && r.value ? (m(), C(c(R), {
       key: 0,
       activeEnvironment: e.workspaceStore.workspace["x-scalar-active-environment"],
-      appVersion: c(g),
+      appVersion: c(x),
       authMeta: f.value,
       documentSecurity: e.document?.security ?? [],
       documentSelectedSecurity: y.value,
@@ -99,7 +100,7 @@ const P = {
       globalCookies: d.value,
       hideClientButton: a(e.options)?.hideClientButton ?? !1,
       history: e.workspaceStore.history.getHistory(e.documentSlug, e.path, e.method),
-      httpClients: x.value,
+      httpClients: g.value,
       layout: e.layout,
       method: e.method,
       operation: r.value,
@@ -114,12 +115,12 @@ const P = {
       selectedClient: e.workspaceStore.workspace["x-scalar-default-client"],
       server: h.value,
       serverMeta: S.value,
-      servers: u.value
-    }, null, 8, ["activeEnvironment", "appVersion", "authMeta", "documentSecurity", "documentSelectedSecurity", "documentUrl", "environment", "environments", "eventBus", "exampleKey", "globalCookies", "hideClientButton", "history", "httpClients", "layout", "method", "operation", "operationSelectedSecurity", "path", "plugins", "proxyUrl", "securitySchemes", "selectedClient", "server", "serverMeta", "servers"])) : (m(), B("div", P, [...o[0] || (o[0] = [
+      servers: l.value
+    }, null, 8, ["activeEnvironment", "appVersion", "authMeta", "documentSecurity", "documentSelectedSecurity", "documentUrl", "environment", "environments", "eventBus", "exampleKey", "globalCookies", "hideClientButton", "history", "httpClients", "layout", "method", "operation", "operationSelectedSecurity", "path", "plugins", "proxyUrl", "securitySchemes", "selectedClient", "server", "serverMeta", "servers"])) : (m(), B("div", V, [...o[0] || (o[0] = [
       U("span", { class: "text-c-3" }, "Select an operation to view details", -1)
     ])]));
   }
 });
 export {
-  W as default
+  L as default
 };

package/dist/v2/types/configuration.d.ts

@@ -0,0 +1,11 @@
+export type ImportDocumentFromRegistry = (meta: {
+    namespace: string;
+    slug: string;
+}) => Promise<{
+    ok: true;
+    data: Record<string, unknown>;
+} | {
+    ok: false;
+    error: string;
+}>;
+//# sourceMappingURL=configuration.d.ts.map

package/dist/v2/types/configuration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../src/v2/types/configuration.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,0BAA0B,GAAG,CAAC,IAAI,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,KAAK,OAAO,CAC3F;IACE,EAAE,EAAE,IAAI,CAAA;IACR,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC9B,GACD;IACE,EAAE,EAAE,KAAK,CAAA;IACT,KAAK,EAAE,MAAM,CAAA;CACd,CACJ,CAAA"}

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

@@ -33,7 +33,7 @@ const W = { class: "flex-center relative flex flex-1 flex-col gap-6 p-2 capitali
       }));
     }, f = (u) => {
       u?.createNew && g.name === "request" && p();
-    }, v = "2.36.1";
+    }, v = "2.37.0";
     return q(() => a.hotKeys.on(f)), R(() => a.hotKeys.off(f)), (u, e) => (l(), n("div", W, [
       s("div", {
         class: y(["flex h-[calc(100%_-_50px)] flex-col items-center justify-center", {

package/package.json

@@ -18,7 +18,7 @@
     "rest",
     "testing"
   ],
-  "version": "2.36.1",
+  "version": "2.37.0",
   "engines": {
     "node": ">=22"
   },
@@ -231,6 +231,11 @@
       "types": "./dist/v2/features/command-palette/index.d.ts",
       "default": "./dist/v2/features/command-palette/index.js"
     },
+    "./v2/features/editor": {
+      "import": "./dist/v2/features/editor/index.js",
+      "types": "./dist/v2/features/editor/index.d.ts",
+      "default": "./dist/v2/features/editor/index.js"
+    },
     "./v2/features/environments": {
       "import": "./dist/v2/features/environments/index.js",
       "types": "./dist/v2/features/environments/index.d.ts",
@@ -329,31 +334,32 @@
     "pretty-ms": "^9.3.0",
     "shell-quote": "^1.8.1",
     "type-fest": "^5.3.1",
+    "vite-plugin-monaco-editor": "^1.1.0",
     "vue": "^3.5.26",
     "vue-router": "4.6.2",
     "whatwg-mimetype": "4.0.0",
     "yaml": "^2.8.0",
     "zod": "^4.3.5",
+    "@scalar/analytics-client": "1.1.0",
     "@scalar/draggable": "0.4.0",
+    "@scalar/components": "0.20.7",
     "@scalar/icons": "0.6.0",
-    "@scalar/analytics-client": "1.1.0",
-    "@scalar/components": "0.20.5",
-    "@scalar/import": "0.5.1",
-    "@scalar/helpers": "0.4.0",
-    "@scalar/oas-utils": "0.10.4",
-    "@scalar/object-utils": "1.3.1",
-    "@scalar/openapi-parser": "0.25.2",
+    "@scalar/helpers": "0.4.1",
+    "@scalar/import": "0.5.2",
+    "@scalar/json-magic": "0.12.3",
+    "@scalar/oas-utils": "0.10.6",
+    "@scalar/object-utils": "1.3.2",
+    "@scalar/openapi-parser": "0.25.3",
+    "@scalar/postman-to-openapi": "0.5.2",
+    "@scalar/sidebar": "0.8.7",
+    "@scalar/themes": "0.15.0",
     "@scalar/openapi-types": "0.6.0",
-    "@scalar/sidebar": "0.8.5",
-    "@scalar/postman-to-openapi": "0.5.1",
-    "@scalar/json-magic": "0.12.2",
-    "@scalar/snippetz": "0.7.3",
+    "@scalar/types": "0.7.3",
+    "@scalar/use-codemirror": "0.14.7",
     "@scalar/use-hooks": "0.4.0",
-    "@scalar/themes": "0.15.0",
-    "@scalar/use-codemirror": "0.14.5",
-    "@scalar/types": "0.7.2",
+    "@scalar/workspace-store": "0.40.0",
     "@scalar/use-toasts": "0.10.0",
-    "@scalar/workspace-store": "0.39.1"
+    "@scalar/snippetz": "0.7.4"
   },
   "devDependencies": {
     "@tailwindcss/vite": "^4.1.18",
@@ -370,7 +376,7 @@
     "vitest": "4.0.16",
     "@scalar/build-tooling": "0.5.0",
     "@scalar/galaxy": "0.6.0",
-    "@scalar/pre-post-request-scripts": "0.3.5"
+    "@scalar/pre-post-request-scripts": "0.3.7"
   },
   "scripts": {
     "build": "scalar-build-vite",