@schwabyio/gta 0.10.0 → 0.12.0

package/dist/gta.js

@@ -28,7 +28,7 @@ import {
   samePath,
   stepsForTags,
   unattempted
-} from "./chunks/chunk-MZSHHPAQ.js";
+} from "./chunks/chunk-3NSHWS24.js";
 
 // src/args.ts
 var UsageError = class extends Error {
@@ -1072,6 +1072,7 @@ function jsonListing(options) {
     project: options.project,
     environments: options.environments,
     environmentType: options.environmentType,
+    settings: { values: options.settings.values, sources: options.settings.sources },
     flags: { values: options.flags.values, sources: options.flags.sources },
     tags: options.tags,
     notTags: options.notTags ?? [],
@@ -1168,13 +1169,11 @@ var SettingsError = class extends Error {
   name = "SettingsError";
 };
 var envNameOf = (key) => `GTA_${key.replace(/[A-Z]/g, (c) => `_${c}`).toUpperCase()}`;
+var DEFAULT_SOURCE = "default";
 async function loadSettings(options) {
-  const { root, overrides = {}, env = process.env } = options;
-  const file = path.join(root, SETTINGS_FILE);
-  let source;
-  try {
-    source = await fs.readFile(file, "utf8");
-  } catch {
+  const { root, global = null, overrides = {}, env = process.env } = options;
+  const own = await readSettingsFile(path.join(root, SETTINGS_FILE), SETTINGS_FILE);
+  if (own === null) {
     throw new SettingsError(
       `There is no ${SETTINGS_FILE} in ${root}.
 gta runs from a project folder: the one holding collections/ and ${SETTINGS_FILE}.
@@ -1185,23 +1184,20 @@ A minimal ${SETTINGS_FILE}:
 `
     );
   }
-  let fromFile;
-  try {
-    fromFile = (0, import_yaml.parse)(source) ?? {};
-  } catch (cause) {
-    throw new SettingsError(`${SETTINGS_FILE} will not parse: ${cause.message}`);
-  }
-  if (typeof fromFile !== "object" || fromFile === null || Array.isArray(fromFile)) {
-    throw new SettingsError(
-      `${SETTINGS_FILE} must be a map of settings, such as limitConcurrency: 4`
-    );
-  }
+  const sharedLabel = global ? path.posix.join(global.uses, SETTINGS_FILE) : "";
+  const shared = global ? await readSettingsFile(path.join(global.root, SETTINGS_FILE), sharedLabel) : null;
   const origin = /* @__PURE__ */ new Map();
   const merged = {};
-  for (const [key, value] of Object.entries(fromFile)) {
-    checkKey(key, SETTINGS_FILE);
-    merged[key] = value;
-    origin.set(key, SETTINGS_FILE);
+  const files = [
+    [sharedLabel, shared],
+    [SETTINGS_FILE, own]
+  ];
+  for (const [label, fromFile] of files) {
+    for (const [key, value] of Object.entries(fromFile ?? {})) {
+      checkKey(key, label);
+      merged[key] = value;
+      origin.set(key, label);
+    }
   }
   for (const key of KEYS) {
     const value = env[envNameOf(key)];
@@ -1223,7 +1219,29 @@ A minimal ${SETTINGS_FILE}:
     throw new SettingsError(`Settings are not valid:
 ${lines.join("\n")}`);
   }
-  return result.data;
+  const sources = Object.fromEntries(
+    KEYS.map((key) => [key, origin.get(key) ?? DEFAULT_SOURCE])
+  );
+  return { settings: result.data, sources };
+}
+async function readSettingsFile(file, label) {
+  let source;
+  try {
+    source = await fs.readFile(file, "utf8");
+  } catch (cause) {
+    if (cause.code === "ENOENT") return null;
+    throw new SettingsError(`${label} cannot be read: ${cause.message}`);
+  }
+  let fromFile;
+  try {
+    fromFile = (0, import_yaml.parse)(source) ?? {};
+  } catch (cause) {
+    throw new SettingsError(`${label} will not parse: ${cause.message}`);
+  }
+  if (typeof fromFile !== "object" || fromFile === null || Array.isArray(fromFile)) {
+    throw new SettingsError(`${label} must be a map of settings, such as limitConcurrency: 4`);
+  }
+  return fromFile;
 }
 function checkKey(key, where) {
   if (!Object.hasOwn(SETTING_KEYS, key)) {
@@ -1251,7 +1269,7 @@ function coerce(key, value, where) {
 }
 
 // src/main.ts
-var VERSION = true ? "0.10.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";
@@ -1294,6 +1312,7 @@ async function main(argv, cli) {
             project: { name: project.name, root: project.root },
             environments: project.environments,
             environmentType: project.settings.environmentType,
+            settings: { values: project.settings, sources: project.settingSources },
             flags: project.flags,
             tags: project.settings.tags,
             notTags: project.settings.notTags,
@@ -1328,14 +1347,19 @@ async function openProject(ctx, overrides, flagArgs = []) {
 gta runs from a project folder: the one holding ${COLLECTIONS_DIR}/ and ${SETTINGS_FILE}.`
     );
   }
-  const settings = await loadSettings({ root, overrides, env: ctx.env });
   const info = await readProject(root);
+  const { settings, sources: settingSources } = await loadSettings({
+    root,
+    global: info.global,
+    overrides,
+    env: ctx.env
+  });
   const layout = await discoverProject(root);
   const collections = await loadProjectCollections(root, layout.files);
   const environments = environmentNames(await projectEnvironments(root, info.global));
   if (settings.environmentType && !environments.includes(settings.environmentType)) {
     throw new ProjectError(
-      `environmentType: there is no environment called "${settings.environmentType}". ` + (environments.length > 0 ? `This project has: ${environments.join(", ")}` : `This project has no environments/.`)
+      `environmentType (from ${settingSources.environmentType}): there is no environment called "${settings.environmentType}". ` + (environments.length > 0 ? `This project has: ${environments.join(", ")}` : `This project has no environments/.`)
     );
   }
   let flags;
@@ -1360,6 +1384,7 @@ gta runs from a project folder: the one holding ${COLLECTIONS_DIR}/ and ${SETTIN
     root,
     name: info.doc?.name ?? path2.basename(root),
     settings,
+    settingSources,
     flags,
     collections,
     environments,
@@ -1403,8 +1428,7 @@ function list(project, selection, problems, ctx, p) {
   );
   ctx.out(field("Flags", flagLine(project.flags, p)));
   if (project.caFiles.length > 0) ctx.out(field("CA files", project.caFiles.join(", ")));
-  if (settings.tags.length > 0) ctx.out(field("Tags", settings.tags.join(", ")));
-  if (settings.notTags.length > 0) ctx.out(field("Not tags", settings.notTags.join(", ")));
+  for (const line of settingLines(project, p)) ctx.out(line);
   ctx.out("");
   const width = nameWidthFor(selection.targets.map((t) => t.id));
   const dirWidth = Math.max(
@@ -1445,6 +1469,19 @@ function list(project, selection, problems, ctx, p) {
   const steps = selection.targets.reduce((n, t) => n + stepCountOf(t), 0);
   ctx.out(field("Total", `${selection.targets.length} collections, ${steps} steps`));
 }
+function settingLines(project, p) {
+  const rows = Object.keys(SETTING_KEYS).filter((key) => project.settingSources[key] !== DEFAULT_SOURCE).map((key) => ({
+    cell: `${key}: ${shownSetting(project.settings[key])}`,
+    source: project.settingSources[key]
+  }));
+  if (rows.length === 0) return [field("Settings", p.dim("all defaults"))];
+  const width = Math.max(...rows.map((row) => row.cell.length));
+  const indent = " ".repeat(field("Settings", "").length);
+  return rows.map(
+    (row, i) => `${i === 0 ? field("Settings", "") : indent}${row.cell.padEnd(width)}  ${p.dim(row.source)}`
+  );
+}
+var shownSetting = (value) => Array.isArray(value) ? value.length > 0 ? value.join(", ") : "[]" : String(value ?? "none");
 async function run(project, selection, ctx, p, emit = null) {
   const { settings } = project;
   const width = nameWidthFor(selection.targets.map((t) => t.id));
@@ -1632,8 +1669,8 @@ function usage(p) {
     "",
     `  ${p.bold("Commands:")}`,
     "    g, get          List the collections `gta all` would run, without running them.",
-    "                    Exits 1 on a broken collection, or a use: or extends: that",
-    "                    would stop a run, in any collection.",
+    "                    Exits 1 on a broken collection, or a use:, extends: or body",
+    "                    file that would stop a run, in any collection.",
     "    a, all          Run every collection, less those with exclude: true.",
     "    <list>          Run the collections and directories named, comma separated,",
     "                    in that order: smoke,checkout/sessions,payments",
@@ -1648,7 +1685,8 @@ function usage(p) {
     "                    Override a feature flag for this run; any number of them.",
     "                    GTA_FLAG_<name>=value does the same from the environment.",
     "",
-    `  ${p.bold("Settings")} (settings.yml, then GTA_* environment variables, then --flags):`,
+    `  ${p.bold("Settings")} (the global project's settings.yml, then this project's, then`,
+    "  GTA_* environment variables, then --flags; gta get shows where each came from):",
     ...settings,
     "",
     `  ${p.bold("Exit code:")} 0 passed, 1 failed, 2 could not run (or write a report).`

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-MZSHHPAQ.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.10.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": [