fix(parse): support native ESM mode;

- do not build `uvu/parse` from source since it needs different contents, like uvu/run
- rely on `require` directly for loading file paths (revert 4cedf40)

Author: lukeed

.gitignore

@@ -8,5 +8,4 @@ node_modules
 
 /dist
 /assert
-/parse
 /diff

package.json

@@ -48,7 +48,6 @@
   ],
   "modes": {
     "diff": "src/diff.js",
-    "parse": "src/parse.js",
     "assert": "src/assert.js",
     "default": "src/index.js"
   },

src/parse.d.ts parse/index.d.ts

@@ -0,0 +1,50 @@
+// @ts-check
+const { readdir, stat } = require('fs');
+const { resolve, join } = require('path');
+const { promisify } = require('util');
+
+const ls = promisify(readdir);
+const toStat = promisify(stat);
+const toRegex = x => new RegExp(x, 'i');
+
+async function parse(dir, pattern, opts = {}) {
+	if (pattern) pattern = toRegex(pattern);
+	else if (dir) pattern = /(((?:[^\/]*(?:\/|$))*)[\\\/])?\w+\.([mc]js|[jt]sx?)$/;
+	else pattern = /((\/|^)(tests?|__tests?__)\/.*|\.(tests?|spec)|^\/?tests?)\.([mc]js|[jt]sx?)$/i;
+	dir = resolve(opts.cwd || '.', dir || '.');
+
+	let suites = [];
+	let requires = [].concat(opts.require || []).filter(Boolean);
+	let ignores = ['^.git', 'node_modules'].concat(opts.ignore || []).map(toRegex);
+
+	requires.forEach(name => {
+		try { return require(name) }
+		catch (e) { throw new Error(`Cannot find module "${name}"`) }
+	});
+
+	// NOTE: Node 8.x support
+	// @modified lukeed/totalist
+	await (async function collect(d, p) {
+		await ls(d).then(files => {
+			return Promise.all(
+				files.map(async str => {
+					let name = join(p, str);
+					for (let i = ignores.length; i--;) {
+						if (ignores[i].test(name)) return;
+					}
+
+					let file = join(d, str);
+					let stats = await toStat(file);
+					if (stats.isDirectory()) return collect(file, name);
+					else if (pattern.test(name)) suites.push({ name, file });
+				})
+			);
+		});
+	})(dir, '');
+
+	suites.sort((a, b) => a.name.localeCompare(b.name));
+
+	return { dir, suites, requires: requires.length > 0 };
+}
+
+exports.parse = parse;

parse/index.js

@@ -1,17 +1,12 @@
-import { readdir, stat, existsSync } from 'fs';
+import { readdir, stat } from 'fs';
+import { createRequire } from 'module';
 import { resolve, join } from 'path';
 import { promisify } from 'util';
 
 const ls = promisify(readdir);
 const toStat = promisify(stat);
 const toRegex = x => new RegExp(x, 'i');
 
-function exists(dep) {
-	if (existsSync(dep)) return dep;
-	try { return require.resolve(dep) }
-	catch (err) { return false }
-}
-
 export async function parse(dir, pattern, opts = {}) {
 	if (pattern) pattern = toRegex(pattern);
 	else if (dir) pattern = /(((?:[^\/]*(?:\/|$))*)[\\\/])?\w+\.([mc]js|[jt]sx?)$/;
@@ -22,12 +17,13 @@ export async function parse(dir, pattern, opts = {}) {
 	let requires = [].concat(opts.require || []).filter(Boolean);
 	let ignores = ['^.git', '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}'`);
-	});
+	if (requires.length) {
+		let $require = createRequire(import.meta.url);
+		requires.forEach(name => {
+			try { return $require(name) }
+			catch (e) { throw new Error(`Cannot find module "${name}"`) }
+		});
+	}
 
 	// NOTE: Node 8.x support
 	// @modified lukeed/totalist

src/parse.js parse/index.mjs

@@ -2,7 +2,7 @@ import { suite } from 'uvu';
 import { readdirSync } from 'fs';
 import { isAbsolute } from 'path';
 import * as assert from 'uvu/assert';
-import * as $ from '../src/parse';
+import * as $ from '../parse';
 
 const FILES = readdirSync(__dirname);
 
@@ -132,7 +132,7 @@ requires('should throw on invalid value(s)', async () => {
 		assert.unreachable('should have thrown');
 	} catch (err) {
 		assert.instance(err, Error);
-		assert.match(err.message, `Cannot find module 'foobar'`);
+		assert.match(err.message, `Cannot find module "foobar"`);
 	}
 });