@testsmith/api-spector 0.8.3 → 0.8.5

package/out/main/chunks/{broker-client-BQBPAPCZ.js → broker-client-BLNAmcIO.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-CEmSNDIG.js");
+const requestExec = require("./request-exec-WMdzNu1m.js");
 const Ajv = require("ajv");
 const jsYaml = require("js-yaml");
 require("node:http");

package/out/main/chunks/{handle-Crv1i9hb.js → handle-_4XMUlwm.js}

@@ -82,6 +82,7 @@ const IPC = {
     http: "import:http",
     har: "import:har",
     arazzo: "import:arazzo",
+    wsdl: "import:wsdl",
     spector: "import:spector",
     openapiSchemas: "import:openapi-schemas",
     openapiSchemasUrl: "import:openapi-schemas-url"
@@ -282,6 +283,8 @@ const IPC = {
   },
   // ─── Cloud (API Spector Cloud integration) ──────────────────────────────────
   cloud: {
+    /** One-click connect: browser consent + PKCE, returns a fresh token. */
+    connect: "cloud:connect",
     /** Verify the endpoint + token (GET /api/me). */
     test: "cloud:test",
     /** Push a mock server definition (POST /api/mocks). */

package/out/main/chunks/{import-DTcZMRNu.js → import-ujxXe3Uu.js}

@@ -1,22 +1,11 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const uuid = require("uuid");
-const soapHandler = require("./soap-handler-Brr7BPWO.js");
-require("./handle-Crv1i9hb.js");
+const soapHandler = require("./soap-handler-BF5ii0UV.js");
+require("./handle-_4XMUlwm.js");
 require("node:https");
 require("node:http");
 require("@xmldom/xmldom");
-const SOAP_11_CONTENT_TYPE = "text/xml; charset=utf-8";
-const SOAP_12_CONTENT_TYPE = "application/soap+xml; charset=utf-8";
-function contentTypeForSoap(version) {
-  return version === "1.2" ? SOAP_12_CONTENT_TYPE : SOAP_11_CONTENT_TYPE;
-}
-function withContentType(headers, value) {
-  const idx = headers.findIndex((h) => h.key.toLowerCase() === "content-type");
-  const next = { key: "Content-Type", value, enabled: true };
-  if (idx === -1) return [...headers, next];
-  return headers.map((h, i) => i === idx ? { ...h, value, enabled: true } : h);
-}
 function buildRequestsFromWsdl(parsed) {
   const out = [];
   const byName = /* @__PURE__ */ new Map();
@@ -25,13 +14,13 @@ function buildRequestsFromWsdl(parsed) {
     if (!existing || existing.soapVersion === "1.2" && op.soapVersion === "1.1") byName.set(op.name, op);
   }
   for (const op of byName.values()) {
-    const ct = contentTypeForSoap(op.soapVersion);
+    const ct = soapHandler.contentTypeForSoap(op.soapVersion);
     const req = {
       id: uuid.v4(),
       name: op.name,
       method: "POST",
       url: op.endpoint ?? "",
-      headers: withContentType([], ct),
+      headers: soapHandler.withContentType([], ct),
       params: [],
       auth: { type: "none" },
       protocol: "soap",
@@ -102,7 +91,7 @@ function buildMockFromWsdl(name, parsed, existingPorts = []) {
       method: "POST",
       path: routePath,
       statusCode: 200,
-      headers: { "Content-Type": contentTypeForSoap(version) },
+      headers: { "Content-Type": soapHandler.contentTypeForSoap(version) },
       body: "",
       description: `SOAP ${version} - dispatched per operation`,
       script: soapHandler.buildMockDispatchScript(),

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

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

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

@@ -24,7 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 const undici = require("undici");
 const promises$1 = require("fs/promises");
 const nodeTls = require("tls");
-const handle = require("./handle-Crv1i9hb.js");
+const handle = require("./handle-_4XMUlwm.js");
 const fs = require("node:fs");
 const os = require("node:os");
 const path = require("node:path");
@@ -786,6 +786,8 @@ async function getSecret(ref) {
   }
   return process.env[ref] ?? null;
 }
+const PATH_PARAM_PATTERN = String.raw`\[([A-Za-z_]\w*)\]|(?<!\{)\{([A-Za-z_]\w*)\}(?!\})`;
+const PATH_PARAM_RE = new RegExp(PATH_PARAM_PATTERN, "g");
 let _fakerCache$1 = null;
 async function getFaker$1() {
   _fakerCache$1 ??= await import("@faker-js/faker");
@@ -841,8 +843,8 @@ function buildUrl(baseUrl, params, vars) {
     templateTokens.add(String(name).trim());
     return "";
   });
-  baseUrl.replaceAll(/\[([A-Za-z_]\w*)\]/g, (_m, name) => {
-    templateTokens.add(String(name));
+  baseUrl.replaceAll(PATH_PARAM_RE, (_m, g1, g2) => {
+    templateTokens.add(g1 ?? g2);
     return "";
   });
   const enabled = (params ?? []).filter((p) => p.enabled && p.key);
@@ -858,7 +860,10 @@ function buildUrl(baseUrl, params, vars) {
     ...Object.fromEntries(pathRows.map((p) => [p.key, interpolate(p.value, vars)]))
   } : vars;
   let url = interpolate(baseUrl, mergedVars);
-  url = url.replaceAll(/\[([A-Za-z_]\w*)\]/g, (m, name) => name in mergedVars ? mergedVars[name] : m);
+  url = url.replaceAll(PATH_PARAM_RE, (m, g1, g2) => {
+    const name = g1 ?? g2;
+    return name in mergedVars ? mergedVars[name] : m;
+  });
   if (!queryRows.length) return url;
   const sep = url.includes("?") ? "&" : "?";
   const qs = queryRows.map((p) => `${encodeURIComponent(interpolate(p.key, vars))}=${encodeURIComponent(interpolate(p.value, vars))}`).join("&");
@@ -1559,6 +1564,63 @@ async function readStream(body, kind, startMs, opts = {}) {
   }
   return { events, text, close, firstEventMs: Math.max(firstEventMs, 0) };
 }
+function jsonCommentRanges(input) {
+  const ranges = [];
+  const n = input.length;
+  let i = 0;
+  let inString = false;
+  while (i < n) {
+    const c = input[i];
+    if (inString) {
+      if (c === "\\") {
+        i += 2;
+        continue;
+      }
+      if (c === '"') inString = false;
+      i++;
+      continue;
+    }
+    if (c === '"') {
+      inString = true;
+      i++;
+      continue;
+    }
+    const next = input[i + 1];
+    if (c === "/" && next === "/") {
+      const from = i;
+      i += 2;
+      while (i < n && input[i] !== "\n") i++;
+      ranges.push({ from, to: i, type: "line" });
+      continue;
+    }
+    if (c === "/" && next === "*") {
+      const from = i;
+      i += 2;
+      while (i < n && !(input[i] === "*" && input[i + 1] === "/")) i++;
+      i = Math.min(i + 2, n);
+      ranges.push({ from, to: i, type: "block" });
+      continue;
+    }
+    i++;
+  }
+  return ranges;
+}
+function stripJsonComments(input) {
+  const ranges = jsonCommentRanges(input);
+  if (!ranges.length) return input;
+  let out = "";
+  let pos = 0;
+  for (const r of ranges) {
+    out += input.slice(pos, r.from);
+    if (r.type === "block") {
+      const seg = input.slice(r.from, r.to);
+      for (let k = 0; k < seg.length; k++) if (seg[k] === "\n") out += "\n";
+    }
+    pos = r.to;
+  }
+  out += input.slice(pos);
+  return out;
+}
 async function runMqttTest(cfg) {
   const messages = [];
   const collectMs = Math.max(0, Math.min(6e4, Math.floor(cfg.collectMs ?? 2e3)));
@@ -2460,7 +2522,7 @@ async function buildDispatcher(proxy, tls) {
 function buildBodyAndApplyHeaders(req, vars, headers) {
   let body;
   if (req.body.mode === "json" && req.body.json) {
-    body = interpolate(req.body.json, vars);
+    body = interpolate(stripJsonComments(req.body.json), vars);
     if (!headers.has("content-type")) headers.set("Content-Type", "application/json");
   } else if (req.body.mode === "form" && req.body.form) {
     body = req.body.form.filter((p) => p.enabled && p.key).map((p) => `${encodeURIComponent(interpolate(p.key, vars))}=${encodeURIComponent(interpolate(p.value, vars))}`).join("&");
@@ -2474,7 +2536,7 @@ function buildBodyAndApplyHeaders(req, vars, headers) {
     const rawVars = gql.variables?.trim();
     if (rawVars) {
       try {
-        gqlBody.variables = JSON.parse(interpolate(rawVars, vars));
+        gqlBody.variables = JSON.parse(interpolate(stripJsonComments(rawVars), vars));
       } catch {
       }
     }
@@ -2633,6 +2695,9 @@ async function executeRunnerRequest(opts) {
     status: "running"
   };
   const dynamicVars = await buildDynamicVars();
+  if (req.variables && Object.keys(req.variables).length > 0) {
+    localVars = { ...req.variables, ...localVars };
+  }
   if (localVars && Object.keys(localVars).length > 0) {
     localVars = resolveDataRow(localVars, mergeVars(envVars, collectionVars, globals2, {}, dynamicVars, folderVars));
   }
@@ -2949,4 +3014,5 @@ exports.runSocketIoTest = runSocketIoTest;
 exports.runWsTest = runWsTest;
 exports.setGlobals = setGlobals;
 exports.setSecretsConfig = setSecretsConfig;
+exports.stripJsonComments = stripJsonComments;
 exports.syntheticHttpFailure = syntheticHttpFailure;

package/out/main/chunks/{soap-handler-Brr7BPWO.js → soap-handler-BF5ii0UV.js}

@@ -1,8 +1,19 @@
 "use strict";
-const handle = require("./handle-Crv1i9hb.js");
+const handle = require("./handle-_4XMUlwm.js");
 const https = require("node:https");
 const http = require("node:http");
 const xmldom = require("@xmldom/xmldom");
+const SOAP_11_CONTENT_TYPE = "text/xml; charset=utf-8";
+const SOAP_12_CONTENT_TYPE = "application/soap+xml; charset=utf-8";
+function contentTypeForSoap(version) {
+  return version === "1.2" ? SOAP_12_CONTENT_TYPE : SOAP_11_CONTENT_TYPE;
+}
+function withContentType(headers, value) {
+  const idx = headers.findIndex((h) => h.key.toLowerCase() === "content-type");
+  const next = { key: "Content-Type", value, enabled: true };
+  if (idx === -1) return [...headers, next];
+  return headers.map((h, i) => i === idx ? { ...h, value, enabled: true } : h);
+}
 function fetchUrl(url, headers = {}) {
   return new Promise((resolveP, rejectP) => {
     const lib = url.startsWith("https") ? https : http;
@@ -313,13 +324,25 @@ function registerSoapHandlers(ipc) {
   handle.handleIpc(ipc, handle.IPC.wsdl.import, async (_event, opts) => {
     const { validateWsdlImport } = await Promise.resolve().then(() => require("./ipc-validate-sqUFqRmE.js"));
     validateWsdlImport(opts);
-    const { importWsdl } = await Promise.resolve().then(() => require("./import-DTcZMRNu.js"));
+    const { importWsdl } = await Promise.resolve().then(() => require("./import-ujxXe3Uu.js"));
     const wsdlText = opts.xml ?? (opts.url ? await fetchUrl(opts.url) : "");
     if (!wsdlText) throw new Error("wsdl:import requires either `url` or `xml`");
     return importWsdl(wsdlText, { name: opts.name, existingMockPorts: opts.existingMockPorts });
   });
 }
+const soapHandler = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  buildEnvelopeTemplate,
+  buildMockDispatchScript,
+  buildResponseEnvelope,
+  fetchUrl,
+  parseWsdl,
+  registerSoapHandlers
+}, Symbol.toStringTag, { value: "Module" }));
 exports.buildMockDispatchScript = buildMockDispatchScript;
 exports.buildResponseEnvelope = buildResponseEnvelope;
+exports.contentTypeForSoap = contentTypeForSoap;
 exports.parseWsdl = parseWsdl;
 exports.registerSoapHandlers = registerSoapHandlers;
+exports.soapHandler = soapHandler;
+exports.withContentType = withContentType;

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-BQBPAPCZ.js");
+const brokerClient = require("./chunks/broker-client-BLNAmcIO.js");
 const escape = require("./chunks/escape-DDVAlOvZ.js");
 const crypto = require("node:crypto");
 const undici = require("undici");
@@ -11,10 +11,10 @@ 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-CEmSNDIG.js");
+require("./chunks/request-exec-WMdzNu1m.js");
 require("fs/promises");
 require("tls");
-require("./chunks/handle-Crv1i9hb.js");
+require("./chunks/handle-_4XMUlwm.js");
 require("node:fs");
 require("dayjs");
 require("node:vm");

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-CEmSNDIG.js");
+const requestExec = require("./chunks/request-exec-WMdzNu1m.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");
@@ -10,7 +10,7 @@ const cliCommon = require("./chunks/cli-common-GnihVSjU.js");
 require("undici");
 require("fs/promises");
 require("tls");
-require("./chunks/handle-Crv1i9hb.js");
+require("./chunks/handle-_4XMUlwm.js");
 require("node:fs");
 require("node:os");
 require("node:crypto");
@@ -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.8.3"}`;
+  const version = `v${"0.8.5"}`;
   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));