@testsmith/api-spector 0.1.3 → 0.1.5

package/out/main/chunks/{request-handler-CvqESn11.js → request-handler-BEFvdSz6.js}

@@ -995,6 +995,7 @@ function registerRequestHandler(ipc) {
       updatedEnvVars = result.updatedEnvVars;
       updatedCollectionVars = result.updatedCollectionVars;
       updatedGlobals = result.updatedGlobals;
+      localVars = result.updatedLocalVars;
       patchGlobals(result.updatedGlobals);
       await persistGlobals();
     }
@@ -1004,6 +1005,7 @@ function registerRequestHandler(ipc) {
       updatedEnvVars,
       updatedCollectionVars,
       updatedGlobals,
+      updatedLocalVars: localVars,
       resolvedUrl,
       preScriptError: preScriptMeta.error,
       postScriptError: postError

package/out/main/index.js

@@ -25,7 +25,7 @@ const electron = require("electron");
 const path = require("path");
 const fs = require("fs");
 const promises = require("fs/promises");
-const requestHandler = require("./chunks/request-handler-CvqESn11.js");
+const requestHandler = require("./chunks/request-handler-BEFvdSz6.js");
 const uuid = require("uuid");
 const jsYaml = require("js-yaml");
 const undici = require("undici");
@@ -2340,6 +2340,7 @@ async function executeOne(req, collectionVars, envVars, globals, localVars, disp
       updatedEnvVars = r.updatedEnvVars;
       updatedCollectionVars = r.updatedCollectionVars;
       updatedGlobals = r.updatedGlobals;
+      localVars = r.updatedLocalVars;
       requestHandler.patchGlobals(r.updatedGlobals);
       await requestHandler.persistGlobals();
     }
@@ -2369,7 +2370,8 @@ async function executeOne(req, collectionVars, envVars, globals, localVars, disp
       },
       updatedEnvVars,
       updatedCollectionVars,
-      updatedGlobals
+      updatedGlobals,
+      updatedLocalVars: localVars
     };
   } catch (err) {
     return {
@@ -2382,7 +2384,8 @@ async function executeOne(req, collectionVars, envVars, globals, localVars, disp
       },
       updatedEnvVars,
       updatedCollectionVars,
-      updatedGlobals
+      updatedGlobals,
+      updatedLocalVars: localVars
     };
   }
 }
@@ -2399,25 +2402,88 @@ function registerRunnerHandler(ipc) {
     let runEnvVars = { ...envVars };
     let runCollectionVars = {};
     let runGlobals = { ...globals };
+    let runLocalVars = {};
+    const failedScopes = /* @__PURE__ */ new Set();
+    const skipRequests = /* @__PURE__ */ new Set();
     for (const item of items) {
-      const runningUpdate = { status: "running", iterationLabel: item.iterationLabel };
+      const { isHook, hookType, scopeId, scopeAncestors, mainRequestId } = item;
+      let skipReason;
+      if (isHook) {
+        if (hookType === "beforeAll") {
+          if ((scopeAncestors ?? []).some((id) => failedScopes.has(id))) {
+            skipReason = "Skipped — outer scope hook failed";
+          }
+        } else if (hookType === "before") {
+          const allScopes = [...scopeAncestors ?? [], scopeId].filter(Boolean);
+          if (allScopes.some((id) => failedScopes.has(id))) {
+            skipReason = "Skipped — scope hook failed";
+          } else if (mainRequestId && skipRequests.has(mainRequestId)) {
+            skipReason = "Skipped — before hook failed";
+          }
+        }
+      } else {
+        const allScopes = [...item.scopeAncestors ?? [], item.scopeId].filter(Boolean);
+        if (allScopes.some((id) => failedScopes.has(id))) {
+          skipReason = "Skipped — beforeAll hook failed";
+        } else if (skipRequests.has(item.request.id)) {
+          skipReason = "Skipped — before hook failed";
+        }
+      }
+      if (skipReason) {
+        const skipped = {
+          requestId: item.request.id,
+          name: item.request.name,
+          method: item.request.method,
+          resolvedUrl: item.request.url,
+          status: "failed",
+          error: skipReason,
+          isHook: item.isHook,
+          hookType: item.hookType,
+          scopeId: item.scopeId,
+          iterationLabel: item.iterationLabel
+        };
+        summary.failed++;
+        event.sender.send("runner:progress", skipped);
+        continue;
+      }
+      const runningUpdate = {
+        status: "running",
+        iterationLabel: item.iterationLabel,
+        isHook: item.isHook,
+        hookType: item.hookType,
+        scopeId: item.scopeId
+      };
       event.sender.send("runner:progress", { requestId: item.request.id, ...runningUpdate });
-      const { result, updatedEnvVars, updatedCollectionVars, updatedGlobals } = await executeOne(
+      const { result, updatedEnvVars, updatedCollectionVars, updatedGlobals, updatedLocalVars } = await executeOne(
         item.request,
         { ...item.collectionVars, ...runCollectionVars },
         runEnvVars,
         runGlobals,
-        item.dataRow ?? {},
+        { ...runLocalVars, ...item.dataRow ?? {} },
         dispatcher,
         piiMaskPatterns
       );
       runEnvVars = updatedEnvVars;
       runCollectionVars = updatedCollectionVars;
       runGlobals = updatedGlobals;
+      runLocalVars = updatedLocalVars;
+      if (isHook && result.status !== "passed") {
+        if (hookType === "beforeAll" && scopeId) {
+          failedScopes.add(scopeId);
+        } else if (hookType === "before" && mainRequestId) {
+          skipRequests.add(mainRequestId);
+        }
+      }
       if (result.status === "passed") summary.passed++;
       else if (result.status === "failed") summary.failed++;
       else summary.errors++;
-      event.sender.send("runner:progress", { ...result, iterationLabel: item.iterationLabel });
+      event.sender.send("runner:progress", {
+        ...result,
+        iterationLabel: item.iterationLabel,
+        isHook: item.isHook,
+        hookType: item.hookType,
+        scopeId: item.scopeId
+      });
       if (requestDelay > 0 && item !== items[items.length - 1]) {
         await sleep(requestDelay);
       }
@@ -3686,6 +3752,7 @@ electron.app.whenReady().then(async () => {
   registerContractHandlers(electron.ipcMain);
   registerGitHandlers(electron.ipcMain);
   registerRecordHandlers(electron.ipcMain, () => electron.BrowserWindow.getAllWindows()[0]?.webContents ?? null);
+  electron.ipcMain.handle("shell:openExternal", (_e, url) => electron.shell.openExternal(url));
   createWindow();
   electron.app.on("activate", () => {
     if (electron.BrowserWindow.getAllWindows().length === 0) createWindow();

package/out/main/runner.js

@@ -3,7 +3,7 @@
 const promises = require("fs/promises");
 const path = require("path");
 const undici = require("undici");
-const requestHandler = require("./chunks/request-handler-CvqESn11.js");
+const requestHandler = require("./chunks/request-handler-BEFvdSz6.js");
 require("crypto");
 require("dayjs");
 require("vm");
@@ -22,6 +22,8 @@ function buildJsonReport(results, summary, meta = {}) {
       method: r.method,
       url: r.resolvedUrl,
       status: r.status,
+      isHook: r.isHook ?? false,
+      hookType: r.hookType ?? null,
       httpStatus: r.httpStatus ?? null,
       durationMs: r.durationMs ?? null,
       iterationLabel: r.iterationLabel ?? null,
@@ -54,11 +56,18 @@ function buildHtmlReport(results, summary, meta = {}) {
   const collection = meta.collection ?? "API Tests";
   const env = meta.environment ?? "—";
   const passRate = summary.total > 0 ? Math.round(summary.passed / summary.total * 100) : 0;
+  const HOOK_LABELS = {
+    beforeAll: "BEFORE ALL",
+    before: "BEFORE",
+    after: "AFTER",
+    afterAll: "AFTER ALL"
+  };
   const cards = results.map((r, idx) => {
     const statusCls = r.status === "passed" ? "badge-pass" : r.status === "failed" ? "badge-fail" : "badge-err";
     const httpCls = r.httpStatus && r.httpStatus < 300 ? "http-ok" : r.httpStatus && r.httpStatus < 400 ? "http-redir" : "http-err";
     const dur = r.durationMs != null ? `${r.durationMs} ms` : "—";
     const label = r.iterationLabel ? ` <span class="muted">#${esc(r.iterationLabel)}</span>` : "";
+    const hookLabel = r.isHook && r.hookType ? HOOK_LABELS[r.hookType] ?? r.hookType.toUpperCase() : null;
     const testRows = (r.testResults ?? []).map(
       (t) => `<div class="test-row ${t.passed ? "test-pass" : "test-fail"}">
         <span class="dot">${t.passed ? "✓" : "✗"}</span> ${esc(t.name)}
@@ -91,12 +100,13 @@ function buildHtmlReport(results, summary, meta = {}) {
         ${headersTable(resp.headers)}
         ${resp.body ? `<div class="section-label">Body</div><pre class="code-block">${prettyJson(resp.body)}</pre>` : ""}
       </div>` : "";
+    const hookCls = hookLabel ? r.hookType?.startsWith("before") ? "card-hook-before" : "card-hook-after" : "";
     return `
-    <div class="card" id="r${idx}">
+    <div class="card ${hookCls}" id="r${idx}">
       <div class="card-header" onclick="toggle(${idx})">
         <span class="chevron" id="ch${idx}">▶</span>
         <span class="badge ${statusCls}">${r.status}</span>
-        <span class="method mono">${esc(r.method)}</span>
+        ${hookLabel ? `<span class="hook-badge ${r.hookType?.startsWith("before") ? "hook-before" : "hook-after"}">${hookLabel}</span>` : `<span class="method mono">${esc(r.method)}</span>`}
         <span class="card-name">${esc(r.name)}${label}</span>
         <span class="card-url muted">${esc(r.resolvedUrl ?? "")}</span>
         <span class="dur muted">${dur}</span>
@@ -177,6 +187,16 @@ function buildHtmlReport(results, summary, meta = {}) {
   .dot { font-weight: 700; }
   /* Console */
   .err-row { color: #f85149; font-size: 12px; }
+  /* Footer */
+  .report-footer { margin-top: 32px; text-align: center; font-size: 11px; color: #484f58; }
+  .footer-link { color: #3d7fb2; text-decoration: none; }
+  .footer-link:hover { text-decoration: underline; }
+  /* Hook cards */
+  .card-hook-before { border-left: 3px solid #7c3aed; }
+  .card-hook-after  { border-left: 3px solid #0e7490; }
+  .hook-badge { display: inline-block; padding: 1px 7px; border-radius: 10px; font-size: 10px; font-weight: 700; white-space: nowrap; letter-spacing: .04em; }
+  .hook-before { background: #4c1d95; color: #c4b5fd; }
+  .hook-after  { background: #164e63; color: #67e8f9; }
 </style>
 </head>
 <body>
@@ -192,6 +212,7 @@ function buildHtmlReport(results, summary, meta = {}) {
     <div class="stat"><div class="stat-val">${summary.durationMs} ms</div><div class="stat-lbl">Duration</div></div>
   </div>
   <div class="cards">${cards}</div>
+  <div class="report-footer">Generated by <a href="https://testsmith.io" target="_blank" rel="noopener" class="footer-link">Testsmith</a> · api Spector</div>
 </div>
 <script>
   function toggle(i) {
@@ -211,9 +232,16 @@ function buildJUnitReport(results, summary, meta = {}) {
   const suiteName = esc(meta.collection ?? "API Tests");
   const totalSec = (summary.durationMs / 1e3).toFixed(3);
   const ts = meta.timestamp ?? (/* @__PURE__ */ new Date()).toISOString();
+  const HOOK_JUNIT_LABELS = {
+    beforeAll: "Hook: Before All",
+    before: "Hook: Before",
+    after: "Hook: After",
+    afterAll: "Hook: After All"
+  };
   const cases = results.map((r) => {
     const label = r.iterationLabel ? ` #${r.iterationLabel}` : "";
-    const name = esc(r.name + label);
+    const hookPrefix = r.isHook && r.hookType ? `[${HOOK_JUNIT_LABELS[r.hookType] ?? "Hook"}] ` : "";
+    const name = esc(hookPrefix + r.name + label);
     const classname = esc(`${r.method} ${r.resolvedUrl}`);
     const timeSec = ((r.durationMs ?? 0) / 1e3).toFixed(3);
     const failures = [];
@@ -251,7 +279,7 @@ function collectTagged(folder, requests, collectionVars, filterTags) {
   const results = [];
   for (const reqId of folder.requestIds) {
     const req = requests[reqId];
-    if (!req) continue;
+    if (!req || req.hookType) continue;
     const tags = req.meta?.tags ?? [];
     if (filterTags.length > 0 && !filterTags.some((t) => tags.includes(t))) continue;
     results.push({ request: req, collectionVars });
@@ -330,7 +358,7 @@ async function loadEnvironments(workspace, dir) {
   }
   return envs;
 }
-async function executeRequest(req, collectionVars, envVars, globals, verbose, tls) {
+async function executeRequest(req, collectionVars, envVars, globals, localVars, verbose, tls) {
   const base = {
     requestId: req.id,
     name: req.name,
@@ -338,7 +366,6 @@ async function executeRequest(req, collectionVars, envVars, globals, verbose, tl
     resolvedUrl: req.url,
     status: "running"
   };
-  let localVars = {};
   let updatedEnvVars = { ...envVars };
   let updatedCollectionVars = { ...collectionVars };
   let updatedGlobals = { ...globals };
@@ -348,7 +375,7 @@ async function executeRequest(req, collectionVars, envVars, globals, verbose, tl
       envVars: { ...envVars },
       collectionVars: { ...collectionVars },
       globals: { ...globals },
-      localVars: {}
+      localVars: { ...localVars }
     });
     preScriptError = r.error;
     localVars = r.updatedLocalVars;
@@ -433,6 +460,10 @@ async function executeRequest(req, collectionVars, envVars, globals, verbose, tl
       testResults = r.testResults;
       consoleOutput = r.consoleOutput;
       postScriptError = r.error;
+      updatedEnvVars = r.updatedEnvVars;
+      updatedCollectionVars = r.updatedCollectionVars;
+      updatedGlobals = r.updatedGlobals;
+      localVars = r.updatedLocalVars;
       requestHandler.patchGlobals(r.updatedGlobals);
       await requestHandler.persistGlobals();
       if (verbose && r.consoleOutput.length) r.consoleOutput.forEach((l) => console.log(color(`    [post] ${l}`, C.gray)));
@@ -445,24 +476,36 @@ async function executeRequest(req, collectionVars, envVars, globals, verbose, tl
       reqHeaders[k] = v;
     });
     return {
-      ...base,
-      status,
-      httpStatus: fetchResp.status,
-      durationMs,
-      testResults,
-      consoleOutput,
-      preScriptError,
-      postScriptError,
-      sentRequest: { headers: reqHeaders, body },
-      receivedResponse: response
+      result: {
+        ...base,
+        status,
+        httpStatus: fetchResp.status,
+        durationMs,
+        testResults,
+        consoleOutput,
+        preScriptError,
+        postScriptError,
+        sentRequest: { headers: reqHeaders, body },
+        receivedResponse: response
+      },
+      updatedEnvVars,
+      updatedCollectionVars,
+      updatedGlobals,
+      updatedLocalVars: localVars
     };
   } catch (err) {
     return {
-      ...base,
-      status: "error",
-      durationMs: Date.now() - start,
-      error: err instanceof Error ? err.message : String(err),
-      preScriptError
+      result: {
+        ...base,
+        status: "error",
+        durationMs: Date.now() - start,
+        error: err instanceof Error ? err.message : String(err),
+        preScriptError
+      },
+      updatedEnvVars,
+      updatedCollectionVars,
+      updatedGlobals,
+      updatedLocalVars: localVars
     };
   }
 }
@@ -554,14 +597,28 @@ async function main() {
     const items = collectTagged(col.rootFolder, col.requests, col.collectionVariables ?? {}, filterTags);
     if (items.length === 0) continue;
     if (!firstColName) firstColName = col.name;
-    const envVars = await requestHandler.buildEnvVars(env);
-    const globals = requestHandler.getGlobals();
+    let runEnvVars = await requestHandler.buildEnvVars(env);
+    let runGlobals = requestHandler.getGlobals();
+    let runCollectionVars = { ...col.collectionVariables ?? {} };
+    let runLocalVars = {};
     console.log(color(`  ┌ ${col.name}`, C.bold, C.white));
     const workspaceTls = workspace.settings?.tls;
     const effectiveTls = col.tls ? { ...workspaceTls, ...col.tls } : workspaceTls;
     let bailed = false;
     for (const item of items) {
-      const result = await executeRequest(item.request, item.collectionVars, envVars, globals, verbose, effectiveTls);
+      const { result, updatedEnvVars, updatedCollectionVars, updatedGlobals, updatedLocalVars } = await executeRequest(
+        item.request,
+        { ...item.collectionVars, ...runCollectionVars },
+        runEnvVars,
+        runGlobals,
+        { ...runLocalVars },
+        verbose,
+        effectiveTls
+      );
+      runEnvVars = updatedEnvVars;
+      runCollectionVars = updatedCollectionVars;
+      runGlobals = updatedGlobals;
+      runLocalVars = updatedLocalVars;
       printResult(result, verbose);
       allResults.push(result);
       summary.total++;

package/out/preload/index.js

@@ -116,6 +116,8 @@ const api = {
   offRecordHit: () => {
     electron.ipcRenderer.removeAllListeners("record:hit");
   },
+  // ─── Shell ────────────────────────────────────────────────────────────────
+  openExternal: (url) => electron.ipcRenderer.invoke("shell:openExternal", url),
   // ─── Zoom ─────────────────────────────────────────────────────────────────
   setZoomFactor: (factor) => electron.webFrame.setZoomFactor(factor),
   // ─── Platform ─────────────────────────────────────────────────────────────