@requesto/cli 1.13.0 → 1.14.0

package/dist/index.mjs

@@ -82169,9 +82169,15 @@ var require_environment_service = __commonJS({
         const overrides = this.localRepo.getForEnvironment(env2.id);
         if (Object.keys(overrides).length === 0)
           return env2;
+        const variables = env2.variables.map((v) => Object.prototype.hasOwnProperty.call(overrides, v.key) ? { ...v, currentValue: overrides[v.key] } : v);
+        for (const [key, currentValue] of Object.entries(overrides)) {
+          if (!variables.some((v) => v.key === key)) {
+            variables.push({ key, value: "", currentValue, enabled: true });
+          }
+        }
         return {
           ...env2,
-          variables: env2.variables.map((v) => Object.prototype.hasOwnProperty.call(overrides, v.key) ? { ...v, currentValue: overrides[v.key] } : v)
+          variables
         };
       }
       getAll() {
@@ -106612,6 +106618,7 @@ var require_proxy_service = __commonJS({
           validateStatus: () => true,
           timeout: opts.timeout ?? 3e4,
           responseType: "arraybuffer",
+          ...opts.signal && { signal: opts.signal },
           ...httpsAgent && { httpsAgent }
         };
         const axiosAuth = (0, auth_1.getAxiosAuthConfig)(substitutedAuth);
@@ -134526,6 +134533,9 @@ function escapeXml(text) {
 function seconds(ms) {
   return ((ms ?? 0) / 1e3).toFixed(3);
 }
+function skippedTestcaseCount(results) {
+  return results.filter((r2) => r2.status === "skipped" || r2.status === "warned").length;
+}
 function testcase(result, indent2) {
   const classname = escapeXml(result.collectionName);
   const lines = [];
@@ -134547,6 +134557,15 @@ function testcase(result, indent2) {
     );
     return lines;
   }
+  if (result.status === "warned") {
+    const message = result.warning ?? "Warning";
+    lines.push(
+      `${indent2}<testcase name="${escapeXml(`Request: ${result.request.name}`)}" classname="${classname}" time="${seconds(result.duration)}">`,
+      `${indent2}  <skipped message="${escapeXml(message)}"/>`,
+      `${indent2}</testcase>`
+    );
+    return lines;
+  }
   if (result.testResults.length === 0) {
     lines.push(
       `${indent2}<testcase name="Request: ${escapeXml(result.request.name)}" classname="${classname}" time="${seconds(result.duration)}"/>`
@@ -134588,7 +134607,7 @@ function buildJunitReport(summary) {
     const time = seconds(results.reduce((acc, r2) => acc + (r2.duration ?? 0), 0));
     suites.push(
       [
-        `  <testsuite name="${escapeXml(collectionName)}" tests="${tests}" failures="${failures}" errors="${errors}" time="${time}">`,
+        `  <testsuite name="${escapeXml(collectionName)}" tests="${tests}" failures="${failures}" errors="${errors}" skipped="${skippedTestcaseCount(results)}" time="${time}">`,
         ...results.flatMap((r2) => testcase(r2, "    ")),
         `  </testsuite>`
       ].join("\n")
@@ -134605,7 +134624,7 @@ function buildJunitReport(summary) {
   const totalErrors = summary.results.filter((r2) => r2.status === "error").length;
   return [
     `<?xml version="1.0" encoding="UTF-8"?>`,
-    `<testsuites name="requesto" tests="${totalTests}" failures="${totalFailures}" errors="${totalErrors}" time="${seconds(summary.totalDuration)}">`,
+    `<testsuites name="requesto" tests="${totalTests}" failures="${totalFailures}" errors="${totalErrors}" skipped="${skippedTestcaseCount(summary.results)}" time="${seconds(summary.totalDuration)}">`,
     ...suites,
     `</testsuites>`,
     ``
@@ -134621,6 +134640,7 @@ function buildJsonReport(summary) {
         passed: summary.passed,
         failed: summary.failed,
         errored: summary.errored,
+        warned: summary.warned,
         skipped: summary.skipped
       },
       tests: {
@@ -134642,6 +134662,8 @@ function buildJsonReport(summary) {
       httpStatus: result.response?.status ?? null,
       durationMs: result.duration ?? null,
       error: result.error ?? null,
+      warning: result.warning ?? null,
+      warningKind: result.warningKind ?? null,
       tests: result.testResults.map((test) => ({
         name: test.name,
         passed: test.passed,
@@ -134670,6 +134692,8 @@ function statusIcon(result, paint) {
       return paint.green("\u2713");
     case "failed":
       return paint.red("\u2717");
+    case "warned":
+      return paint.yellow("\u26A0");
     case "error":
       return paint.yellow("\u2717");
     case "skipped":
@@ -134682,6 +134706,8 @@ function dotChar(result, paint) {
       return paint.green("\xB7");
     case "failed":
       return paint.red("\xD7");
+    case "warned":
+      return paint.yellow("!");
     case "error":
       return paint.yellow("\xD7");
     case "skipped":
@@ -134726,6 +134752,10 @@ function createConsoleReporter(mode, stream = process.stdout) {
   const writeRequestLine = (result) => {
     stream.write(` ${statusIcon(result, paint)} ${result.request.name}${paint.dim(durationTail(result))}
 `);
+    if (result.status === "warned" && result.warning) {
+      stream.write(paint.yellow(`    \u26A0 ${result.warning}
+`));
+    }
   };
   const failureEntries = (summary) => summary.results.filter((r2) => r2.status === "failed" || r2.status === "error").map((r2) => ({
     label: `${r2.collectionName} > ${r2.request.name}`,
@@ -134747,10 +134777,11 @@ function createConsoleReporter(mode, stream = process.stdout) {
     }
   };
   const writeSummary = (summary, meta) => {
-    const failed = summary.failed + summary.errored;
     const counts = [
       summary.passed > 0 ? paint.green(`${summary.passed} passed`) : null,
-      failed > 0 ? paint.red(`${failed} failed`) : null,
+      summary.failed > 0 ? paint.red(`${summary.failed} failed`) : null,
+      summary.errored > 0 ? paint.yellow(`${summary.errored} errored`) : null,
+      summary.warned > 0 ? paint.yellow(`${summary.warned} warnings`) : null,
       summary.skipped > 0 ? paint.dim(`${summary.skipped} skipped`) : null
     ].filter(Boolean);
     stream.write("\n");
@@ -134888,11 +134919,12 @@ function buildSavedGraphQLRequest(req) {
     if (operation.operation !== "query") {
       throw new Error("GraphQL GET requests can only execute query operations");
     }
-    const url = new URL(req.url);
-    url.searchParams.set("query", document2);
-    if (variables)
-      url.searchParams.set("variables", JSON.stringify(variables));
-    return { method: "GET", url: url.toString(), headers, auth: req.auth };
+    return {
+      method: "GET",
+      url: encodeGraphQLGetUrl(req.url, document2, variables),
+      headers,
+      auth: req.auth
+    };
   }
   setDefaultHeader(headers, "Content-Type", "application/json");
   const body = {
@@ -134908,6 +134940,18 @@ function buildSavedGraphQLRequest(req) {
     auth: req.auth
   };
 }
+function encodeGraphQLGetUrl(base, document2, variables) {
+  const hashIndex = base.indexOf("#");
+  const withoutHash = hashIndex < 0 ? base : base.slice(0, hashIndex);
+  const hash = hashIndex < 0 ? "" : base.slice(hashIndex);
+  const queryIndex = withoutHash.indexOf("?");
+  const path6 = queryIndex < 0 ? withoutHash : withoutHash.slice(0, queryIndex);
+  const params = new URLSearchParams(queryIndex < 0 ? "" : withoutHash.slice(queryIndex + 1));
+  params.set("query", document2);
+  if (variables)
+    params.set("variables", JSON.stringify(variables));
+  return `${path6}?${params}${hash}`;
+}
 function buildProxyRequest(req, insecureTls) {
   if (req.requestType === "graphql") {
     return { ...buildSavedGraphQLRequest(req), insecureTls };
@@ -134924,6 +134968,31 @@ function buildProxyRequest(req, insecureTls) {
   };
 }
 
+// ../../packages/engine/dist/request/graphql-envelope.js
+function getGraphQLResponseInfo(response) {
+  if (response.bodyEncoding !== "utf8")
+    return null;
+  try {
+    const payload = JSON.parse(response.body);
+    if (typeof payload !== "object" || payload === null || Array.isArray(payload))
+      return null;
+    const envelope = payload;
+    if (!Array.isArray(envelope.errors))
+      return null;
+    const errors = envelope.errors.filter((error) => typeof error === "object" && error !== null).map((error) => ({
+      message: typeof error.message === "string" ? error.message : "Unknown GraphQL error",
+      ...Array.isArray(error.path) && { path: error.path },
+      ...Array.isArray(error.locations) && {
+        locations: error.locations.filter((location2) => typeof location2 === "object" && location2 !== null && typeof location2.line === "number" && typeof location2.column === "number")
+      }
+    }));
+    const hasData = Object.prototype.hasOwnProperty.call(envelope, "data") && envelope.data !== null;
+    return { errors, hasData, isPartial: hasData && errors.length > 0 };
+  } catch {
+    return null;
+  }
+}
+
 // ../../packages/engine/dist/runner/display.js
 function buildCollectionItems(collection, folderIds) {
   const items = [];
@@ -134991,6 +135060,31 @@ function applyEnvOverrides(env2, overrides) {
   }
   return { ...env2, variables };
 }
+function resolveStatus(allTestsPassed, testCount, response, warnings) {
+  if (!allTestsPassed)
+    return { status: "failed" };
+  const warningsEnabled = warnings?.httpErrorStatuses !== false;
+  const hasTests = testCount > 0;
+  if (warningsEnabled && !hasTests) {
+    if (response.status >= 400) {
+      const statusText = response.statusText?.trim();
+      return {
+        status: "warned",
+        warning: statusText ? `HTTP ${response.status} ${statusText}` : `HTTP ${response.status}`,
+        warningKind: "http-status"
+      };
+    }
+    const graphqlInfo = getGraphQLResponseInfo(response);
+    if (graphqlInfo && graphqlInfo.errors.length > 0) {
+      return {
+        status: "warned",
+        warning: graphqlInfo.errors[0].message,
+        warningKind: "graphql-errors"
+      };
+    }
+  }
+  return { status: "passed" };
+}
 async function runCollections(opts) {
   const results = [];
   const started = Date.now();
@@ -135074,8 +135168,16 @@ async function runCollections(opts) {
           liveEnv = applyEnvOverrides(liveEnv, outcome);
         }
         const allPassed = testResults.every((t2) => t2.passed);
-        const status = allPassed ? "passed" : "failed";
-        const result = { ...base, status, response, testResults, duration: response.duration };
+        const { status, warning, warningKind } = resolveStatus(allPassed, testResults.length, response, opts.warnings);
+        const result = {
+          ...base,
+          status,
+          response,
+          testResults,
+          ...warning !== void 0 && { warning },
+          ...warningKind !== void 0 && { warningKind },
+          duration: response.duration
+        };
         results.push(result);
         opts.onEvent?.({ type: "request-end", result });
         if (!allPassed && opts.bail)
@@ -135102,6 +135204,7 @@ async function runCollections(opts) {
     passed: results.filter((r2) => r2.status === "passed").length,
     failed: results.filter((r2) => r2.status === "failed").length,
     errored: results.filter((r2) => r2.status === "error").length,
+    warned: results.filter((r2) => r2.status === "warned").length,
     skipped: results.filter((r2) => r2.status === "skipped").length,
     totalTests: results.reduce((acc, r2) => acc + r2.testResults.length, 0),
     passedTests: results.reduce((acc, r2) => acc + r2.testResults.filter((t2) => t2.passed).length, 0),
@@ -135562,7 +135665,11 @@ var CliWorkspace = class {
       available ? `Environment "${selector}" not found. Available: ${available} (or "none").` : `Environment "${selector}" not found: this workspace has no environments (use "none" or define one).`
     );
   }
-  /** Send a request through the backend engine with the given per-run options. */
+  /**
+   * Send a request through the backend engine with the given per-run options.
+   * The runner-provided abort signal is forwarded so an interrupted run can
+   * cancel the in-flight HTTP request instead of waiting for its timeout.
+   */
   sendRequest(request, opts) {
     return this.proxyService.executeRequest(request, {
       // The CLI substitutes variables itself against the live environment,
@@ -135570,6 +135677,7 @@ var CliWorkspace = class {
       environment: null,
       oauthResolver: opts.oauthResolver,
       timeout: opts.timeout,
+      signal: opts.signal,
       saveHistory: false
     });
   }
@@ -135596,6 +135704,34 @@ function resolveWorkspacePath(input) {
 
 // src/commands/run.ts
 var BUILTIN_SERVER_VAR = "requestoServerUrl";
+function wireAbortSignal(opts) {
+  const controller = new AbortController();
+  const externalSignal = opts.signal ?? null;
+  let interrupts = 0;
+  const handleInterrupt = () => {
+    interrupts += 1;
+    if (interrupts > 1) {
+      process.stderr.write("\nForcing exit (second interrupt).\n");
+      process.exit(130);
+    }
+    controller.abort();
+    process.stderr.write(
+      "\nInterrupted: cancelling the in-flight request and skipping the rest of the run. Press Ctrl-C again to force exit.\n"
+    );
+  };
+  const handleExternalAbort = () => {
+    controller.abort(externalSignal?.reason);
+  };
+  process.on("SIGINT", handleInterrupt);
+  externalSignal?.addEventListener("abort", handleExternalAbort);
+  return {
+    signal: controller.signal,
+    dispose: () => {
+      process.off("SIGINT", handleInterrupt);
+      externalSignal?.removeEventListener("abort", handleExternalAbort);
+    }
+  };
+}
 async function runCommand(opts) {
   const started = Date.now();
   const workspacePath = resolveWorkspacePath(opts.path);
@@ -135647,6 +135783,7 @@ async function runCommand(opts) {
     serverUrl = embedded.url;
   }
   const runEnv = withBuiltinServerVar(effectiveEnv, serverUrl);
+  const abort = wireAbortSignal(opts);
   try {
     const summary = await runCollections({
       collections,
@@ -135659,6 +135796,8 @@ async function runCommand(opts) {
       bail: opts.bail,
       insecure: opts.insecure,
       timeout: opts.timeout,
+      signal: abort.signal,
+      warnings: { httpErrorStatuses: !opts.noWarnHttpErrors },
       onEvent: opts.onEvent
     });
     return {
@@ -135668,6 +135807,7 @@ async function runCommand(opts) {
       serverUrl
     };
   } finally {
+    abort.dispose();
     if (embedded) {
       try {
         await embedded.stop();
@@ -135686,8 +135826,9 @@ async function runCommand(opts) {
     }
   }
 }
-function computeExitCode(summary) {
-  return summary.failed + summary.errored > 0 ? 1 : 0;
+function computeExitCode(summary, opts = {}) {
+  const failing = summary.failed + summary.errored + (opts.failOnWarn ? summary.warned : 0);
+  return failing > 0 ? 1 : 0;
 }
 function referencesBuiltin(env2) {
   if (!env2) return false;
@@ -135769,6 +135910,26 @@ function writeFileReports(specs, result) {
 `);
   }
 }
+function collectRunOptions(pathArg, opts) {
+  return {
+    path: pathArg,
+    collections: opts.collection,
+    excludeCollections: opts.excludeCollection,
+    folders: opts.folder,
+    environment: opts.environment,
+    vars: opts.var,
+    varFile: opts.varFile,
+    tokens: opts.token,
+    oauthSecrets: opts.oauthSecret,
+    refreshTokens: opts.refreshToken,
+    bail: opts.bail,
+    insecure: opts.insecure,
+    timeout: opts.timeout,
+    persist: opts.persist,
+    server: opts.server,
+    noWarnHttpErrors: opts.warnHttpErrors === false
+  };
+}
 async function runCli(argv) {
   const program2 = new Command();
   program2.exitOverride();
@@ -135784,31 +135945,22 @@ The run never touches your workspace or any server data: collections targeting t
 {{${BUILTIN_SERVER_VAR}}} variable run against an ephemeral scratch server that the CLI
 boots and tears down itself. Use --server to test a deployed server instead.
 
-Exit codes: 0 = all passed, 1 = failures/errors, 2 = configuration error.`
+Exit codes: 0 = all passed, 1 = failures/errors, 2 = configuration error.
+
+4xx/5xx responses with no test assertions land as warnings: they print as \u26A0 and
+never affect the exit code unless --fail-on-warn is given. Ctrl-C cancels the
+in-flight request and skips the rest; press again to exit immediately.`
   ).argument("[path]", "repository or .requesto directory", process.cwd()).option("-c, --collection <name>", "collection to run (name or id, repeatable; default: all)", collect, []).option("-C, --exclude-collection <name>", "collection to skip (name or id, repeatable; subtracts from the selection)", collect, []).option("-f, --folder <name>", "folder to run within the selected collections (name or id, repeatable)", collect, []).option("-e, --environment <name>", 'environment (name or id, or "none"; default: active environment)').option("--var <key=value>", "variable override (repeatable; highest precedence)", collect, []).option("--var-file <path>", ".env file providing variable overrides").option("--token <configId=accessToken>", "access token for an OAuth config, e.g. --token my-entra=eyJ... (repeatable; REQUESTO_TOKEN_* env vars work too)", collect, []).option("--oauth-secret <configId=secret>", "client secret for a non-interactive OAuth config (repeatable; REQUESTO_OAUTH_SECRET_* env vars work too)", collect, []).option("--refresh-token <configId=token>", "refresh token to seed for an OAuth config (repeatable; REQUESTO_REFRESH_TOKEN_* env vars work too)", collect, []).option("-x, --bail", "stop the run after the first failed or errored request", false).option("--insecure", "skip TLS certificate verification (self-signed certs)", false).option("--timeout <ms>", "per-request timeout in ms (default 30000)", (v) => {
     const n = Number(v);
     if (!Number.isFinite(n) || n <= 0) throw new CliError(`Invalid --timeout value "${v}"`);
     return n;
-  }).option("--persist", "persist OAuth tokens acquired during the run to .requesto/local/ (default: memory only)", false).option("--server <url>", "test a deployed Requesto server instead of the embedded scratch server (its active workspace is protected by a scratch workspace)").option("--reporter <spec>", "reporter: console, verbose, dot, junit:<path> or json:<path> (repeatable; default: console)", collect, []).action(async (pathArg, opts) => {
+  }).option("--persist", "persist OAuth tokens acquired during the run to .requesto/local/ (default: memory only)", false).option("--server <url>", "test a deployed Requesto server instead of the embedded scratch server (its active workspace is protected by a scratch workspace)").option("--no-warn-http-errors", "disable warn-tier results for 4xx/5xx responses with no test assertions (default: warns are on)").option("--fail-on-warn", "exit 1 when any request is warned (default: warns never affect the exit code)", false).option("--reporter <spec>", "reporter: console, verbose, dot, junit:<path> or json:<path> (repeatable; default: console)", collect, []).action(async (pathArg, opts) => {
     const specs = opts.reporter.map(parseReporterSpec);
     const consoleMode = findConsoleMode(specs);
     const consoleReporter = createConsoleReporter(consoleMode);
+    const runOptions = collectRunOptions(pathArg, opts);
     const result = await runCommand({
-      path: pathArg,
-      collections: opts.collection,
-      excludeCollections: opts.excludeCollection,
-      folders: opts.folder,
-      environment: opts.environment,
-      vars: opts.var,
-      varFile: opts.varFile,
-      tokens: opts.token,
-      oauthSecrets: opts.oauthSecret,
-      refreshTokens: opts.refreshToken,
-      bail: opts.bail,
-      insecure: opts.insecure,
-      timeout: opts.timeout,
-      persist: opts.persist,
-      server: opts.server,
+      ...runOptions,
       onEvent: (event) => consoleReporter.onEvent(event)
     });
     consoleReporter.finish(result.summary, {
@@ -135817,7 +135969,7 @@ Exit codes: 0 = all passed, 1 = failures/errors, 2 = configuration error.`
       serverUrl: result.serverUrl
     });
     writeFileReports(specs, result);
-    exitCode = computeExitCode(result.summary);
+    exitCode = computeExitCode(result.summary, { failOnWarn: opts.failOnWarn });
   });
   await program2.parseAsync(argv, { from: "user" });
   return exitCode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@requesto/cli",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "Run your Requesto collections from the terminal and CI pipelines",
   "type": "module",
   "main": "dist/index.mjs",
@@ -26,8 +26,8 @@
   "devDependencies": {
     "@types/node": "^26.6.4",
     "esbuild": "^0.28.2",
-    "requesto-backend": "1.13.0",
-    "requesto-engine": "1.13.0",
+    "requesto-backend": "1.14.0",
+    "requesto-engine": "1.14.0",
     "tsx": "^4.23.15",
     "typescript": "^7.0.2",
     "vitest": "^5.0.3"