@testsmith/api-spector 0.3.8 → 0.3.9

package/out/main/chunks/{handle-BCnNIZZr.js → handle-Coax8Nz1.js}

@@ -54,6 +54,7 @@ const IPC = {
     insomnia: "import:insomnia",
     bruno: "import:bruno",
     http: "import:http",
+    spector: "import:spector",
     openapiSchemas: "import:openapi-schemas",
     openapiSchemasUrl: "import:openapi-schemas-url"
   },

package/out/main/chunks/{import-DUKaMYGO.js → import-Bilo697Z.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const uuid = require("uuid");
-const soapHandler = require("./soap-handler-h0dWIjOK.js");
-require("./handle-BCnNIZZr.js");
+const soapHandler = require("./soap-handler-B1Huudj7.js");
+require("./handle-Coax8Nz1.js");
 require("https");
 require("http");
 require("@xmldom/xmldom");

package/out/main/chunks/{request-collection-CBuPjBwa.js → request-collection-CJoXpvOw.js}

@@ -85,6 +85,25 @@ function getAllApplicableHooks(folderId, collection) {
   }
   return { beforeAll, before, after, afterAll };
 }
+function authIsConfigured(auth) {
+  if (!auth || auth.type === "none") return false;
+  const set = (s) => !!(s && s.trim());
+  switch (auth.type) {
+    case "bearer":
+      return set(auth.token) || set(auth.tokenSecretRef);
+    case "basic":
+    case "digest":
+      return set(auth.username) || set(auth.password) || set(auth.passwordSecretRef);
+    case "ntlm":
+      return set(auth.username) || set(auth.password) || set(auth.passwordSecretRef);
+    case "apikey":
+      return set(auth.apiKeyValue) || set(auth.apiKeySecretRef);
+    case "oauth2":
+      return set(auth.oauth2TokenUrl) || set(auth.oauth2ClientId) || set(auth.oauth2CachedToken);
+    default:
+      return true;
+  }
+}
 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) ?? [];
@@ -113,6 +132,7 @@ function buildRunPlan(collection, folderId, filterTags) {
     );
   }
 }
+exports.authIsConfigured = authIsConfigured;
 exports.buildRunPlan = buildRunPlan;
 exports.getAllApplicableHooks = getAllApplicableHooks;
 exports.resolveInheritedAuthAndHeaders = resolveInheritedAuthAndHeaders;

package/out/main/chunks/{request-exec-AQD6cEgT.js → request-exec-C0DnGKdd.js}

@@ -23,7 +23,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 const undici = require("undici");
 const promises = require("fs/promises");
-const handle = require("./handle-BCnNIZZr.js");
+const handle = require("./handle-Coax8Nz1.js");
 const crypto = require("crypto");
 const path = require("path");
 const dayjs = require("dayjs");

package/out/main/chunks/{snapshots-NGkGQNZ4.js → snapshots-CatB4zLh.js}

@@ -1,6 +1,6 @@
 "use strict";
 const undici = require("undici");
-const requestExec = require("./request-exec-AQD6cEgT.js");
+const requestExec = require("./request-exec-C0DnGKdd.js");
 const promises = require("fs/promises");
 const path = require("path");
 const Ajv = require("ajv");

package/out/main/chunks/{soap-handler-h0dWIjOK.js → soap-handler-B1Huudj7.js}

@@ -1,5 +1,5 @@
 "use strict";
-const handle = require("./handle-BCnNIZZr.js");
+const handle = require("./handle-Coax8Nz1.js");
 const https = require("https");
 const http = require("http");
 const xmldom = require("@xmldom/xmldom");
@@ -315,7 +315,7 @@ function registerSoapHandlers(ipc) {
   handle.handleIpc(ipc, handle.IPC.wsdl.import, async (_event, opts) => {
     const { validateWsdlImport } = await Promise.resolve().then(() => require("./ipc-validate-k6KI8adf.js"));
     validateWsdlImport(opts);
-    const { importWsdl } = await Promise.resolve().then(() => require("./import-DUKaMYGO.js"));
+    const { importWsdl } = await Promise.resolve().then(() => require("./import-Bilo697Z.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 });

package/out/main/contract.js

@@ -24,14 +24,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 const promises = require("fs/promises");
 const path = require("path");
-const snapshots = require("./chunks/snapshots-NGkGQNZ4.js");
+const snapshots = require("./chunks/snapshots-CatB4zLh.js");
 const crypto = require("crypto");
 const undici = require("undici");
 const os = require("os");
 const cliCommon = require("./chunks/cli-common-CDQY1erJ.js");
 const environments = require("./chunks/environments-iM3SUM-4.js");
-require("./chunks/request-exec-AQD6cEgT.js");
-require("./chunks/handle-BCnNIZZr.js");
+require("./chunks/request-exec-C0DnGKdd.js");
+require("./chunks/handle-Coax8Nz1.js");
 require("dayjs");
 require("vm");
 require("tv4");

package/out/main/index.js

@@ -22,24 +22,24 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 const electron = require("electron");
-const handle = require("./chunks/handle-BCnNIZZr.js");
+const handle = require("./chunks/handle-Coax8Nz1.js");
 const path = require("path");
 const fs = require("fs");
 const promises = require("fs/promises");
-const requestExec = require("./chunks/request-exec-AQD6cEgT.js");
+const crypto = require("crypto");
+const requestExec = require("./chunks/request-exec-C0DnGKdd.js");
 const ipcValidate = require("./chunks/ipc-validate-k6KI8adf.js");
 const uuid = require("uuid");
 const jsYaml = require("js-yaml");
 const undici = require("undici");
 const JSZip = require("jszip");
-const requestCollection = require("./chunks/request-collection-CBuPjBwa.js");
+const requestCollection = require("./chunks/request-collection-CJoXpvOw.js");
 const mockServer = require("./chunks/mock-server-DSLR2ulH.js");
 const http = require("http");
 const WebSocket = require("ws");
-const soapHandler = require("./chunks/soap-handler-h0dWIjOK.js");
+const soapHandler = require("./chunks/soap-handler-B1Huudj7.js");
 const os = require("os");
-const crypto = require("crypto");
-const snapshots = require("./chunks/snapshots-NGkGQNZ4.js");
+const snapshots = require("./chunks/snapshots-CatB4zLh.js");
 const simpleGit = require("simple-git");
 const recorder = require("./chunks/recorder-0Ij921El.js");
 require("dayjs");
@@ -224,12 +224,27 @@ function registerFileHandlers(ipc) {
     });
     if (result.canceled || !result.filePaths[0]) return null;
     const wsPath = result.filePaths[0];
+    const raw = await promises.readFile(wsPath, "utf8");
+    const parsed = JSON.parse(raw);
+    if (looksLikeCollection(parsed)) {
+      const { response } = await electron.dialog.showMessageBox({
+        type: "question",
+        buttons: ["Create Workspace", "Cancel"],
+        defaultId: 0,
+        cancelId: 1,
+        message: "This is a collection, not a workspace.",
+        detail: `API Spector opens workspaces, which contain collections.
+
+Create a workspace in this folder and add "${path.basename(wsPath)}" to it? The collection is moved into a collections/ folder and this file becomes the workspace.`
+      });
+      if (response !== 0) return null;
+      return wrapCollectionAsWorkspace(wsPath, parsed);
+    }
     workspaceDir = path.dirname(wsPath);
     workspaceFile = wsPath;
     await requestExec.loadGlobals(workspaceDir);
     await saveLastWorkspacePath(wsPath);
-    const raw = await promises.readFile(wsPath, "utf8");
-    return { workspace: JSON.parse(raw), workspacePath: wsPath };
+    return { workspace: parsed, workspacePath: wsPath };
   });
   handle.handleIpc(ipc, handle.IPC.file.newWorkspace, async () => {
     const startDir = dialogStartDir();
@@ -390,6 +405,30 @@ async function tryOpenWorkspaceInDir(dir) {
 function getWorkspaceDir() {
   return workspaceDir;
 }
+function looksLikeCollection(obj) {
+  if (!obj || typeof obj !== "object") return false;
+  const o = obj;
+  return !Array.isArray(o["collections"]) && (!!o["rootFolder"] || !!o["requests"]);
+}
+async function wrapCollectionAsWorkspace(collFilePath, collection) {
+  const dir = path.dirname(collFilePath);
+  const base = path.basename(collFilePath).replace(/\.(spector|json)$/i, "");
+  const safe = base.replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "collection";
+  const collRel = `collections/${safe}.json`;
+  if (!collection.id) collection.id = crypto.randomUUID();
+  await promises.mkdir(path.join(dir, "collections"), { recursive: true });
+  await atomicWrite(path.join(dir, collRel), JSON.stringify(collection, null, 2));
+  const ws = { version: "1.0", collections: [collRel], environments: [], activeEnvironmentId: null };
+  await ensureGitignore(dir);
+  await ensureVscodeFileAssociation(dir);
+  await ensureReadme(dir, path.basename(collFilePath));
+  await atomicWrite(collFilePath, JSON.stringify(ws, null, 2));
+  workspaceDir = dir;
+  workspaceFile = collFilePath;
+  await requestExec.loadGlobals(dir);
+  await saveLastWorkspacePath(collFilePath);
+  return { workspace: ws, workspacePath: collFilePath };
+}
 function asObject(value) {
   return value && typeof value === "object" ? value : null;
 }
@@ -1593,6 +1632,30 @@ function registerImportHandlers(ipc) {
     if (result.canceled || !result.filePaths[0]) return null;
     return importHttpFile(result.filePaths[0]);
   });
+  handle.handleIpc(ipc, handle.IPC.import.spector, async () => {
+    const result = await electron.dialog.showOpenDialog({
+      title: "Import API Spector Collection",
+      filters: [{ name: "API Spector Collection", extensions: ["json", "spector"] }],
+      properties: ["openFile"]
+    });
+    if (result.canceled || !result.filePaths[0]) return null;
+    const raw = await promises.readFile(result.filePaths[0], "utf8");
+    let parsed;
+    try {
+      parsed = JSON.parse(raw);
+    } catch {
+      throw new Error("Not a valid JSON file.");
+    }
+    if (Array.isArray(parsed["collections"])) {
+      throw new Error("This is a workspace file, not a collection. Open it with File > Open Workspace instead.");
+    }
+    if (!parsed["rootFolder"] || !parsed["requests"]) {
+      throw new Error("This does not look like an API Spector collection (no rootFolder / requests).");
+    }
+    const collection = parsed;
+    collection.id = crypto.randomUUID();
+    return collection;
+  });
   handle.handleIpc(ipc, handle.IPC.import.openapiSchemas, async () => {
     const result = await electron.dialog.showOpenDialog({
       title: "Load OpenAPI spec for schema sync",
@@ -1719,7 +1782,7 @@ function javaClass(name) {
   return name.replace(/[^\w\s]/g, " ").split(/\s+/).filter(Boolean).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
 }
 function resolveEffectiveAuth(req, inherited) {
-  return req.auth.type !== "none" ? req.auth : inherited.auth ?? req.auth;
+  return requestCollection.authIsConfigured(req.auth) ? req.auth : inherited.auth ?? req.auth;
 }
 function mergeHeaders(req, inherited) {
   return [...inherited.headers.filter((h) => h.enabled && h.key), ...req.headers.filter((h) => h.enabled && h.key)];

package/out/main/runner.js

@@ -2,12 +2,12 @@
 "use strict";
 const promises = require("fs/promises");
 const path = require("path");
-const requestExec = require("./chunks/request-exec-AQD6cEgT.js");
-const requestCollection = require("./chunks/request-collection-CBuPjBwa.js");
+const requestExec = require("./chunks/request-exec-C0DnGKdd.js");
+const requestCollection = require("./chunks/request-collection-CJoXpvOw.js");
 const environments = require("./chunks/environments-iM3SUM-4.js");
 const cliCommon = require("./chunks/cli-common-CDQY1erJ.js");
 require("undici");
-require("./chunks/handle-BCnNIZZr.js");
+require("./chunks/handle-Coax8Nz1.js");
 require("crypto");
 require("dayjs");
 require("vm");
@@ -396,7 +396,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.3.8"}`;
+  const version = `v${"0.3.9"}`;
   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));
@@ -448,7 +448,7 @@ async function main() {
     for (const item of items) {
       const req = item.request;
       const inherited = requestCollection.resolveInheritedAuthAndHeaders(req.id, col);
-      if (req.auth.type === "none" && inherited.auth && inherited.auth.type !== "none") {
+      if (!requestCollection.authIsConfigured(req.auth) && inherited.auth && inherited.auth.type !== "none") {
         req.auth = inherited.auth;
       }
       const inheritedHeaders = inherited.headers.filter((h) => h.enabled && h.key);

package/out/main/wsdl.js

@@ -4,10 +4,10 @@ const promises = require("fs/promises");
 const path = require("path");
 const https = require("https");
 const http = require("http");
-const soapHandler = require("./chunks/soap-handler-h0dWIjOK.js");
-const _import = require("./chunks/import-DUKaMYGO.js");
+const soapHandler = require("./chunks/soap-handler-B1Huudj7.js");
+const _import = require("./chunks/import-Bilo697Z.js");
 const cliCommon = require("./chunks/cli-common-CDQY1erJ.js");
-require("./chunks/handle-BCnNIZZr.js");
+require("./chunks/handle-Coax8Nz1.js");
 require("@xmldom/xmldom");
 require("uuid");
 function fetchUrl(url) {

package/out/preload/index.js

@@ -55,6 +55,7 @@ const IPC = {
     insomnia: "import:insomnia",
     bruno: "import:bruno",
     http: "import:http",
+    spector: "import:spector",
     openapiSchemas: "import:openapi-schemas",
     openapiSchemasUrl: "import:openapi-schemas-url"
   },
@@ -198,6 +199,7 @@ const api = {
   importInsomnia: () => electron.ipcRenderer.invoke(IPC.import.insomnia),
   importBruno: () => electron.ipcRenderer.invoke(IPC.import.bruno),
   importHttpFile: () => electron.ipcRenderer.invoke(IPC.import.http),
+  importSpectorCollection: () => electron.ipcRenderer.invoke(IPC.import.spector),
   /** Extract response-body schemas from an OpenAPI spec file (no full import). */
   extractOpenApiSchemas: () => electron.ipcRenderer.invoke(IPC.import.openapiSchemas),
   /** Extract response-body schemas from an OpenAPI spec URL (no full import). */

package/out/renderer/assets/{index-BK58GuOI.js → index-BdUvP_cg.js}

@@ -14350,14 +14350,14 @@ function useWorkspaceLoader() {
     } else {
       useStore.getState().setHistory([]);
     }
-    for (const colPath of ws2.collections) {
+    for (const colPath of ws2.collections ?? []) {
       try {
         const col = await electron$r.loadCollection(colPath);
         loadCollection(colPath, col);
       } catch {
       }
     }
-    for (const envPath of ws2.environments) {
+    for (const envPath of ws2.environments ?? []) {
       try {
         const env = await electron$r.loadEnvironment(envPath);
         loadEnvironment(envPath, env);
@@ -14388,7 +14388,7 @@ function useWorkspaceLoader() {
       for (const { relPath, snapshot } of snapshots) loadContractSnapshot(relPath, snapshot);
     } catch {
     }
-    if (ws2.collections.length > 0) {
+    if ((ws2.collections ?? []).length > 0) {
       try {
         const firstCol = await electron$r.loadCollection(ws2.collections[0]);
         setActiveCollection(firstCol.id);
@@ -36531,6 +36531,10 @@ function DotsBtn({ items: items2 }) {
     menu && /* @__PURE__ */ jsxRuntimeExports.jsx(ContextMenu, { items: items2, x: menu.x, y: menu.y, onClose: () => setMenu(null) })
   ] });
 }
+function requestPath(url) {
+  const trimmed = url.trim().replace(/^\{\{[^}]+\}\}/, "").replace(/^https?:\/\/[^/]+/i, "");
+  return trimmed || url.trim();
+}
 const HOOK_LABELS = {
   beforeAll: "Before All",
   before: "Before",
@@ -36557,6 +36561,7 @@ function RequestRow({
   folderId,
   reqIndex,
   name: name2,
+  url,
   method,
   protocol,
   authType,
@@ -36658,6 +36663,10 @@ function RequestRow({
                 }
               )
             ] }),
+            (() => {
+              const path = requestPath(url);
+              return path && path !== name2 ? /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "block text-[10px] text-surface-500 font-mono truncate leading-tight", title: url, children: path }) : null;
+            })(),
             (tags2.length > 0 || addingTag) && /* @__PURE__ */ jsxRuntimeExports.jsx(
               TagChips,
               {
@@ -37241,6 +37250,7 @@ function FolderContents({
           folderId: folder.id,
           reqIndex,
           name: req.name,
+          url: req.url,
           method: req.method,
           protocol: req.protocol,
           authType: req.auth.type,
@@ -37358,6 +37368,25 @@ function getHooksForRequest(requestId, collection) {
   }
   return { before, after: afterReversed.reverse() };
 }
+function authIsConfigured(auth) {
+  if (!auth || auth.type === "none") return false;
+  const set2 = (s) => !!(s && s.trim());
+  switch (auth.type) {
+    case "bearer":
+      return set2(auth.token) || set2(auth.tokenSecretRef);
+    case "basic":
+    case "digest":
+      return set2(auth.username) || set2(auth.password) || set2(auth.passwordSecretRef);
+    case "ntlm":
+      return set2(auth.username) || set2(auth.password) || set2(auth.passwordSecretRef);
+    case "apikey":
+      return set2(auth.apiKeyValue) || set2(auth.apiKeySecretRef);
+    case "oauth2":
+      return set2(auth.oauth2TokenUrl) || set2(auth.oauth2ClientId) || set2(auth.oauth2CachedToken);
+    default:
+      return true;
+  }
+}
 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) ?? [];
@@ -63829,7 +63858,7 @@ function RequestBuilder({ request }) {
       };
       let liveGlobals = { ...globals };
       const inherited = useStore.getState().getInheritedAuthAndHeaders(request.id);
-      const mergedAuth = request.auth.type !== "none" ? request.auth : inherited.auth ?? request.auth;
+      const mergedAuth = authIsConfigured(request.auth) ? request.auth : inherited.auth ?? request.auth;
       const mergedHeaders = [
         ...inherited.headers.filter((h) => h.enabled),
         ...request.headers
@@ -67233,7 +67262,8 @@ const OPTIONS = [
   { id: "openapi", label: "OpenAPI", description: "JSON or YAML (v3.x)", supportsUrl: true },
   { id: "insomnia", label: "Insomnia", description: "Export v4 JSON" },
   { id: "bruno", label: "Bruno", description: "bruno.json collection file" },
-  { id: "http", label: "HTTP file", description: ".http / .rest (REST Client)" }
+  { id: "http", label: "HTTP file", description: ".http / .rest (REST Client)" },
+  { id: "spector", label: "API Spector", description: "An existing .spector / .json collection" }
 ];
 function listEndpoints(col) {
   const result = [];
@@ -67304,6 +67334,7 @@ function ImportModal({ onImport, onClose }) {
       if (opt2.id === "insomnia") col = await electron$9.importInsomnia();
       if (opt2.id === "bruno") col = await electron$9.importBruno();
       if (opt2.id === "http") col = await electron$9.importHttpFile();
+      if (opt2.id === "spector") col = await electron$9.importSpectorCollection();
       if (!col) {
         setLoading(false);
         return;
@@ -68506,7 +68537,7 @@ function RunnerModal() {
       items2 = items2.map((item) => {
         const inherited = resolveInheritedAuthAndHeaders(item.request.id, col);
         const req = JSON.parse(JSON.stringify(item.request));
-        if (req.auth?.type === "none" && inherited.auth && inherited.auth.type !== "none") {
+        if (!authIsConfigured(req.auth) && inherited.auth && inherited.auth.type !== "none") {
           req.auth = inherited.auth;
         }
         const inheritedHeaders = inherited.headers.filter((h) => h.enabled && h.key);
@@ -72054,7 +72085,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.3.8"
+        "0.3.9"
       ] }),
       /* @__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-BK58GuOI.js"></script>
+  <script type="module" crossorigin src="./assets/index-BdUvP_cg.js"></script>
   <link rel="stylesheet" crossorigin href="./assets/index-B6kFQEbI.css">
 </head>
 

package/package.json

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