@testsmith/api-spector 0.8.7 → 0.8.8

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

package/out/main/chunks/{perf-run-Dcb-A4Ln.js → perf-run-wfdvpJev.js}

@@ -1,12 +1,12 @@
 "use strict";
-const requestExec = require("./request-exec-BI4sXJop.js");
+const requestExec = require("./request-exec-s7k-oRi2.js");
 const grpc = require("@grpc/grpc-js");
 const protoLoader = require("@grpc/proto-loader");
 const fs = require("node:fs");
 const os = require("node:os");
 const path = require("node:path");
 const flowEngine = require("./flow-engine-BxwjEy37.js");
-const requestCollection = require("./request-collection-gkOYlWml.js");
+const requestCollection = require("./request-collection-zRRUfg0X.js");
 function _interopNamespaceDefault(e) {
   const n2 = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -391,7 +391,7 @@ function createGrpcInvoker(cfg) {
 }
 async function buildFlowDeps(payload) {
   const envVars = payload.resolvedEnvVars ?? await requestExec.buildEnvVars(payload.environment ?? null);
-  const globals = { ...payload.globals, ...requestExec.getGlobals() };
+  const globals = { ...payload.globals, ...requestCollection.getGlobals() };
   const dispatcher = await requestExec.buildDispatcher(payload.proxy, payload.tls);
   const flow = flowEngine.normalizeFlow(payload.flow);
   const flows = (payload.flows ?? []).map(flowEngine.normalizeFlow);
@@ -509,7 +509,7 @@ async function runPerfPlan(payload, onProgress) {
     if (!payload.collection) throw new Error("No collection selected for this plan");
     const collection = payload.collection;
     const envVars = payload.resolvedEnvVars ?? await requestExec.buildEnvVars(payload.environment ?? null);
-    const globals = { ...payload.globals, ...requestExec.getGlobals() };
+    const globals = { ...payload.globals, ...requestCollection.getGlobals() };
     const dispatcher = await requestExec.buildDispatcher(payload.proxy, payload.tls);
     const items = requestCollection.buildRunPlan(collection, plan.target.folderId ?? null, []);
     if (items.length === 0) throw new Error("This collection or folder has no requests to run");

package/out/main/chunks/{request-collection-gkOYlWml.js → request-collection-zRRUfg0X.js}

@@ -1,5 +1,32 @@
 "use strict";
+const promises = require("node:fs/promises");
+const path = require("node:path");
 require("uuid");
+let globals = {};
+let currentDir = null;
+function globalsPath(dir) {
+  return path.join(dir, "globals.json");
+}
+async function loadGlobals(workspaceDir) {
+  currentDir = workspaceDir;
+  try {
+    const raw = await promises.readFile(globalsPath(workspaceDir), "utf8");
+    globals = JSON.parse(raw);
+  } catch {
+    globals = {};
+  }
+  return { ...globals };
+}
+async function persistGlobals() {
+  if (!currentDir) return;
+  await promises.writeFile(globalsPath(currentDir), JSON.stringify(globals, null, 2), "utf8");
+}
+function getGlobals() {
+  return { ...globals };
+}
+function setGlobals(next) {
+  globals = { ...next };
+}
 function orderedChildren(folder) {
   const reqSet = new Set(folder.requestIds);
   const folderSet = new Set(folder.folders.map((f) => f.id));
@@ -131,8 +158,8 @@ function buildFolderPlan(folder, requests, collectionVars, filterTags, scopeId,
 function folderPathTo(root, requestId) {
   if (root.requestIds.includes(requestId)) return [root];
   for (const sub of root.folders) {
-    const path = folderPathTo(sub, requestId);
-    if (path.length > 0) return [root, ...path];
+    const path2 = folderPathTo(sub, requestId);
+    if (path2.length > 0) return [root, ...path2];
   }
   return [];
 }
@@ -184,8 +211,8 @@ function authIsConfigured(auth) {
 function resolveInheritedAuthAndHeaders(requestId, collection) {
   let inheritedAuth = collection.auth && collection.auth.type !== "none" ? collection.auth : null;
   let inheritedHeaders = collection.headers?.filter((h) => h.enabled && h.key) ?? [];
-  const path = folderPathTo(collection.rootFolder, requestId);
-  for (const folder of path) {
+  const path2 = folderPathTo(collection.rootFolder, requestId);
+  for (const folder of path2) {
     if (folder.auth && folder.auth.type !== "none") inheritedAuth = folder.auth;
     if (folder.headers?.length) {
       inheritedHeaders = [...inheritedHeaders, ...folder.headers.filter((h) => h.enabled && h.key)];
@@ -324,4 +351,8 @@ exports.buildRunPlan = buildRunPlan;
 exports.expandFolderDataSets = expandFolderDataSets;
 exports.expandRunPlanWithData = expandRunPlanWithData;
 exports.getAllApplicableHooks = getAllApplicableHooks;
+exports.getGlobals = getGlobals;
+exports.loadGlobals = loadGlobals;
+exports.persistGlobals = persistGlobals;
 exports.resolveInheritedAuthAndHeaders = resolveInheritedAuthAndHeaders;
+exports.setGlobals = setGlobals;

package/out/main/chunks/{request-exec-BI4sXJop.js → request-exec-s7k-oRi2.js}

@@ -59,34 +59,6 @@ function _interopNamespaceDefault(e) {
 const nodeTls__namespace = /* @__PURE__ */ _interopNamespaceDefault(nodeTls);
 const crypto__namespace = /* @__PURE__ */ _interopNamespaceDefault(crypto);
 const vm__namespace = /* @__PURE__ */ _interopNamespaceDefault(vm);
-let globals = {};
-let currentDir = null;
-function globalsPath(dir) {
-  return path.join(dir, "globals.json");
-}
-async function loadGlobals(workspaceDir) {
-  currentDir = workspaceDir;
-  try {
-    const raw = await promises.readFile(globalsPath(workspaceDir), "utf8");
-    globals = JSON.parse(raw);
-  } catch {
-    globals = {};
-  }
-  return { ...globals };
-}
-async function persistGlobals() {
-  if (!currentDir) return;
-  await promises.writeFile(globalsPath(currentDir), JSON.stringify(globals, null, 2), "utf8");
-}
-function getGlobals() {
-  return { ...globals };
-}
-function setGlobals(next) {
-  globals = { ...next };
-}
-function patchGlobals(patch) {
-  globals = { ...globals, ...patch };
-}
 const providers = /* @__PURE__ */ new Map();
 function registerSecretProvider(provider) {
   providers.set(provider.scheme.toLowerCase(), provider);
@@ -932,9 +904,9 @@ async function resolveInlineSecretRefs(text) {
   }));
   return out;
 }
-function mergeVars(envVars, collectionVars, globals2, localVars = {}, dynamicVars = {}, folderVars = {}) {
+function mergeVars(envVars, collectionVars, globals, localVars = {}, dynamicVars = {}, folderVars = {}) {
   const out = {};
-  for (const src of [dynamicVars, globals2, collectionVars, envVars, folderVars, localVars]) {
+  for (const src of [dynamicVars, globals, envVars, collectionVars, folderVars, localVars]) {
     for (const [k, v] of Object.entries(src ?? {})) {
       if (v == null) continue;
       out[k] = v;
@@ -1117,7 +1089,7 @@ class AssertionError extends Error {
   }
 }
 function buildAt(ctx, testResults, consoleOutput) {
-  const { envVars, collectionVars, globals: globals2, localVars, piiMaskPatterns = [] } = ctx;
+  const { envVars, collectionVars, globals, localVars, piiMaskPatterns = [] } = ctx;
   const folderVars = ctx.folderVars ?? {};
   const isSensitiveKey = (key) => piiMaskPatterns.some((p) => key.toLowerCase().includes(p.toLowerCase()));
   function makeVarScope(store, scopeName) {
@@ -1139,12 +1111,16 @@ function buildAt(ctx, testResults, consoleOutput) {
   const sp = {
     // Variable scopes
     variables: makeVarScope(localVars, "variables"),
+    // Request-scoped set/get. Request variables live in the local tier at run
+    // time, so this shares the local store: values apply for the current run (and
+    // the in-memory session) but are never written back to the saved collection.
+    request: makeVarScope(localVars, "request"),
     environment: makeVarScope(envVars, "environment"),
     collectionVariables: makeVarScope(collectionVars, "collectionVariables"),
     folder: makeVarScope(folderVars, "folder"),
-    globals: makeVarScope(globals2, "globals"),
+    globals: makeVarScope(globals, "globals"),
     // Convenience: get/set across all scopes (local wins)
-    variables_get: (key) => localVars[key] ?? envVars[key] ?? folderVars[key] ?? collectionVars[key] ?? globals2[key] ?? null,
+    variables_get: (key) => localVars[key] ?? envVars[key] ?? folderVars[key] ?? collectionVars[key] ?? globals[key] ?? null,
     variables_set: (key, value) => {
       localVars[key] = String(value);
     },
@@ -2683,7 +2659,7 @@ async function resolveInlineSecrets(req) {
   return resolveInlineSecretRefs(haystack);
 }
 async function executeRunnerRequest(opts) {
-  const { req, collectionVars, envVars, globals: globals2, dispatcher, piiMaskPatterns, proxy, tls, onScriptOutput } = opts;
+  const { req, collectionVars, envVars, globals, dispatcher, piiMaskPatterns, proxy, tls, onScriptOutput } = opts;
   let { localVars } = opts;
   const folderVars = opts.folderVars ?? {};
   applyRequestDefaults(req);
@@ -2699,12 +2675,12 @@ async function executeRunnerRequest(opts) {
     localVars = { ...req.variables, ...localVars };
   }
   if (localVars && Object.keys(localVars).length > 0) {
-    localVars = resolveDataRow(localVars, mergeVars(envVars, collectionVars, globals2, {}, dynamicVars, folderVars));
+    localVars = resolveDataRow(localVars, mergeVars(envVars, collectionVars, globals, {}, dynamicVars, folderVars));
   }
-  let vars = mergeVars(envVars, collectionVars, globals2, localVars, dynamicVars, folderVars);
+  let vars = mergeVars(envVars, collectionVars, globals, localVars, dynamicVars, folderVars);
   let updatedEnvVars = { ...envVars };
   let updatedCollectionVars = { ...collectionVars };
-  let updatedGlobals = { ...globals2 };
+  let updatedGlobals = { ...globals };
   let updatedFolderVars = { ...folderVars };
   let preScriptError;
   if (req.protocol === "mqtt") {
@@ -2726,7 +2702,7 @@ async function executeRunnerRequest(opts) {
       script: m.testScript ?? "",
       envVars,
       collectionVars,
-      globals: globals2,
+      globals,
       localVars
     });
     const status = testRes.error ? "error" : testRes.testResults.length === 0 ? "skipped" : testRes.testResults.every((t) => t.passed) ? "passed" : "failed";
@@ -2759,7 +2735,7 @@ async function executeRunnerRequest(opts) {
       script: req.websocket?.testScript ?? "",
       envVars,
       collectionVars,
-      globals: globals2,
+      globals,
       localVars
     }) : await runSocketIoTest({
       url: interpolate(req.url, vars),
@@ -2772,7 +2748,7 @@ async function executeRunnerRequest(opts) {
       script: req.socketio?.testScript ?? "",
       envVars,
       collectionVars,
-      globals: globals2,
+      globals,
       localVars
     });
     const status = testRes.error ? "error" : testRes.testResults.length === 0 ? "skipped" : testRes.testResults.every((t) => t.passed) ? "passed" : "failed";
@@ -2815,7 +2791,7 @@ async function executeRunnerRequest(opts) {
     const r = await runScript(interpolate(req.preRequestScript, vars), {
       envVars: { ...envVars },
       collectionVars: { ...collectionVars },
-      globals: { ...globals2 },
+      globals: { ...globals },
       localVars: { ...localVars },
       folderVars: { ...updatedFolderVars },
       piiMaskPatterns
@@ -2826,8 +2802,6 @@ async function executeRunnerRequest(opts) {
     updatedCollectionVars = r.updatedCollectionVars;
     updatedGlobals = r.updatedGlobals;
     updatedFolderVars = r.updatedFolderVars;
-    patchGlobals(r.updatedGlobals);
-    await persistGlobals();
     onScriptOutput?.("pre", r.consoleOutput, r.error);
     vars = mergeVars(updatedEnvVars, updatedCollectionVars, updatedGlobals, localVars, dynamicVars, updatedFolderVars);
     if (Object.keys(inlineSecrets).length) vars = { ...vars, ...inlineSecrets };
@@ -2870,8 +2844,6 @@ async function executeRunnerRequest(opts) {
       updatedGlobals = r.updatedGlobals;
       updatedFolderVars = r.updatedFolderVars;
       localVars = r.updatedLocalVars;
-      patchGlobals(r.updatedGlobals);
-      await persistGlobals();
       onScriptOutput?.("post", r.consoleOutput, r.error);
     }
     if (opts.expectStatus && opts.expectStatus.length > 0) {
@@ -2988,18 +2960,14 @@ exports.deriveRunStatus = deriveRunStatus;
 exports.evaluateExpression = evaluateExpression;
 exports.executeRunnerRequest = executeRunnerRequest;
 exports.fetchOAuth2Token = fetchOAuth2Token;
-exports.getGlobals = getGlobals;
 exports.getSecret = getSecret;
 exports.hasSecretScheme = hasSecretScheme;
 exports.initSecretStore = initSecretStore;
 exports.interpolate = interpolate;
-exports.loadGlobals = loadGlobals;
 exports.maskHeaders = maskHeaders;
 exports.maskPii = maskPii;
 exports.mergeVars = mergeVars;
-exports.patchGlobals = patchGlobals;
 exports.performHttpExchange = performHttpExchange;
-exports.persistGlobals = persistGlobals;
 exports.rebaseUrl = rebaseUrl;
 exports.registerSecretHandlers = registerSecretHandlers;
 exports.registerSecretProvider = registerSecretProvider;
@@ -3012,7 +2980,6 @@ exports.runMqttTest = runMqttTest;
 exports.runScript = runScript;
 exports.runSocketIoTest = runSocketIoTest;
 exports.runWsTest = runWsTest;
-exports.setGlobals = setGlobals;
 exports.setSecretsConfig = setSecretsConfig;
 exports.stripJsonComments = stripJsonComments;
 exports.syntheticHttpFailure = syntheticHttpFailure;

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-Bp9YId3a.js");
+const brokerClient = require("./chunks/broker-client-Bmt4seb8.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-BI4sXJop.js");
+require("./chunks/request-exec-s7k-oRi2.js");
 require("fs/promises");
 require("tls");
 require("./chunks/handle-_4XMUlwm.js");

package/out/main/flow.js

@@ -2,8 +2,8 @@
 "use strict";
 const promises = require("node:fs/promises");
 const path = require("node:path");
-const requestExec = require("./chunks/request-exec-BI4sXJop.js");
-const requestCollection = require("./chunks/request-collection-gkOYlWml.js");
+const requestExec = require("./chunks/request-exec-s7k-oRi2.js");
+const requestCollection = require("./chunks/request-collection-zRRUfg0X.js");
 const environments = require("./chunks/environments-iM3SUM-4.js");
 const flowEngine = require("./chunks/flow-engine-BxwjEy37.js");
 const cliCommon = require("./chunks/cli-common-GnihVSjU.js");
@@ -232,7 +232,7 @@ async function main() {
     console.error(cliCommon.color(`Error: could not read workspace: ${wsPath}`, cliCommon.C.red));
     process.exit(1);
   }
-  await requestExec.loadGlobals(wsDir);
+  await requestCollection.loadGlobals(wsDir);
   requestExec.setSecretsConfig(workspace.settings?.secrets);
   const flows = (await cliCommon.loadFlows(
     workspace,
@@ -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.7"}`;
+  const version = `v${"0.8.8"}`;
   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));
@@ -276,7 +276,7 @@ async function main() {
   console.log(cliCommon.color(`  Environment: ${env?.name ?? "(none)"}`, cliCommon.C.gray));
   console.log("");
   const envVars = await requestExec.buildEnvVars(env);
-  const globals = requestExec.getGlobals();
+  const globals = requestCollection.getGlobals();
   const dispatcher = await requestExec.buildDispatcher(workspace.settings?.proxy, workspace.settings?.tls);
   const piiMaskPatterns = workspace.settings?.piiMaskPatterns ?? [];
   const colById = new Map(collections.map((c) => [c.id, c]));

package/out/main/index.js

@@ -4,23 +4,23 @@ const handle = require("./chunks/handle-_4XMUlwm.js");
 const path = require("node:path");
 const fs = require("node:fs");
 const registerHandlers = require("./register-handlers.js");
-const requestExec = require("./chunks/request-exec-BI4sXJop.js");
+const requestExec = require("./chunks/request-exec-s7k-oRi2.js");
 const electronUpdater = require("electron-updater");
 const mockServer = require("./chunks/mock-server-C4kTFkod.js");
 require("node:fs/promises");
 require("node:crypto");
 require("jszip");
 require("./chunks/data-files-BYqhsoPe.js");
+require("./chunks/request-collection-zRRUfg0X.js");
+require("uuid");
 require("./chunks/ipc-validate-sqUFqRmE.js");
 require("ajv");
-require("uuid");
 require("js-yaml");
 require("undici");
 require("./chunks/soap-handler-BF5ii0UV.js");
 require("node:https");
 require("node:http");
 require("@xmldom/xmldom");
-require("./chunks/request-collection-gkOYlWml.js");
 require("./chunks/run-concurrent-468tH0AX.js");
 require("./chunks/flow-engine-BxwjEy37.js");
 require("ws");
@@ -31,7 +31,7 @@ require("node:os");
 require("@grpc/grpc-js");
 require("@grpc/proto-loader");
 require("./chunks/escape-DDVAlOvZ.js");
-require("./chunks/broker-client-Bp9YId3a.js");
+require("./chunks/broker-client-Bmt4seb8.js");
 require("simple-git");
 require("./chunks/recorder-BkO8G_mB.js");
 require("fs/promises");
@@ -50,7 +50,7 @@ function isNewer(a, b) {
   return a2 > b2;
 }
 async function checkForUpdate() {
-  const current = "0.8.7";
+  const current = "0.8.8";
   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-BI4sXJop.js");
+const requestExec = require("./chunks/request-exec-s7k-oRi2.js");
 const flowEngine = require("./chunks/flow-engine-BxwjEy37.js");
 require("node:http");
 require("node:crypto");

package/out/main/perf-worker.js

@@ -1,20 +1,20 @@
 "use strict";
-const perfRun = require("./chunks/perf-run-Dcb-A4Ln.js");
-const requestExec = require("./chunks/request-exec-BI4sXJop.js");
+const perfRun = require("./chunks/perf-run-wfdvpJev.js");
+const requestExec = require("./chunks/request-exec-s7k-oRi2.js");
 require("@grpc/grpc-js");
 require("@grpc/proto-loader");
 require("node:fs");
 require("node:os");
 require("node:path");
 require("./chunks/flow-engine-BxwjEy37.js");
-require("./chunks/request-collection-gkOYlWml.js");
+require("./chunks/request-collection-zRRUfg0X.js");
+require("node:fs/promises");
 require("uuid");
 require("undici");
 require("fs/promises");
 require("tls");
 require("./chunks/handle-_4XMUlwm.js");
 require("node:crypto");
-require("node:fs/promises");
 require("dayjs");
 require("node:vm");
 require("tv4");

package/out/main/perf.js

@@ -2,10 +2,11 @@
 "use strict";
 const promises = require("node:fs/promises");
 const path = require("node:path");
-const requestExec = require("./chunks/request-exec-BI4sXJop.js");
+const requestExec = require("./chunks/request-exec-s7k-oRi2.js");
+const requestCollection = require("./chunks/request-collection-zRRUfg0X.js");
 const environments = require("./chunks/environments-iM3SUM-4.js");
 const flowEngine = require("./chunks/flow-engine-BxwjEy37.js");
-const perfRun = require("./chunks/perf-run-Dcb-A4Ln.js");
+const perfRun = require("./chunks/perf-run-wfdvpJev.js");
 const perfReport = require("./chunks/perf-report-ChaO3K0w.js");
 const cliCommon = require("./chunks/cli-common-GnihVSjU.js");
 require("undici");
@@ -25,10 +26,9 @@ require("ws");
 require("socket.io-client");
 require("node:http");
 require("ajv");
+require("uuid");
 require("@grpc/grpc-js");
 require("@grpc/proto-loader");
-require("./chunks/request-collection-gkOYlWml.js");
-require("uuid");
 require("./chunks/data-files-BYqhsoPe.js");
 function parseDurationSec(s) {
   if (s == null) return void 0;
@@ -117,7 +117,7 @@ async function main() {
     console.error(cliCommon.color(`Error: could not read workspace: ${wsPath}`, cliCommon.C.red));
     process.exit(1);
   }
-  await requestExec.loadGlobals(wsDir);
+  await requestCollection.loadGlobals(wsDir);
   requestExec.setSecretsConfig(workspace.settings?.secrets);
   const plans = workspace.perfPlans ?? [];
   if (sub === "list") {
@@ -149,7 +149,7 @@ async function main() {
   const env = environments.selectEnvironment(workspace, environments$1, args.environment ?? args.env);
   const flowsAll = (await cliCommon.loadFlows(workspace, wsDir, () => {
   })).map(flowEngine.normalizeFlow);
-  const globals = requestExec.getGlobals();
+  const globals = requestCollection.getGlobals();
   const payload = { plan, environment: env ?? null, globals, proxy: workspace.settings?.proxy, tls: workspace.settings?.tls };
   let targetLabel = "";
   if (plan.target.kind === "request") {
@@ -191,7 +191,7 @@ async function main() {
     targetLabel = `flow: ${flow.name}`;
   }
   const load = perfRun.deriveLoad(plan);
-  const version = `v${"0.8.7"}`;
+  const version = `v${"0.8.8"}`;
   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));