@testsmith/api-spector 0.7.9 → 0.8.1

package/out/main/chunks/{broker-client-CJBfpvbd.js → broker-client-BQBPAPCZ.js}

@@ -3,7 +3,7 @@ const promises = require("node:fs/promises");
 const path = require("node:path");
 const crypto = require("node:crypto");
 const undici = require("undici");
-const requestExec = require("./request-exec-CgyqbNWk.js");
+const requestExec = require("./request-exec-CEmSNDIG.js");
 const Ajv = require("ajv");
 const jsYaml = require("js-yaml");
 require("node:http");

package/out/main/chunks/{perf-run-Co_5unBR.js → perf-run-D02WoC6i.js}

@@ -1,5 +1,5 @@
 "use strict";
-const requestExec = require("./request-exec-CgyqbNWk.js");
+const requestExec = require("./request-exec-CEmSNDIG.js");
 const grpc = require("@grpc/grpc-js");
 const protoLoader = require("@grpc/proto-loader");
 const fs = require("node:fs");

package/out/main/chunks/{request-exec-CgyqbNWk.js → request-exec-CEmSNDIG.js}

@@ -913,6 +913,20 @@ async function buildEnvVars(environment) {
   }
   return vars;
 }
+async function resolveInlineSecretRefs(text) {
+  const refs = /* @__PURE__ */ new Set();
+  for (const m of text.matchAll(/\{\{\s*([^}]+?)\s*\}\}/g)) {
+    const inner = m[1].trim();
+    if (hasSecretScheme(inner)) refs.add(inner);
+  }
+  if (refs.size === 0) return {};
+  const out = {};
+  await Promise.all([...refs].map(async (ref) => {
+    const value = await resolveExternalSecret(ref);
+    if (value !== null) out[ref] = value;
+  }));
+  return out;
+}
 function mergeVars(envVars, collectionVars, globals2, localVars = {}, dynamicVars = {}, folderVars = {}) {
   const out = {};
   for (const src of [dynamicVars, globals2, collectionVars, folderVars, envVars, localVars]) {
@@ -2604,18 +2618,7 @@ async function resolveInlineSecrets(req) {
     req.preRequestScript ?? "",
     req.postRequestScript ?? ""
   ].join("\n");
-  const refs = /* @__PURE__ */ new Set();
-  for (const m of haystack.matchAll(/\{\{\s*([^}]+?)\s*\}\}/g)) {
-    const inner = m[1].trim();
-    if (hasSecretScheme(inner)) refs.add(inner);
-  }
-  if (refs.size === 0) return {};
-  const out = {};
-  await Promise.all([...refs].map(async (ref) => {
-    const value = await resolveExternalSecret(ref);
-    if (value !== null) out[ref] = value;
-  }));
-  return out;
+  return resolveInlineSecretRefs(haystack);
 }
 async function executeRunnerRequest(opts) {
   const { req, collectionVars, envVars, globals: globals2, dispatcher, piiMaskPatterns, proxy, tls, onScriptOutput } = opts;
@@ -2938,6 +2941,7 @@ exports.registerSecretProvider = registerSecretProvider;
 exports.registeredSchemes = registeredSchemes;
 exports.resolveDataRow = resolveDataRow;
 exports.resolveExternalSecret = resolveExternalSecret;
+exports.resolveInlineSecretRefs = resolveInlineSecretRefs;
 exports.runGraphqlWsTest = runGraphqlWsTest;
 exports.runMqttTest = runMqttTest;
 exports.runScript = runScript;

package/out/main/contract.js

@@ -2,7 +2,7 @@
 "use strict";
 const promises = require("node:fs/promises");
 const path = require("node:path");
-const brokerClient = require("./chunks/broker-client-CJBfpvbd.js");
+const brokerClient = require("./chunks/broker-client-BQBPAPCZ.js");
 const escape = require("./chunks/escape-DDVAlOvZ.js");
 const crypto = require("node:crypto");
 const undici = require("undici");
@@ -11,7 +11,7 @@ const cliCommon = require("./chunks/cli-common-GnihVSjU.js");
 const node_child_process = require("node:child_process");
 const jsYaml = require("js-yaml");
 const environments = require("./chunks/environments-iM3SUM-4.js");
-require("./chunks/request-exec-CgyqbNWk.js");
+require("./chunks/request-exec-CEmSNDIG.js");
 require("fs/promises");
 require("tls");
 require("./chunks/handle-Crv1i9hb.js");

package/out/main/flow.js

@@ -2,7 +2,7 @@
 "use strict";
 const promises = require("node:fs/promises");
 const path = require("node:path");
-const requestExec = require("./chunks/request-exec-CgyqbNWk.js");
+const requestExec = require("./chunks/request-exec-CEmSNDIG.js");
 const requestCollection = require("./chunks/request-collection-gkOYlWml.js");
 const environments = require("./chunks/environments-iM3SUM-4.js");
 const flowEngine = require("./chunks/flow-engine-BxwjEy37.js");
@@ -268,7 +268,7 @@ async function main() {
   const envName = args.environment ?? args.env;
   const env = environments.selectEnvironment(workspace, environments$1, envName);
   const verbose = Boolean(args.verbose);
-  const version = `v${"0.7.9"}`;
+  const version = `v${"0.8.1"}`;
   console.log("");
   console.log(cliCommon.color("  API Flow Runner" + (version ? ` ${version}` : ""), cliCommon.C.bold, cliCommon.C.white));
   console.log(cliCommon.color(`  Flow:        ${flow.name}`, cliCommon.C.gray));

package/out/main/index.js

@@ -29,7 +29,7 @@ const promises = require("node:fs/promises");
 const crypto = require("node:crypto");
 const JSZip = require("jszip");
 const dataFiles = require("./chunks/data-files-BYqhsoPe.js");
-const requestExec = require("./chunks/request-exec-CgyqbNWk.js");
+const requestExec = require("./chunks/request-exec-CEmSNDIG.js");
 const ipcValidate = require("./chunks/ipc-validate-sqUFqRmE.js");
 const uuid = require("uuid");
 const jsYaml = require("js-yaml");
@@ -48,7 +48,7 @@ const grpc = require("@grpc/grpc-js");
 const protoLoader = require("@grpc/proto-loader");
 const soapHandler = require("./chunks/soap-handler-Brr7BPWO.js");
 const escape = require("./chunks/escape-DDVAlOvZ.js");
-const brokerClient = require("./chunks/broker-client-CJBfpvbd.js");
+const brokerClient = require("./chunks/broker-client-BQBPAPCZ.js");
 const simpleGit = require("simple-git");
 const recorder = require("./chunks/recorder-BkO8G_mB.js");
 const electronUpdater = require("electron-updater");
@@ -1130,7 +1130,12 @@ function parseParams$1(urlObj) {
 function parseUrl(urlObj) {
   if (!urlObj) return "";
   if (typeof urlObj === "string") return urlObj;
-  return urlObj.raw ?? "";
+  const raw = urlObj.raw ?? "";
+  if (Array.isArray(urlObj.query) && urlObj.query.length) {
+    const q = raw.indexOf("?");
+    if (q !== -1) return raw.slice(0, q);
+  }
+  return raw;
 }
 function parseBody$1(body) {
   if (!body) return { mode: "none" };
@@ -1842,7 +1847,7 @@ function parseBruFile(content, fileName) {
       break;
     }
   }
-  const url = methodAttrs["url"] ?? "";
+  let url = methodAttrs["url"] ?? "";
   const bodyMode = methodAttrs["body"] ?? "none";
   const authMode = methodAttrs["auth"] ?? "none";
   const headers = Object.entries(parseKv(extractBlock(content, "headers"))).map(([k, v]) => ({
@@ -1855,6 +1860,10 @@ function parseBruFile(content, fileName) {
     value: v,
     enabled: true
   }));
+  if (params.length) {
+    const q = url.indexOf("?");
+    if (q !== -1) url = url.slice(0, q);
+  }
   let body = { mode: "none" };
   if (bodyMode === "json") {
     const jsonContent = extractBlock(content, "body:json") ?? "";
@@ -5498,10 +5507,12 @@ function registerMockHandlers(ipc) {
     return JSON.parse(raw);
   });
 }
-async function resolveVars(ctx) {
+async function resolveVars(ctx, auth) {
   const envVars = await requestExec.buildEnvVars(ctx?.environment ?? null);
   const dynamic = await requestExec.buildDynamicVars();
-  return requestExec.mergeVars(envVars, ctx?.collectionVars ?? {}, ctx?.globals ?? {}, {}, dynamic);
+  const scope = requestExec.mergeVars(envVars, ctx?.collectionVars ?? {}, ctx?.globals ?? {}, {}, dynamic);
+  const inline = await requestExec.resolveInlineSecretRefs(JSON.stringify(auth ?? {}));
+  return { ...scope, ...inline };
 }
 async function resolveClientSecret(auth, vars) {
   let secret = auth.oauth2ClientSecret ?? "";
@@ -5601,7 +5612,7 @@ async function browserFlow(auth, vars, flow) {
 function registerOAuth2Handlers(ipc) {
   handle.handleIpc(ipc, handle.IPC.oauth2.startFlow, async (_e, auth, ctx) => {
     if (auth.type !== "oauth2") throw new Error("OAuth 2.0: auth is not an oauth2 config.");
-    const vars = await resolveVars(ctx);
+    const vars = await resolveVars(ctx, auth);
     const flow = auth.oauth2Flow ?? "client_credentials";
     if (flow === "authorization_code" || flow === "implicit") {
       return browserFlow(auth, vars, flow);
@@ -5609,7 +5620,7 @@ function registerOAuth2Handlers(ipc) {
     return requestExec.fetchOAuth2Token(auth, vars);
   });
   handle.handleIpc(ipc, handle.IPC.oauth2.refreshToken, async (_e, auth, ctx, refreshToken) => {
-    const vars = await resolveVars(ctx);
+    const vars = await resolveVars(ctx, auth);
     const tokenUrl = requestExec.interpolate(auth.oauth2TokenUrl ?? "", vars);
     const clientId = requestExec.interpolate(auth.oauth2ClientId ?? "", vars);
     let clientSecret = auth.oauth2ClientSecret ?? "";
@@ -7301,7 +7312,7 @@ function isNewer(a, b) {
   return a2 > b2;
 }
 async function checkForUpdate() {
-  const current = "0.7.9";
+  const current = "0.8.1";
   try {
     const res = await fetch(REGISTRY_URL, { signal: AbortSignal.timeout(4e3) });
     if (!res.ok) return null;

package/out/main/lib.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const mockServer = require("./chunks/mock-server-C4kTFkod.js");
-const requestExec = require("./chunks/request-exec-CgyqbNWk.js");
+const requestExec = require("./chunks/request-exec-CEmSNDIG.js");
 const flowEngine = require("./chunks/flow-engine-BxwjEy37.js");
 require("node:http");
 require("node:crypto");

package/out/main/perf-worker.js

@@ -1,6 +1,6 @@
 "use strict";
-const perfRun = require("./chunks/perf-run-Co_5unBR.js");
-const requestExec = require("./chunks/request-exec-CgyqbNWk.js");
+const perfRun = require("./chunks/perf-run-D02WoC6i.js");
+const requestExec = require("./chunks/request-exec-CEmSNDIG.js");
 require("@grpc/grpc-js");
 require("@grpc/proto-loader");
 require("node:fs");

package/out/main/perf.js

@@ -2,10 +2,10 @@
 "use strict";
 const promises = require("node:fs/promises");
 const path = require("node:path");
-const requestExec = require("./chunks/request-exec-CgyqbNWk.js");
+const requestExec = require("./chunks/request-exec-CEmSNDIG.js");
 const environments = require("./chunks/environments-iM3SUM-4.js");
 const flowEngine = require("./chunks/flow-engine-BxwjEy37.js");
-const perfRun = require("./chunks/perf-run-Co_5unBR.js");
+const perfRun = require("./chunks/perf-run-D02WoC6i.js");
 const perfReport = require("./chunks/perf-report-ChaO3K0w.js");
 const cliCommon = require("./chunks/cli-common-GnihVSjU.js");
 require("undici");
@@ -191,7 +191,7 @@ async function main() {
     targetLabel = `flow: ${flow.name}`;
   }
   const load = perfRun.deriveLoad(plan);
-  const version = `v${"0.7.9"}`;
+  const version = `v${"0.8.1"}`;
   console.log("");
   console.log(cliCommon.color("  API Performance" + (version ? ` ${version}` : ""), cliCommon.C.bold, cliCommon.C.white));
   console.log(cliCommon.color(`  Plan:        ${plan.name}`, cliCommon.C.gray));

package/out/main/runner.js

@@ -2,7 +2,7 @@
 "use strict";
 const promises = require("node:fs/promises");
 const path = require("node:path");
-const requestExec = require("./chunks/request-exec-CgyqbNWk.js");
+const requestExec = require("./chunks/request-exec-CEmSNDIG.js");
 const escape = require("./chunks/escape-DDVAlOvZ.js");
 const requestCollection = require("./chunks/request-collection-gkOYlWml.js");
 const runConcurrent = require("./chunks/run-concurrent-468tH0AX.js");
@@ -551,7 +551,7 @@ async function main() {
   } else if (!envName && workspace.settings?.defaultEnvironment && !env) {
     console.warn(cliCommon.color(`Warning: default environment "${workspace.settings.defaultEnvironment}" not found. Running without environment.`, cliCommon.C.yellow));
   }
-  const version = `v${"0.7.9"}`;
+  const version = `v${"0.8.1"}`;
   console.log("");
   console.log(cliCommon.color("  API Test Runner" + (version ? ` ${version}` : ""), cliCommon.C.bold, cliCommon.C.white));
   console.log(cliCommon.color(`  Workspace:   ${wsPath}`, cliCommon.C.gray));

package/out/renderer/assets/{GraphQLEditor-CXvLKrnv.js → GraphQLEditor-DRHpuBUa.js}

@@ -1,5 +1,5 @@
 import { l as linter, E as EditorView, L as LanguageSupport, f as LRLanguage, s as styleTags, i as indentNodeProp, m as delimitedIndent, n as foldNodeProp, p as foldInside, S as StateField, q as LRParser, u as StateEffect, v as tags, a as reactExports, j as jsxRuntimeExports, d as ReactCodeMirror, o as oneDark, c as json } from "./codemirror-CdIFBPs2.js";
-import { u as useT, a as useStore, b as useActiveEnvironment, i as isSubscriptionQuery } from "./index-BUFSn_qD.js";
+import { u as useT, a as useStore, b as useActiveEnvironment, i as isSubscriptionQuery } from "./index-B_7rAo5x.js";
 import "./ajv-CJPwFjiP.js";
 function devAssert(condition, message) {
   const booleanCondition = Boolean(condition);

package/out/renderer/assets/{SoapEditor-7hxhISPZ.js → SoapEditor-fOGCq_ap.js}

@@ -1,5 +1,5 @@
 import { a as reactExports, j as jsxRuntimeExports, d as ReactCodeMirror, o as oneDark, x as xml } from "./codemirror-CdIFBPs2.js";
-import { u as useT, c as btnPrimaryCls, d as commentKeymap } from "./index-BUFSn_qD.js";
+import { u as useT, c as btnPrimaryCls, d as commentKeymap } from "./index-B_7rAo5x.js";
 import "./ajv-CJPwFjiP.js";
 const SOAP_11_CONTENT_TYPE = "text/xml; charset=utf-8";
 const SOAP_12_CONTENT_TYPE = "application/soap+xml; charset=utf-8";

package/out/renderer/assets/{index-BUFSn_qD.js → index-B_7rAo5x.js}

@@ -1,4 +1,4 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./GraphQLEditor-CXvLKrnv.js","./codemirror-CdIFBPs2.js","./ajv-CJPwFjiP.js","./SoapEditor-7hxhISPZ.js"])))=>i.map(i=>d[i]);
+const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./GraphQLEditor-DRHpuBUa.js","./codemirror-CdIFBPs2.js","./ajv-CJPwFjiP.js","./SoapEditor-fOGCq_ap.js"])))=>i.map(i=>d[i]);
 import { r as requireReact, g as getDefaultExportFromCjs, R as React, a as reactExports, b as autocompletion, h as hoverTooltip, j as jsxRuntimeExports, k as keymap, t as toggleComment, x as xml, c as json, d as ReactCodeMirror, o as oneDark, e as javascript } from "./codemirror-CdIFBPs2.js";
 import { r as requireAjv } from "./ajv-CJPwFjiP.js";
 var client = { exports: {} };
@@ -24891,7 +24891,7 @@ function Modal({
   subtitle,
   overlayClassName = DEFAULT_OVERLAY,
   panelClassName = DEFAULT_PANEL,
-  closeOnBackdrop = true,
+  closeOnBackdrop = false,
   closeOnEscape = true,
   children: children2
 }) {
@@ -28427,8 +28427,8 @@ function jsonWithComments() {
 function xmlWithComments() {
   return [xml(), commentKeymap];
 }
-const GraphQLEditor = reactExports.lazy(() => __vitePreload(() => import("./GraphQLEditor-CXvLKrnv.js"), true ? __vite__mapDeps([0,1,2]) : void 0, import.meta.url).then((m) => ({ default: m.GraphQLEditor })));
-const SoapEditor = reactExports.lazy(() => __vitePreload(() => import("./SoapEditor-7hxhISPZ.js"), true ? __vite__mapDeps([3,1,2]) : void 0, import.meta.url).then((m) => ({ default: m.SoapEditor })));
+const GraphQLEditor = reactExports.lazy(() => __vitePreload(() => import("./GraphQLEditor-DRHpuBUa.js"), true ? __vite__mapDeps([0,1,2]) : void 0, import.meta.url).then((m) => ({ default: m.GraphQLEditor })));
+const SoapEditor = reactExports.lazy(() => __vitePreload(() => import("./SoapEditor-fOGCq_ap.js"), true ? __vite__mapDeps([3,1,2]) : void 0, import.meta.url).then((m) => ({ default: m.SoapEditor })));
 function BodyTab({ request: request2, onChange }) {
   const t2 = useT();
   const editorFallback = /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "p-4 text-xs text-surface-500", children: t2("Loading editor…") });
@@ -31315,11 +31315,10 @@ function AskVarsModal({ asks, requestName, onSubmit, onCancel }) {
       onCancel();
     }
   }
-  return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "fixed inset-0 z-50 flex items-center justify-center bg-black/50", onMouseDown: onCancel, children: /* @__PURE__ */ jsxRuntimeExports.jsxs(
+  return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "fixed inset-0 z-50 flex items-center justify-center bg-black/50", children: /* @__PURE__ */ jsxRuntimeExports.jsxs(
     "div",
     {
       className: "bg-surface-900 border border-surface-700 rounded-lg shadow-xl w-[420px] max-h-[80vh] flex flex-col",
-      onMouseDown: (e) => e.stopPropagation(),
       onKeyDown,
       children: [
         /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "px-4 py-3 border-b border-surface-800 flex-shrink-0", children: [
@@ -35877,7 +35876,7 @@ function WelcomeScreen() {
         )
       ] }),
       /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-surface-400 text-sm max-w-sm", children: t2("Local-first API testing with Robot Framework & Playwright code generation. Secrets stay on your machine.") }),
-      /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-[11px] mt-3", style: { color: "var(--text-muted)" }, children: t2("version :version", { version: "0.7.9" }) })
+      /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-[11px] mt-3", style: { color: "var(--text-muted)" }, children: t2("version :version", { version: "0.8.1" }) })
     ] }),
     /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col gap-3 w-64", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -56012,7 +56011,7 @@ function App() {
       /* @__PURE__ */ jsxRuntimeExports.jsx("span", { style: { color: "#6aa3c8" }, children: "Spector" }),
       /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "ml-2 text-[10px] font-normal opacity-50", children: [
         "v",
-        "0.7.9"
+        "0.8.1"
       ] }),
       /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "mx-2 opacity-30", children: "·" }),
       /* @__PURE__ */ jsxRuntimeExports.jsx(

package/out/renderer/index.html

@@ -5,7 +5,7 @@
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>API Spector</title>
-  <script type="module" crossorigin src="./assets/index-BUFSn_qD.js"></script>
+  <script type="module" crossorigin src="./assets/index-B_7rAo5x.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/codemirror-CdIFBPs2.js">
   <link rel="modulepreload" crossorigin href="./assets/ajv-CJPwFjiP.js">
   <link rel="stylesheet" crossorigin href="./assets/index-DkhdKzQJ.css">

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@testsmith/api-spector",
   "productName": "API Spector",
-  "version": "0.7.9",
+  "version": "0.8.1",
   "description": "Local-first API testing tool to inspect, test and mock APIs",
   "repository": {
     "type": "git",