feat(parse): return requires boolean;

- whether or not `--require` defined

Author: lukeed

bin.js

@@ -20,12 +20,12 @@ sade('uvu [dir] [pattern]')
 	.action(async (dir, pattern, opts) => {
 		try {
 			if (opts.color) process.env.FORCE_COLOR = '1';
-			let { suites } = await parse(dir, pattern, opts);
+			let ctx = await parse(dir, pattern, opts);
 
-			if (hasImport) {
-				await dimport('uvu/run').then(m => m.run(suites, opts));
+			if (!ctx.requires && hasImport) {
+				await dimport('uvu/run').then(m => m.run(ctx.suites, opts));
 			} else {
-				await require('uvu/run').run(suites, opts);
+				await require('uvu/run').run(ctx.suites, opts);
 			}
 		} catch (err) {
 			console.error(err.stack || err.message);

src/parse.d.ts

@@ -16,6 +16,7 @@ export interface Options {
 export interface Argv {
 	dir: string;
 	suites: Suite[];
+	requires: boolean;
 }
 
 export function parse(dir?: string, pattern?: string|RegExp, opts?: Partial<Options>): Promise<Argv>;

src/parse.js

@@ -14,16 +14,17 @@ export async function parse(dir, pattern, opts = {}) {
 	else pattern = /((\/|^)(tests?|__tests?__)\/.*|\.(tests?|spec)|^\/?tests?)\.([mc]js|[jt]sx?)$/i;
 	dir = resolve(opts.cwd || '.', dir || '.');
 
-	[].concat(opts.require || []).filter(Boolean).forEach(name => {
+	let suites = [];
+	let requires = [].concat(opts.require || []).filter(Boolean);
+	let ignores = ['node_modules'].concat(opts.ignore || []).map(toRegex);
+
+	requires.forEach(name => {
 		let tmp = exists(name);
 		if (tmp) return require(tmp);
 		if (tmp = exists(resolve(name))) return require(tmp);
 		throw new Error(`Cannot find module '${name}'`);
 	});
 
-	let suites = [];
-	let ignores = ['node_modules'].concat(opts.ignore || []).map(toRegex);
-
 	await totalist(dir, (rel, abs) => {
 		if (pattern.test(rel) && !ignores.some(x => x.test(rel))) {
 			suites.push({ name: rel, file: abs });
@@ -32,5 +33,5 @@ export async function parse(dir, pattern, opts = {}) {
 
 	suites.sort((a, b) => a.name.localeCompare(b.name));
 
-	return { dir, suites };
+	return { dir, suites, requires: requires.length > 0 };
 }

test/parse.js

@@ -18,6 +18,7 @@ parse('should rely on defaults', async () => {
 
 	assert.type(output, 'object');
 	assert.is(output.dir, __dirname);
+	assert.is(output.requires, false);
 
 	assert.instance(output.suites, Array);
 	assert.is(output.suites.length, FILES.length);
@@ -40,6 +41,7 @@ dir('should accept relative `dir` input', async () => {
 
 	assert.type(output, 'object');
 	assert.is(output.dir, __dirname);
+	assert.is(output.requires, false);
 
 	assert.instance(output.suites, Array);
 	assert.is(output.suites.length, FILES.length);
@@ -134,4 +136,9 @@ requires('should throw on invalid value(s)', async () => {
 	}
 });
 
+requires('should `require` valid value(s)', async () => {
+	let foo = await $.parse(__dirname, '', { require: ['esm'] });
+	assert.is(foo.requires, true);
+});
+
 requires.run();