@schwabyio/gta 0.11.0 → 0.12.0

package/dist/SPEC.md

@@ -1297,7 +1297,8 @@ global project's root.
 
 - A secret with no value anywhere fails the run, naming it. An empty credential is never
   sent.
-- Reports replace a secret's value with `[secret: NAME]`, wherever it appears.
+- Reports replace a secret's value with `[secret: NAME]`, wherever it appears. So does
+  the desktop app where it shows a request as sent.
 - `.env` holds `NAME=value` lines. `#` starts a comment line, `export ` before a name is
   allowed, and a value may be quoted. It must not be committed.
 

package/dist/chunks/{chunk-OM3ZR56O.js → chunk-3NSHWS24.js}

@@ -54864,6 +54864,35 @@ function placeholdersOf(pattern, url2) {
   return found;
 }
 
+// ../../packages/core/src/model/layers.ts
+var partsOf = (doc) => ({
+  headers: doc?.headers,
+  settings: doc?.settings,
+  before: doc?.before,
+  tests: doc?.tests
+});
+function requestLayers(sources) {
+  const layers = [];
+  if (sources.endpoint) {
+    layers.push({ kind: "endpoint-file", ...partsOf(sources.endpoint.file) });
+    layers.push({ kind: "endpoint", ...partsOf(sources.endpoint.step) });
+  }
+  if (sources.base) layers.push({ kind: "base", ...partsOf(sources.base) });
+  layers.push({ kind: "collection", ...partsOf(sources.collection) });
+  if (sources.set) layers.push({ kind: "set", ...partsOf(sources.set) });
+  layers.push({ kind: "step", before: sources.step.before, tests: sources.step.tests });
+  return layers;
+}
+function foldLayers(layers) {
+  let headers;
+  let settings = {};
+  for (const layer of layers) {
+    if (layer.headers) headers = mergeHeaders(headers, layer.headers);
+    settings = { ...settings, ...layer.settings };
+  }
+  return { headers, settings };
+}
+
 // ../../packages/core/src/paths.ts
 import fs from "node:fs/promises";
 import nodePath from "node:path";
@@ -56901,6 +56930,37 @@ async function readDotEnv(near) {
   }
 }
 
+// ../../packages/core/src/vars/secrets.ts
+async function secretValues(context) {
+  if (!context.environmentName) return [];
+  try {
+    const layer = await environmentLayer(context, context.environmentName);
+    return (layer.secrets ?? []).flatMap((name) => {
+      const value = layer.vars[name];
+      return value === void 0 || value === null || String(value) === "" ? [] : [[name, String(value)]];
+    }).sort((a, b) => b[1].length - a[1].length);
+  } catch {
+    return [];
+  }
+}
+function redact(value, secrets) {
+  if (secrets.length === 0) return value;
+  const walk = (node2) => {
+    if (typeof node2 === "string") {
+      return secrets.reduce(
+        (text, [name, secret]) => text.split(secret).join(`[secret: ${name}]`),
+        node2
+      );
+    }
+    if (Array.isArray(node2)) return node2.map(walk);
+    if (node2 !== null && typeof node2 === "object") {
+      return Object.fromEntries(Object.entries(node2).map(([key, inner]) => [key, walk(inner)]));
+    }
+    return node2;
+  };
+  return walk(value);
+}
+
 // ../../packages/core/src/http/client.ts
 var import_undici = __toESM(require_undici(), 1);
 import { Buffer as Buffer2 } from "node:buffer";
@@ -57058,7 +57118,7 @@ function statusTextFor(status) {
 // ../../packages/core/src/run/multipart.ts
 import { Buffer as Buffer3 } from "node:buffer";
 import { randomBytes } from "node:crypto";
-function partsOf(multipart) {
+function partsOf2(multipart) {
   return Object.entries(multipart).flatMap(
     ([name, field]) => (Array.isArray(field) ? field : [field]).map((part) => [name, part])
   );
@@ -57178,7 +57238,7 @@ function toBody(body) {
     };
   }
   if (body.multipart !== void 0) {
-    const parts = partsOf(body.multipart).map(
+    const parts = partsOf2(body.multipart).map(
       ([name, part]) => typeof part === "string" ? { name, value: part } : "file" in part ? {
         name,
         value: "",
@@ -57236,7 +57296,7 @@ async function prepareRequest(written, body, scope, files) {
   }
   if (body?.multipart !== void 0) {
     const parts = [];
-    for (const [field, part] of partsOf(body.multipart)) {
+    for (const [field, part] of partsOf2(body.multipart)) {
       const name = resolve(field);
       if (typeof part === "string") {
         parts.push({ name, value: resolve(part) });
@@ -57289,7 +57349,7 @@ var withoutGlobal = (path11) => path11.startsWith(GLOBAL_FILE) ? path11.slice(GL
 function bodyFiles(body) {
   if (body?.file !== void 0) return [{ what: "body.file", written: body.file }];
   if (body?.multipart === void 0) return [];
-  return partsOf(body.multipart).flatMap(
+  return partsOf2(body.multipart).flatMap(
     ([field, part]) => typeof part !== "string" && "file" in part ? [{ what: `multipart field ${field}`, written: part.file }] : []
   );
 }
@@ -58649,13 +58709,7 @@ async function missingFiles(planned, collectionPath) {
 // ../../packages/core/src/run/runRequest.ts
 var itemText = (value) => value === null || ["string", "number", "boolean"].includes(typeof value) ? value : JSON.stringify(value) ?? String(value);
 function folded(layers, collection) {
-  let headers;
-  let settings = {};
-  for (const layer of layers) {
-    if (layer.script === "step" || layer.script === "use") continue;
-    if (layer.headers) headers = mergeHeaders(headers, layer.headers);
-    settings = { ...settings, ...layer.settings };
-  }
+  const { headers, settings } = foldLayers(layers);
   return {
     ...collection,
     steps: [],
@@ -58663,12 +58717,15 @@ function folded(layers, collection) {
     ...Object.keys(settings).length > 0 ? { settings } : {}
   };
 }
-var partsOf2 = (doc) => ({
-  headers: doc?.headers,
-  settings: doc?.settings,
-  before: doc?.before,
-  tests: doc?.tests
-});
+var ROLES = {
+  // An endpoint base's checks are defaults: the step's own of the same thing replace them.
+  "endpoint-file": { script: "endpoint", label: "endpoint file", defaults: true },
+  endpoint: { script: "endpoint", label: "endpoint", defaults: true },
+  base: { script: "base", label: "base" },
+  collection: { script: "collection", label: "collection" },
+  set: { script: "set", label: "set" },
+  step: { script: "step", label: "" }
+};
 var needsLibrary = (input2) => input2.checks === void 0 || input2.endpoints === void 0 || input2.tls === void 0 || input2.base === void 0 && input2.collection?.extends !== void 0;
 function endpointFor(step, endpoints) {
   if (isUseStep(step) || endpoints.length === 0) return null;
@@ -58750,25 +58807,13 @@ async function runRequest(input2) {
   });
   const marked = set2 ? set2.doc.steps.findIndex((s) => s.useTests === true) : -1;
   const useChecksThis = set2 ? set2.child === (marked >= 0 ? marked : set2.of - 1) : false;
-  const layers = [];
-  if (endpoint) {
-    layers.push({
-      script: "endpoint",
-      label: "endpoint file",
-      defaults: true,
-      ...partsOf2(endpoint.file)
-    });
-    layers.push({
-      script: "endpoint",
-      label: "endpoint",
-      defaults: true,
-      ...partsOf2(endpoint.step)
-    });
-  }
-  if (base2) layers.push({ script: "base", label: "base", ...partsOf2(base2) });
-  layers.push({ script: "collection", label: "collection", ...partsOf2(input2.collection) });
-  if (set2) layers.push({ script: "set", label: "set", ...partsOf2(set2.doc) });
-  layers.push({ script: "step", label: "", before: step.before, tests: step.tests });
+  const layers = requestLayers({
+    endpoint,
+    base: base2,
+    collection: input2.collection,
+    set: set2?.doc,
+    step
+  }).map(({ kind, ...parts }) => ({ ...ROLES[kind], ...parts }));
   if (useChecksThis && set2?.useTests)
     layers.push({ script: "use", label: "use", tests: set2.useTests });
   const collection = folded(layers, input2.collection);
@@ -59516,7 +59561,7 @@ async function runJob(job) {
     });
     return {
       ok: true,
-      summary: redact(summary, await secretsOf(context)),
+      summary: redact(summary, await secretValues(context)),
       steps: refs,
       data: loaded.dataFile ? { file: `${COLLECTIONS_DIR}/${loaded.dataFile.relativePath}`, rows: loaded.dataFile.rows } : null
     };
@@ -59524,35 +59569,6 @@ async function runJob(job) {
     return { ok: false, message: cause instanceof Error ? cause.message : String(cause) };
   }
 }
-async function secretsOf(context) {
-  if (!context.environmentName) return [];
-  try {
-    const layer = await environmentLayer(context, context.environmentName);
-    return (layer.secrets ?? []).flatMap((name) => {
-      const value = layer.vars[name];
-      return value === void 0 || value === null || String(value) === "" ? [] : [[name, String(value)]];
-    }).sort((a, b) => b[1].length - a[1].length);
-  } catch {
-    return [];
-  }
-}
-function redact(value, secrets) {
-  if (secrets.length === 0) return value;
-  const walk = (node2) => {
-    if (typeof node2 === "string") {
-      return secrets.reduce(
-        (text, [name, secret]) => text.split(secret).join(`[secret: ${name}]`),
-        node2
-      );
-    }
-    if (Array.isArray(node2)) return node2.map(walk);
-    if (node2 !== null && typeof node2 === "object") {
-      return Object.fromEntries(Object.entries(node2).map(([key, inner]) => [key, walk(inner)]));
-    }
-    return node2;
-  };
-  return walk(value);
-}
 async function stepLines(file2) {
   const lines = { setup: [], steps: [], teardown: [] };
   try {

package/dist/gta.js

@@ -28,7 +28,7 @@ import {
   samePath,
   stepsForTags,
   unattempted
-} from "./chunks/chunk-OM3ZR56O.js";
+} from "./chunks/chunk-3NSHWS24.js";
 
 // src/args.ts
 var UsageError = class extends Error {
@@ -1269,7 +1269,7 @@ function coerce(key, value, where) {
 }
 
 // src/main.ts
-var VERSION = true ? "0.11.0" : "0.0.0-dev";
+var VERSION = true ? "0.12.0" : "0.0.0-dev";
 var JUNIT_DIR = "junit";
 var JUNIT_FILE = "junit.xml";
 var HTML_DIR = "html";

package/dist/worker.js

@@ -3,7 +3,7 @@ import { createRequire as __gtaCreateRequire } from 'node:module';
 const require = __gtaCreateRequire(import.meta.url);
 import {
   runJob
-} from "./chunks/chunk-OM3ZR56O.js";
+} from "./chunks/chunk-3NSHWS24.js";
 
 // src/worker.ts
 import { parentPort, workerData } from "node:worker_threads";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schwabyio/gta",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "type": "module",
   "description": "gta, the Gravity Test Automation command-line runner: HTTP API tests written as YAML files, run from a terminal or CI.",
   "keywords": [