mmt-testlight 0.4.3 → 0.4.4

package/dist/cli.js

@@ -4917,15 +4917,17 @@ var init_testHelper = __esm({
       }
       emitStep(payload);
     };
-    setenv_ = (name, value) => {
-      setenvWithContext_(void 0, void 0, void 0, name, value);
+    setenv_ = (variables) => {
+      setenvWithContext_(void 0, void 0, void 0, variables);
     };
-    setenvWithContext_ = (reporter, runId, id, name, value) => {
+    setenvWithContext_ = (reporter, runId, id, variables) => {
+      if (!variables || typeof variables !== "object") {
+        return;
+      }
       const resolvedRunId = typeof runId === "string" ? runId : "";
       const payload = {
         scope: "setenv",
-        name,
-        value
+        variables: { ...variables }
       };
       if (resolvedRunId) {
         payload.runId = resolvedRunId;
@@ -67763,7 +67765,7 @@ async function runJSCode(context) {
     const functionBody = `${helperDecls}
 ${randomDecls}
 const report_ = (...args) => mmtHelper.reportWithContext_(__reporter, __runId, __id, ...args);
-const setenv_ = (name, value) => { if (typeof envVariables !== 'undefined') { try { envVariables[name] = value; } catch (_e) {} } mmtHelper.setenvWithContext_(__reporter, __runId, __id, name, value); };
+const setenv_ = (vars) => { if (typeof envVariables !== 'undefined' && vars && typeof vars === 'object') { for (const [k, v] of Object.entries(vars)) { try { envVariables[k] = v; } catch (_e) {} } } mmtHelper.setenvWithContext_(__reporter, __runId, __id, vars); };
 const check_ = (passed, type, raw, reportLevel, title, details, actual, expected) => mmtHelper.check_(passed, type, raw, reportLevel, title, details, actual, expected, report_, console, __checkLogMode);
 const checkExpects_ = (items, type, reportLevel, title, details) => mmtHelper.checkExpects_(items, type, reportLevel, title, details, report_, console, __checkLogMode);
 const checkAbort_ = () => { if (__abortSignal && __abortSignal.aborted) { throw new mmtHelper.TestAbortError(); } };
@@ -67937,6 +67939,7 @@ __export(src_exports, {
   apiRunResult: () => apiRunResult_exports,
   brunoParsePack: () => brunoParsePack_exports,
   curlConvertor: () => curlConvertor_exports,
+  curlGenerator: () => curlGenerator_exports,
   dataImportProcessor: () => dataImportProcessor_exports,
   docHtml: () => docHtml_exports,
   docMarkdown: () => docMarkdown_exports,
@@ -72532,10 +72535,11 @@ var setenvToJSfunc = (setenv, root) => {
   if (entries.length === 0) {
     return "";
   }
-  return entries.map(([envKey, outputKeyOrValue]) => {
+  const objEntries = entries.map(([envKey, outputKeyOrValue]) => {
     const valueExpr = typeof outputKeyOrValue === "string" ? toTemplateWithVars(outputKeyOrValue) : JSON.stringify(outputKeyOrValue);
-    return `setenv_(${JSON.stringify(envKey)}, ${valueExpr});`;
-  }).join("\n");
+    return `${JSON.stringify(envKey)}: ${valueExpr}`;
+  });
+  return `setenv_({ ${objEntries.join(", ")} });`;
 };
 var runToJSfunc = (step) => {
   const alias = step.run;
@@ -73888,6 +73892,219 @@ function curlToAPI(command) {
   return api;
 }
 
+// ../core/src/curlGenerator.ts
+var curlGenerator_exports = {};
+__export(curlGenerator_exports, {
+  buildCurlCommand: () => buildCurlCommand,
+  buildCurlCommandSet: () => buildCurlCommandSet,
+  buildCurlUrl: () => buildCurlUrl,
+  formatCurlCommandSet: () => formatCurlCommandSet,
+  quoteCurlArgument: () => quoteCurlArgument
+});
+function stringifyCurlValue(value) {
+  if (value === void 0 || value === null || value === "") {
+    return "";
+  }
+  return String(value);
+}
+function stringifyCurlBody(body) {
+  if (body === void 0 || body === null || body === "") {
+    return "";
+  }
+  if (typeof body === "string") {
+    return body;
+  }
+  return JSON.stringify(body);
+}
+function buildCurlUrl(url, query) {
+  const queryPairs = Object.entries(query).map(([key, value]) => [key, stringifyCurlValue(value)]).filter(([, value]) => value);
+  if (!queryPairs.length) {
+    return url;
+  }
+  try {
+    const parsed = new URL(url);
+    queryPairs.forEach(([key, value]) => parsed.searchParams.set(key, value));
+    return parsed.toString();
+  } catch {
+    const params = new URLSearchParams();
+    queryPairs.forEach(([key, value]) => params.set(key, value));
+    const separator = url.includes("?") ? "&" : "?";
+    return `${url}${separator}${params.toString()}`;
+  }
+}
+function buildCurlParts(input, certificates) {
+  const parts = [];
+  const method = String(input.method || "GET").toUpperCase();
+  if (method !== "GET") {
+    parts.push({ kind: "pair", flag: "-X", value: method });
+  }
+  Object.entries(input.headers || {}).forEach(([key, value]) => {
+    const headerValue2 = stringifyCurlValue(value);
+    if (headerValue2) {
+      parts.push({ kind: "pair", flag: "-H", value: `${key}: ${headerValue2}` });
+    }
+  });
+  const cookiePairs = Object.entries(input.cookies || {}).map(([key, value]) => {
+    const cookieValue = stringifyCurlValue(value);
+    return cookieValue ? `${key}=${cookieValue}` : "";
+  }).filter(Boolean);
+  if (cookiePairs.length) {
+    parts.push({
+      kind: "pair",
+      flag: "-H",
+      value: `Cookie: ${cookiePairs.join("; ")}`
+    });
+  }
+  const body = stringifyCurlBody(input.body);
+  if (method !== "GET" && body) {
+    parts.push({ kind: "pair", flag: "--data-raw", value: body });
+  }
+  const url = buildCurlUrl(input.url || "", input.query || {});
+  if (!url) {
+    return parts;
+  }
+  if (certificates?.insecure) {
+    parts.push({ kind: "flag", text: "--insecure" });
+  }
+  if (certificates?.caPath) {
+    parts.push({ kind: "pair", flag: "--cacert", value: certificates.caPath });
+  }
+  if (certificates?.certType === "P12" && certificates.cert) {
+    parts.push({ kind: "pair", flag: "--cert-type", value: "P12" });
+    parts.push({ kind: "pair", flag: "--cert", value: certificates.cert });
+  } else if (certificates?.cert && certificates.key) {
+    parts.push({ kind: "pair", flag: "--cert", value: certificates.cert });
+    parts.push({ kind: "pair", flag: "--key", value: certificates.key });
+    if (certificates.pass) {
+      parts.push({ kind: "pair", flag: "--pass", value: certificates.pass });
+    }
+  }
+  parts.push({ kind: "url", value: url });
+  return parts;
+}
+function quoteCurlArgument(shell, value) {
+  if (shell === "powershell") {
+    return `'${value.replace(/'/g, "''")}'`;
+  }
+  if (shell === "cmd") {
+    return `"${value.replace(/"/g, '""')}"`;
+  }
+  return `'${value.replace(/'/g, "'\\''")}'`;
+}
+function quoteNativeWindows(value) {
+  return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+}
+function shouldQuoteCurlPairValue(flag) {
+  return flag !== "-X" && flag !== "--request" && flag !== "--cert-type";
+}
+function formatPairValue(shell, flag, value) {
+  if (!shouldQuoteCurlPairValue(flag)) {
+    return value;
+  }
+  if (shell === "powershell") {
+    return quoteNativeWindows(value);
+  }
+  return quoteCurlArgument(shell, value);
+}
+function renderPosixLine(parts) {
+  const segments = [];
+  for (const part of parts) {
+    if (part.kind === "flag") {
+      segments.push(part.text);
+      continue;
+    }
+    if (part.kind === "pair") {
+      segments.push(part.flag, formatPairValue("posix", part.flag, part.value));
+      continue;
+    }
+    segments.push(quoteCurlArgument("posix", part.value));
+  }
+  return ["curl", ...segments].join(" ");
+}
+function renderPosixParts(parts, multiline) {
+  if (!multiline) {
+    return renderPosixLine(parts);
+  }
+  const chunks = [];
+  for (const part of parts) {
+    if (part.kind === "flag") {
+      chunks.push(part.text);
+      continue;
+    }
+    if (part.kind === "pair") {
+      chunks.push(`${part.flag} ${formatPairValue("posix", part.flag, part.value)}`);
+      continue;
+    }
+    chunks.push(quoteCurlArgument("posix", part.value));
+  }
+  const lines = [`curl ${chunks[0]}`];
+  for (let i = 1; i < chunks.length; i++) {
+    lines.push(`  ${chunks[i]}`);
+  }
+  return lines.map((line, index) => index < lines.length - 1 ? `${line} \\` : line).join("\n");
+}
+function renderCmdParts(parts) {
+  const segments = [];
+  for (const part of parts) {
+    if (part.kind === "flag") {
+      segments.push(part.text);
+      continue;
+    }
+    if (part.kind === "pair") {
+      segments.push(part.flag, formatPairValue("cmd", part.flag, part.value));
+      continue;
+    }
+    segments.push(quoteCurlArgument("cmd", part.value));
+  }
+  return ["curl", ...segments].join(" ");
+}
+function renderPowerShellParts(parts) {
+  const args = [];
+  for (const part of parts) {
+    if (part.kind === "flag") {
+      args.push(part.text);
+      continue;
+    }
+    if (part.kind === "pair") {
+      args.push(part.flag, formatPairValue("powershell", part.flag, part.value));
+      continue;
+    }
+    args.push(quoteNativeWindows(part.value));
+  }
+  return `curl.exe --% ${args.join(" ")}`;
+}
+function buildCurlCommand(input, shell, certificates) {
+  const parts = buildCurlParts(input, certificates);
+  if (shell === "powershell") {
+    return renderPowerShellParts(parts);
+  }
+  if (shell === "cmd") {
+    return renderCmdParts(parts);
+  }
+  return renderPosixParts(parts, false);
+}
+function buildCurlCommandSet(input, certificates) {
+  const parts = buildCurlParts(input, certificates);
+  return {
+    posix: renderPosixParts(parts, true),
+    powershell: renderPowerShellParts(parts),
+    cmd: renderCmdParts(parts)
+  };
+}
+function formatCurlCommandSet(set) {
+  return [
+    "# Bash / macOS / Linux / Git Bash / WSL",
+    set.posix,
+    "",
+    "# PowerShell (Windows)",
+    '# Use curl.exe \u2014 "curl" is an alias for Invoke-WebRequest',
+    set.powershell,
+    "",
+    "# CMD (Windows)",
+    set.cmd
+  ].join("\n");
+}
+
 // ../core/src/docParsePack.ts
 var docParsePack_exports = {};
 __export(docParsePack_exports, {
@@ -78520,9 +78737,11 @@ __export(runConfig_exports, {
   mergeEnv: () => mergeEnv,
   mergeInputs: () => mergeInputs,
   mergeSuiteEnv: () => mergeSuiteEnv,
+  normalizePresetNames: () => normalizePresetNames,
   resolveDocumentEnvVars: () => resolveDocumentEnvVars,
   resolveEnvFromDoc: () => resolveEnvFromDoc,
   resolvePresetEnv: () => resolvePresetEnv,
+  resolvePresetsEnv: () => resolvePresetsEnv,
   selectFromVariables: () => selectFromVariables
 });
 function mergeInputs(params) {
@@ -78535,7 +78754,7 @@ function mergeEnv(params) {
 }
 function resolveEnvFromDoc(params) {
   const { doc, presetName, manualEnvvars } = params;
-  const presetEnv = presetName ? resolvePresetEnv(doc, presetName) : {};
+  const presetEnv = resolvePresetsEnv(doc, presetName);
   return mergeEnv({ envvar: presetEnv, manualEnvvars });
 }
 function selectFromVariables(variables, key, choiceOrValue) {
@@ -78582,6 +78801,33 @@ function resolvePresetEnv(doc, presetName) {
   }
   return out;
 }
+function normalizePresetNames(presetNames) {
+  if (presetNames == null) {
+    return [];
+  }
+  const raw = Array.isArray(presetNames) ? presetNames : [presetNames];
+  const names = [];
+  for (const entry of raw) {
+    const s = String(entry).trim();
+    if (!s) {
+      continue;
+    }
+    for (const part of s.split(",")) {
+      const name = part.trim();
+      if (name) {
+        names.push(name);
+      }
+    }
+  }
+  return names;
+}
+function resolvePresetsEnv(doc, presetNames) {
+  const out = {};
+  for (const name of normalizePresetNames(presetNames)) {
+    Object.assign(out, resolvePresetEnv(doc, name));
+  }
+  return out;
+}
 function mergeSuiteEnv(params) {
   const {
     baseEnv = {},
@@ -84373,7 +84619,7 @@ var import_path2 = __toESM(require("path"));
 var import_module = require("module");
 var requireFromRunArgs = (0, import_module.createRequire)(__filename);
 var { resolveUserPath, resolveUserPathPreferExisting } = requireFromRunArgs("../src/pathNormalize.cjs");
-var { mergeEnv: mergeEnv2, resolvePresetEnv: resolvePresetEnv2 } = runConfig_exports || {};
+var { mergeEnv: mergeEnv2, resolvePresetsEnv: resolvePresetsEnv2, normalizePresetNames: normalizePresetNames2 } = runConfig_exports || {};
 var OMIT_SENTINEL2 = (omitKeyword_exports || {}).OMIT_SENTINEL || "__MMT_OMIT__";
 var LOG_LEVEL_PRIORITY = {
   error: 0,
@@ -84639,7 +84885,7 @@ async function buildCliRunArgs(file, opts) {
   let envvar = void 0;
   let networkConfig = void 0;
   const envFileOpt = opts.envFile;
-  const presetName = opts.preset;
+  const presetNames = normalizePresetNames2(opts.preset);
   let envFileDir = dir;
   let suiteEnvConfig;
   try {
@@ -84656,7 +84902,7 @@ async function buildCliRunArgs(file, opts) {
     envFileDir = import_path2.default.dirname(p);
     const doc = await loadEnvDoc(p, findProjectRootForCli(p) || void 0);
     const defaultEnv = resolveDefaultEnvVariables(doc.variables);
-    const presetEnv = resolvePresetEnv2(doc, presetName);
+    const presetEnv = resolvePresetsEnv2(doc, presetNames);
     envvar = mergeEnv2({ baseEnv: defaultEnv, envvar: presetEnv, manualEnvvars });
     if (doc.certificates || doc.setting) {
       networkConfig = buildNetworkConfigFromEnv(
@@ -84685,7 +84931,7 @@ async function buildCliRunArgs(file, opts) {
       }
       if (suiteEnvFilePath && import_fs2.default.existsSync(suiteEnvFilePath)) {
         const suiteEnvDoc = await loadEnvDoc(suiteEnvFilePath, projectRoot || void 0);
-        suitePresetEnv = resolvePresetEnv2(suiteEnvDoc, suiteEnvConfig.preset);
+        suitePresetEnv = resolvePresetsEnv2(suiteEnvDoc, suiteEnvConfig.preset);
       }
     }
     const baseEnv = { ...envvar || {} };
@@ -84772,6 +85018,16 @@ function resolveCliVersion() {
   return "0.0.0";
 }
 var CLI_VERSION = resolveCliVersion();
+function collectPreset(value, previous) {
+  const names = [];
+  for (const part of String(value).split(",")) {
+    const name = part.trim();
+    if (name) {
+      names.push(name);
+    }
+  }
+  return previous.concat(names.length ? names : [value]);
+}
 var jsRunnerModulePromise;
 async function loadJsRunnerModule() {
   if (!jsRunnerModulePromise) {
@@ -84955,23 +85211,23 @@ program.name("testlight").description("Multimeter CLI \u2014 run .mmt API tests,
     "  -o, --out <file>           Write result JSON to file",
     "  -i, --input <k=v...>       Input variables (repeatable)",
     "  -e, --env <k=v...>         Environment variables (repeatable)",
-    "  --env-file <path>          Environment file (.mmt/.yaml)",
-    "  --preset <name>            Preset from env file (e.g. runner.dev)",
-    "  --example <name|#n>        Named example or index (#1 is first)",
+    "  -F, --env-file <path>      Environment file (.mmt/.yaml)",
+    "  -P, --preset <name>        Preset from env file (repeatable)",
+    "  -x, --example <name|#n>    Named example or index (#1 is first)",
     "  -p, --print-js             Print generated JS before executing",
-    "  --report <format>          junit | mmt | html | md | md-detailed",
-    "  --report-file <path>       Report output path",
+    "  -r, --report <format>      junit | mmt | html | md | md-detailed",
+    "  -R, --report-file <path>   Report output path",
     "",
     "Examples:",
     "  testlight run path/to/test.mmt",
-    "  testlight run path/to/test.mmt -e api_url=https://test.mmt.dev -q",
+    "  testlight run path/to/test.mmt -F env.mmt -P runner.dev -P custom.prod",
     "  testlight run path/to/suite.mmt --report html",
     "",
     "Run `testlight <command> --help` for command-specific options."
   ].join("\n")
 );
 program.option(
-  "--log-level <level>",
+  "-L, --log-level <level>",
   "Set log level (error|warn|info|debug|trace)",
   "info"
 );
@@ -84982,19 +85238,21 @@ program.command("run").description("Run a .mmt file").argument("<file>", "Test f
   "-e, --env <values...>",
   "Environment variables as key value pairs or key=val (repeatable)"
 ).option(
-  "--env-file <path>",
+  "-F, --env-file <path>",
   "Environment file (.mmt/.yaml) to read variables from"
 ).option(
-  "--preset <name>",
-  "Preset name from env file (e.g., runner.dev) or just name under runner"
+  "-P, --preset <name>",
+  "Preset from env file (repeatable; e.g. runner.dev or group.name)",
+  collectPreset,
+  []
 ).option(
-  "--example <name|#n>",
+  "-x, --example <name|#n>",
   "Run a named example (matches name) or numeric index (#1 = first)"
 ).option("-p, --print-js", "Print generated JS before executing", false).option(
-  "--report <format>",
+  "-r, --report <format>",
   "Generate test report: junit, mmt, html, md, or md-detailed"
 ).option(
-  "--report-file <path>",
+  "-R, --report-file <path>",
   "Output path for the report file (default depends on format)"
 ).option(
   "--no-real-threads",
@@ -85178,13 +85436,15 @@ program.command("print-js").argument("<file>", "Test file (.yaml/.yml/.json/.mmt
   "-e, --env <values...>",
   "Environment variables as key value pairs or key=val (repeatable)"
 ).option(
-  "--env-file <path>",
+  "-F, --env-file <path>",
   "Environment file (.mmt/.yaml) to read variables from"
 ).option(
-  "--preset <name>",
-  "Preset name from env file (e.g., runner.dev) or just name under runner"
+  "-P, --preset <name>",
+  "Preset from env file (repeatable; e.g. runner.dev or group.name)",
+  collectPreset,
+  []
 ).option(
-  "--example <name|#n>",
+  "-x, --example <name|#n>",
   "Select a named example (matches name) or numeric index (#1 = first)"
 ).action(async (file, opts) => {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mmt-testlight",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Multimeter CLI test runner",
   "private": false,
   "bin": {

package/src/cli.ts

@@ -35,6 +35,17 @@ function resolveCliVersion(): string {
 }
 const CLI_VERSION = resolveCliVersion();
 
+function collectPreset(value: string, previous: string[]): string[] {
+  const names: string[] = [];
+  for (const part of String(value).split(',')) {
+    const name = part.trim();
+    if (name) {
+      names.push(name);
+    }
+  }
+  return previous.concat(names.length ? names : [value]);
+}
+
 type JsRunnerModule = typeof import('mmt-core/jsRunner');
 let jsRunnerModulePromise: Promise<JsRunnerModule>|undefined;
 
@@ -247,23 +258,23 @@ program.name('testlight')
           '  -o, --out <file>           Write result JSON to file',
           '  -i, --input <k=v...>       Input variables (repeatable)',
           '  -e, --env <k=v...>         Environment variables (repeatable)',
-          '  --env-file <path>          Environment file (.mmt/.yaml)',
-          '  --preset <name>            Preset from env file (e.g. runner.dev)',
-          '  --example <name|#n>        Named example or index (#1 is first)',
+          '  -F, --env-file <path>      Environment file (.mmt/.yaml)',
+          '  -P, --preset <name>        Preset from env file (repeatable)',
+          '  -x, --example <name|#n>    Named example or index (#1 is first)',
           '  -p, --print-js             Print generated JS before executing',
-          '  --report <format>          junit | mmt | html | md | md-detailed',
-          '  --report-file <path>       Report output path',
+          '  -r, --report <format>      junit | mmt | html | md | md-detailed',
+          '  -R, --report-file <path>   Report output path',
           '',
           'Examples:',
           '  testlight run path/to/test.mmt',
-          '  testlight run path/to/test.mmt -e api_url=https://test.mmt.dev -q',
+          '  testlight run path/to/test.mmt -F env.mmt -P runner.dev -P custom.prod',
           '  testlight run path/to/suite.mmt --report html',
           '',
           'Run `testlight <command> --help` for command-specific options.',
         ].join('\n'));
 
 program.option(
-  '--log-level <level>',
+  '-L, --log-level <level>',
   'Set log level (error|warn|info|debug|trace)',
   'info');
 
@@ -279,20 +290,22 @@ program.command('run')
         '-e, --env <values...>',
         'Environment variables as key value pairs or key=val (repeatable)')
     .option(
-        '--env-file <path>',
+        '-F, --env-file <path>',
         'Environment file (.mmt/.yaml) to read variables from')
     .option(
-        '--preset <name>',
-        'Preset name from env file (e.g., runner.dev) or just name under runner')
+        '-P, --preset <name>',
+        'Preset from env file (repeatable; e.g. runner.dev or group.name)',
+        collectPreset,
+        [])
     .option(
-      '--example <name|#n>',
+      '-x, --example <name|#n>',
       'Run a named example (matches name) or numeric index (#1 = first)')
     .option('-p, --print-js', 'Print generated JS before executing', false)
     .option(
-      '--report <format>',
+      '-r, --report <format>',
       'Generate test report: junit, mmt, html, md, or md-detailed')
     .option(
-      '--report-file <path>',
+      '-R, --report-file <path>',
       'Output path for the report file (default depends on format)')
     .option(
       '--no-real-threads',
@@ -498,13 +511,15 @@ program.command('print-js')
         '-e, --env <values...>',
         'Environment variables as key value pairs or key=val (repeatable)')
     .option(
-        '--env-file <path>',
+        '-F, --env-file <path>',
         'Environment file (.mmt/.yaml) to read variables from')
     .option(
-        '--preset <name>',
-        'Preset name from env file (e.g., runner.dev) or just name under runner')
+        '-P, --preset <name>',
+        'Preset from env file (repeatable; e.g. runner.dev or group.name)',
+        collectPreset,
+        [])
     .option(
-      '--example <name|#n>',
+      '-x, --example <name|#n>',
       'Select a named example (matches name) or numeric index (#1 = first)')
     .action(async (file: string, opts: {stages?: boolean}) => {
       try {

package/src/pkg-entry.cjs

@@ -165,7 +165,7 @@ function createPkgJsRunner() {
 					'__checkLogMode',
 					`${helperDecls}\n${randomDecls}\n` +
 					`const report_ = (...args) => mmtHelper.reportWithContext_ ? mmtHelper.reportWithContext_(__reporter, __runId, __id, ...args) : undefined;\n` +
-					`const setenv_ = (name, value) => { try { envVariables[name] = value; } catch (_e) {} if (mmtHelper.setenvWithContext_) mmtHelper.setenvWithContext_(__reporter, __runId, __id, name, value); };\n` +
+					`const setenv_ = (vars) => { if (vars && typeof vars === 'object') { for (const [k, v] of Object.entries(vars)) { try { envVariables[k] = v; } catch (_e) {} } } if (mmtHelper.setenvWithContext_) mmtHelper.setenvWithContext_(__reporter, __runId, __id, vars); };\n` +
 					`const check_ = (passed, type, raw, reportLevel, title, details, actual, expected) => mmtHelper.check_(passed, type, raw, reportLevel, title, details, actual, expected, report_, console, __checkLogMode);\n` +
 					`const checkExpects_ = (items, type, reportLevel, title, details) => mmtHelper.checkExpects_ ? mmtHelper.checkExpects_(items, type, reportLevel, title, details, report_, console, __checkLogMode) : undefined;\n` +
 					`const checkAbort_ = () => { if (__abortSignal && __abortSignal.aborted) { const e = new Error('Test run was stopped'); e.name = 'TestAbortError'; throw e; } };\n` +
@@ -522,16 +522,16 @@ function printHelp() {
 	const options = formatHelpRows([
 		['-h, --help', 'Show help'],
 		['-v, --version', 'Show version'],
-		['--log-level <level>', 'Set log level (error|warn|info|debug|trace)'],
+		['-L, --log-level <level>', 'Set log level (error|warn|info|debug|trace)'],
 	]);
 	const runOptions = formatHelpRows([
 		['-q, --quiet', 'Minimal output'],
 		['-o, --out <file>', 'Write result JSON to file'],
 		['-i, --input <k=v...>', 'Input variables (repeatable)'],
 		['-e, --env <k=v...>', 'Environment variables (repeatable)'],
-		['--env-file <path>', 'Environment file (.mmt/.yaml)'],
-		['--preset <name>', 'Preset from env file (e.g. runner.dev)'],
-		['--example <name|#n>', 'Named example or index (#1 is first)'],
+		['-F, --env-file <path>', 'Environment file (.mmt/.yaml)'],
+		['-P, --preset <name>', 'Preset from env file (repeatable)'],
+		['-x, --example <name|#n>', 'Named example or index (#1 is first)'],
 		['--print-js', 'Print generated JS before executing'],
 		['--debug-env', 'Print resolved env vars'],
 	]);
@@ -567,12 +567,12 @@ function printRunHelp() {
 		['-o, --out <file>', 'Write result JSON to file'],
 		['-i, --input <k=v...>', 'Input variables (repeatable)'],
 		['-e, --env <k=v...>', 'Environment variables (repeatable)'],
-		['--env-file <path>', 'Environment file (.mmt/.yaml)'],
-		['--preset <name>', 'Preset from env file (e.g. runner.dev)'],
-		['--example <name|#n>', 'Named example or index (#1 is first)'],
+		['-F, --env-file <path>', 'Environment file (.mmt/.yaml)'],
+		['-P, --preset <name>', 'Preset from env file (repeatable)'],
+		['-x, --example <name|#n>', 'Named example or index (#1 is first)'],
 		['--print-js', 'Print generated JS before executing'],
 		['--debug-env', 'Print resolved env vars'],
-		['--log-level <level>', 'Set log level (error|warn|info|debug|trace)'],
+		['-L, --log-level <level>', 'Set log level (error|warn|info|debug|trace)'],
 	]);
 	const examples = formatHelpRows([
 		['testlight run path/to/test.mmt'],
@@ -598,9 +598,9 @@ function printPrintJsHelp() {
 		['-h, --help', 'Show help'],
 		['-i, --input <k=v...>', 'Input variables (repeatable)'],
 		['-e, --env <k=v...>', 'Environment variables (repeatable)'],
-		['--env-file <path>', 'Environment file (.mmt/.yaml)'],
-		['--preset <name>', 'Preset from env file (e.g. runner.dev)'],
-		['--example <name|#n>', 'Named example or index (#1 is first)'],
+		['-F, --env-file <path>', 'Environment file (.mmt/.yaml)'],
+		['-P, --preset <name>', 'Preset from env file (repeatable)'],
+		['-x, --example <name|#n>', 'Named example or index (#1 is first)'],
 	]);
 	const out = [
 		'Usage: testlight print-js [options] <file>',
@@ -653,6 +653,39 @@ function parsePairs(tokens) {
 	return out;
 }
 
+function pushPresetOpt(opts, value) {
+	if (!Array.isArray(opts.preset)) {
+		opts.preset = opts.preset ? [opts.preset] : [];
+	}
+	if (value == null) {
+		return;
+	}
+	for (const part of String(value).split(',')) {
+		const name = part.trim();
+		if (name) {
+			opts.preset.push(name);
+		}
+	}
+}
+
+function resolvePresetsFromDoc(runConfig, doc, presetNames) {
+	if (!runConfig || !doc) {
+		return {};
+	}
+	if (typeof runConfig.resolvePresetsEnv === 'function') {
+		return runConfig.resolvePresetsEnv(doc, presetNames) || {};
+	}
+	const list = Array.isArray(presetNames) ? presetNames :
+		(presetNames ? [presetNames] : []);
+	let out = {};
+	if (typeof runConfig.resolvePresetEnv === 'function') {
+		for (const name of list) {
+			Object.assign(out, runConfig.resolvePresetEnv(doc, name) || {});
+		}
+	}
+	return out;
+}
+
 function loadEnvDoc(envPath) {
 	try {
 		// eslint-disable-next-line global-require
@@ -690,7 +723,7 @@ function parseRunArgv(argv) {
 		input: [],
 		env: [],
 		envFile: undefined,
-		preset: undefined,
+		preset: [],
 		example: undefined,
 		printJs: false,
 		debugEnv: false,
@@ -711,7 +744,7 @@ function parseRunArgv(argv) {
 		if (a === '-h' || a === '--help') {
 			continue;
 		}
-		if (a === '--log-level') {
+		if (a === '--log-level' || a === '-L') {
 			consume(i + 1);
 			i += 1;
 			continue;
@@ -758,17 +791,17 @@ function parseRunArgv(argv) {
 			}
 			continue;
 		}
-		if (a === '--env-file') {
+		if (a === '--env-file' || a === '-F') {
 			consume(i + 1);
 			opts.envFile = argv[++i];
 			continue;
 		}
-		if (a === '--preset') {
+		if (a === '--preset' || a === '-P') {
 			consume(i + 1);
-			opts.preset = argv[++i];
+			pushPresetOpt(opts, argv[++i]);
 			continue;
 		}
-		if (a === '--example') {
+		if (a === '--example' || a === '-x') {
 			consume(i + 1);
 			opts.example = argv[++i];
 			continue;
@@ -802,7 +835,7 @@ function parsePrintJsArgv(argv) {
 		input: [],
 		env: [],
 		envFile: undefined,
-		preset: undefined,
+		preset: [],
 		example: undefined,
 	};
 	let filePath;
@@ -834,15 +867,15 @@ function parsePrintJsArgv(argv) {
 			}
 			continue;
 		}
-		if (a === '--env-file') {
+		if (a === '--env-file' || a === '-F') {
 			opts.envFile = argv[++i];
 			continue;
 		}
-		if (a === '--preset') {
-			opts.preset = argv[++i];
+		if (a === '--preset' || a === '-P') {
+			pushPresetOpt(opts, argv[++i]);
 			continue;
 		}
-		if (a === '--example') {
+		if (a === '--example' || a === '-x') {
 			opts.example = argv[++i];
 			continue;
 		}
@@ -857,17 +890,19 @@ function parsePrintJsArgv(argv) {
 }
 
 function parseLogLevel(argv) {
-	const idx = argv.indexOf('--log-level');
-	if (idx < 0) {
-		return 'info';
-	}
-	const v = argv[idx + 1];
-	if (!v) {
-		return 'info';
-	}
-	const level = String(v).toLowerCase();
-	if (['error', 'warn', 'info', 'debug', 'trace'].includes(level)) {
-		return level;
+	for (let i = 1; i < argv.length; i++) {
+		const a = argv[i];
+		if (a === '--log-level' || a === '-L') {
+			const v = argv[i + 1];
+			if (!v) {
+				return 'info';
+			}
+			const level = String(v).toLowerCase();
+			if (['error', 'warn', 'info', 'debug', 'trace'].includes(level)) {
+				return level;
+			}
+			return 'info';
+		}
 	}
 	return 'info';
 }
@@ -1023,9 +1058,8 @@ async function main() {
 				const doc = loadEnvDoc(p);
 				// Defaults come from env file variables; optional preset overlays them.
 				let baseEnv = (doc && doc.variables) ? {...doc.variables} : {};
-				if (parsed.opts.preset && runConfig &&
-						typeof runConfig.resolvePresetEnv === 'function') {
-					const presetEnv = runConfig.resolvePresetEnv(doc, parsed.opts.preset) || {};
+				if (parsed.opts.preset.length && runConfig) {
+					const presetEnv = resolvePresetsFromDoc(runConfig, doc, parsed.opts.preset);
 					baseEnv = {...baseEnv, ...presetEnv};
 				}
 				envvar = runConfig.mergeEnv({ envvar: baseEnv, manualEnvvars });
@@ -1033,7 +1067,7 @@ async function main() {
 					try {
 						process.stdout.write(`debug envFile raw: ${envFileRaw}\n`);
 						process.stdout.write(`debug envFile resolved: ${p}\n`);
-						process.stdout.write(`debug preset: ${parsed.opts.preset || '(none)'}\n`);
+						process.stdout.write(`debug preset: ${parsed.opts.preset.length ? parsed.opts.preset.join(',') : '(none)'}\n`);
 						process.stdout.write(`debug envDoc variables keys: ${doc && doc.variables ? Object.keys(doc.variables).join(',') : '(none)'}\n`);
 						process.stdout.write(`debug envDoc presets keys: ${doc && doc.presets ? Object.keys(doc.presets).join(',') : '(none)'}\n`);
 						process.stdout.write(`debug baseEnv keys: ${baseEnv ? Object.keys(baseEnv).join(',') : '(none)'}\n`);
@@ -1123,8 +1157,9 @@ async function main() {
 								envFileForPreset = loadEnvDoc(p);
 							}
 						}
-						if (envFileForPreset && coreRunConfig.resolvePresetEnv) {
-							suitePresetEnv = coreRunConfig.resolvePresetEnv(envFileForPreset, suiteEnv.preset) || {};
+						if (envFileForPreset && coreRunConfig) {
+							suitePresetEnv = resolvePresetsFromDoc(
+								coreRunConfig, envFileForPreset, suiteEnv.preset) || {};
 						}
 					}
 

package/src/runArgs.ts

@@ -18,7 +18,7 @@ const {resolveUserPath, resolveUserPathPreferExisting} = requireFromRunArgs('../
 
 export type ReportFormat = 'junit' | 'mmt' | 'html' | 'md' | 'md-detailed';
 
-const {mergeEnv, resolvePresetEnv} =
+const {mergeEnv, resolvePresetsEnv, normalizePresetNames} =
     ((mmtcore as any).runConfig || {}) as any;
 const OMIT_SENTINEL =
     ((mmtcore as any).omitKeyword || {}).OMIT_SENTINEL || '__MMT_OMIT__';
@@ -347,7 +347,7 @@ export async function buildCliRunArgs(file: string, opts: AnyOpts): Promise<Pars
   let envvar: Record<string, any>|undefined = undefined;
   let networkConfig: NetworkConfig|undefined = undefined;
   const envFileOpt = opts.envFile as string | undefined;
-  const presetName = opts.preset as string | undefined;
+  const presetNames = normalizePresetNames(opts.preset as string | string[] | undefined);
   let envFileDir = dir;
 
   // Detect if this is a suite file and check for suite environment config
@@ -368,7 +368,7 @@ export async function buildCliRunArgs(file: string, opts: AnyOpts): Promise<Pars
     envFileDir = path.dirname(p);
     const doc = await loadEnvDoc(p, findProjectRootForCli(p) || undefined);
     const defaultEnv = resolveDefaultEnvVariables(doc.variables);
-    const presetEnv = resolvePresetEnv(doc, presetName);
+    const presetEnv = resolvePresetsEnv(doc, presetNames);
     envvar = mergeEnv({baseEnv: defaultEnv, envvar: presetEnv, manualEnvvars});
     // Build network config from file-driven HTTP settings and certificates.
     if (doc.certificates || doc.setting) {
@@ -403,7 +403,7 @@ export async function buildCliRunArgs(file: string, opts: AnyOpts): Promise<Pars
       if (suiteEnvFilePath && fs.existsSync(suiteEnvFilePath)) {
         const suiteEnvDoc =
             await loadEnvDoc(suiteEnvFilePath, projectRoot || undefined);
-        suitePresetEnv = resolvePresetEnv(suiteEnvDoc, suiteEnvConfig.preset);
+        suitePresetEnv = resolvePresetsEnv(suiteEnvDoc, suiteEnvConfig.preset);
       }
     }