mmt-testlight 0.4.3 → 0.4.5

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);
       }
     }
 

package/src/selfUpdate.test.ts

@@ -0,0 +1,79 @@
+import {
+  buildDownloadUrl,
+  compareVersions,
+  detectInstallChannel,
+  detectPlatform,
+  normalizeVersion,
+  planUpdate,
+} from './selfUpdate';
+
+describe('selfUpdate helpers', () => {
+  it('normalizes and compares versions', () => {
+    expect(normalizeVersion('v1.2.3')).toBe('1.2.3');
+    expect(compareVersions('1.2.3', '1.2.3')).toBe(0);
+    expect(compareVersions('1.2.3', '1.2.4')).toBe(-1);
+    expect(compareVersions('1.3.0', '1.2.9')).toBe(1);
+    expect(compareVersions('1.2.3-beta.1', '1.2.3')).toBe(-1);
+  });
+
+  it('detects platforms', () => {
+    expect(detectPlatform('darwin', 'arm64')).toBe('macos-arm64');
+    expect(detectPlatform('linux', 'x64')).toBe('linux-x64');
+    expect(detectPlatform('win32', 'arm64')).toBe('win-x64');
+  });
+
+  it('detects install channels', () => {
+    expect(detectInstallChannel('/usr/local/bin/testlight')).toBe('standalone');
+    expect(detectInstallChannel(
+               '/opt/homebrew/Cellar/mmt-testlight/0.4.4/bin/testlight'))
+        .toBe('homebrew');
+    expect(detectInstallChannel(
+               '/usr/local/bin/node',
+               '/usr/local/lib/node_modules/mmt-testlight/dist/cli.js'))
+        .toBe('npm');
+  });
+
+  it('builds github and portal download urls', () => {
+    expect(buildDownloadUrl({version: '1.2.3', platform: 'linux-x64'}))
+        .toBe(
+            'https://github.com/mshobeyri/multimeter/releases/download/v1.2.3/testlight-linux-x64.tar.gz');
+    expect(buildDownloadUrl({
+      version: '1.2.3',
+      platform: 'win-x64',
+      releaseBaseUrl: 'https://portal.example/testlight',
+    })).toBe('https://portal.example/testlight/v1.2.3/testlight-win-x64.zip');
+  });
+
+  it('plans npm advice instead of binary replace', async () => {
+    const plan = await planUpdate({
+      currentVersion: '0.4.0',
+      version: '0.4.4',
+      execPath: '/usr/local/bin/node',
+      scriptPath: '/usr/local/lib/node_modules/mmt-testlight/dist/cli.js',
+      fetchJson: async () => ({tag_name: 'v0.4.4'}),
+    });
+    expect(plan.action).toBe('advise-npm');
+    expect(plan.advice).toContain('npm install -g mmt-testlight@0.4.4');
+  });
+
+  it('plans noop when already current', async () => {
+    const plan = await planUpdate({
+      currentVersion: '1.2.3',
+      version: '1.2.3',
+      execPath: '/usr/local/bin/testlight',
+      fetchJson: async () => ({tag_name: 'v1.2.3'}),
+    });
+    expect(plan.action).toBe('noop');
+  });
+
+  it('plans download for standalone when newer', async () => {
+    const plan = await planUpdate({
+      currentVersion: '1.0.0',
+      version: '1.2.3',
+      execPath: '/opt/portal/bin/testlight',
+      fetchJson: async () => ({tag_name: 'v1.2.3'}),
+    });
+    expect(plan.action).toBe('download');
+    expect(plan.downloadUrl).toContain('/v1.2.3/testlight-');
+  });
+});