feat: Migrate node-auth to ESM

.gitignore

@@ -3,7 +3,6 @@ node_modules/
 package-lock.json
 
 coverage/
-.nyc_output
 *.log
 *.swo
 *.swp

bin/set-dependencies.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 
-'use strict';
+import fs from 'fs';
+import path from 'path';
+import { isBuiltin } from 'node:module';
+import { fileURLToPath } from 'url';
 
-const fs = require('fs');
-const path = require('path');
-const { isBuiltin } = require('node:module');
-
-const findRequires = require('find-requires');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const topPkgDir = path.resolve(__dirname, '..');
 const topPkg = JSON.parse(fs.readFileSync(path.join(topPkgDir, 'package.json'), 'utf8'));
@@ -15,44 +15,64 @@ const definedDependencies = Object.keys(topPkg.dependencies);
 const pkgsDir = path.join(topPkgDir, 'packages/node_modules');
 const pkgNames = fs.readdirSync(pkgsDir);
 
+/**
+ * Recursively find all .js files in a directory
+ */
+function findJsFiles(dir) {
+	const results = [];
+	for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+		const fullPath = path.join(dir, entry.name);
+		if (entry.isDirectory() && entry.name !== 'node_modules' && entry.name !== 'test' && entry.name !== 'spec') {
+			results.push(...findJsFiles(fullPath));
+		} else if (entry.isFile() && entry.name.endsWith('.js')) {
+			results.push(fullPath);
+		}
+	}
+	return results;
+}
+
+/**
+ * Extract import specifiers from ESM source code using regex.
+ * Handles: import X from 'pkg', import { X } from 'pkg', import 'pkg'
+ */
+function findImports(source) {
+	const imports = [];
+	// Match static import statements
+	const importRegex = /import\s+(?:[\s\S]*?\s+from\s+)?['"]([^'"]+)['"]/g;
+	let match;
+	while ((match = importRegex.exec(source)) !== null) {
+		imports.push(match[1]);
+	}
+	// Match dynamic imports
+	const dynamicRegex = /import\s*\(\s*['"]([^'"]+)['"]\s*\)/g;
+	while ((match = dynamicRegex.exec(source)) !== null) {
+		imports.push(match[1]);
+	}
+	return imports;
+}
+
 for (const pkgName of pkgNames) {
 	const pkgDir = path.join(pkgsDir, pkgName);
 	const pkgPath = path.join(pkgDir, 'package.json');
 	const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
 
-	const main = pkg.main || 'index.js';
-	const mainPath = path.join(pkgDir, main);
-
 	/**
-	 * Dependency Detection
-	 *
-	 * Caveats:
-	 *
-	 * 1. Assumes library is requirable without side-effects, which it should be
-	 * 2. Doesn't allow for coniditional requires or anything in that realm
-	 * 3. Assumes single entry-point
-	 *
-	 * Benefits:
-	 *
-	 * 1. Doesn't assume location of script files?
-	 *
-	 * A better approach might be to look at "files" in package.json
-	 */
-	for (const key of Object.keys(require.cache)) {
-		delete require.cache[key];
+ * Dependency Detection
+ *
+ * Scans all source .js files for import statements and extracts
+ * package names from the import specifiers.
+ */
+	const jsFiles = findJsFiles(pkgDir);
+	const allImports = [];
+	for (const file of jsFiles) {
+		const source = fs.readFileSync(file, 'utf8');
+		allImports.push(...findImports(source));
 	}
-	require(mainPath);
-
-	const modulesInPackage = Object
-		.keys(require.cache)
-		.filter(id => id.startsWith(pkgDir + '/'));
-	const requiresInPackage = Array.prototype.concat.apply(
-		[],
-		modulesInPackage.map(m => findRequires(fs.readFileSync(m, 'utf8')))
-	);
+
 	const packageRequires = Array.from(new Set(
-		requiresInPackage
+		allImports
 			.filter(id => id[0] !== '.' && id[0] !== '/')
+			.filter(id => !id.startsWith('node:'))
 			.map(id => {
 				let slash = id.indexOf('/');
 				if (slash === -1) {

bin/set-meta.js

@@ -1,9 +1,11 @@
 #!/usr/bin/env node
 
-'use strict';
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const fs = require('fs');
-const path = require('path');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const COMMON_META = [
 	'author',

bin/set-version.js

@@ -1,9 +1,11 @@
 #!/usr/bin/env node
 
-'use strict';
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const fs = require('fs');
-const path = require('path');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const version = process.argv[process.argv.length - 1];
 

bin/test-all.sh

@@ -6,30 +6,28 @@ source "$(dirname ${BASH_SOURCE[0]})/helpers.sh"
 
 TOP_DIR=$(pwd)
 
-rm -r .nyc_output 2>/dev/null || :
+rm -rf coverage 2>/dev/null || :
+mkdir -p coverage/tmp
 
 EXIT_CODE=0
 
 for package in $(get_packages); do
-	cd "${package}"
-
-	set +e
-	npm test
-	EXIT_CODE+=$?
-	set -e
-
-	cd "${TOP_DIR}"
-	if [ -d "${package}/.nyc_output" ]; then
-		./node_modules/.bin/nyc \
-			merge \
-			"${package}/.nyc_output" \
-			".nyc_output/$(basename "${package}").json"
-	fi
+cd "${package}"
+
+set +e
+npm test
+EXIT_CODE+=$?
+set -e
+
+cd "${TOP_DIR}"
+if [ -d "${package}/coverage/tmp" ]; then
+cp "${package}"/coverage/tmp/*.json coverage/tmp/ 2>/dev/null || :
+fi
 done
 
-./node_modules/.bin/nyc report \
-	--exclude-node-modules false \
-	--reporter text \
-	--reporter lcov
+./node_modules/.bin/c8 report \
+--all \
+--reporter text \
+--reporter lcov
 
 exit $EXIT_CODE

eslint.config.mjs

@@ -7,8 +7,7 @@ export default defineConfig([
 		{
 			languageOptions: {
 				parserOptions: {
-					ecmaVersion: 8,
-					type: 'commonjs',
+					ecmaVersion: 2022,
 				}
 			},
 			rules: {
@@ -18,7 +17,6 @@ export default defineConfig([
 		},
 		globalIgnores([
 			'coverage',
-			'.nyc_output',
 			'!packages/node_modules/',
 		]),
 	], {

package.json

@@ -28,16 +28,16 @@
   },
   "devDependencies": {
     "aws-sdk": "^2.179.0",
-    "chai": "^4.1.1",
-    "chai-as-promised": "^7.1.1",
+    "c8": "^11.0.0",
+    "chai": "^5.2.0",
+    "chai-as-promised": "^8.0.0",
     "dynamodb-local": "0.0.31",
     "eslint": "^9.26.0",
     "eslint-config-brightspace": "^2.7.2",
-    "find-requires": "^1.0.0",
     "mocha": "^11.1.0",
-    "nyc": "^17.1.0",
     "redis": "^2.8.0",
     "sinon": "^20.0.0",
     "undici": "^7.8.0"
-  }
+  },
+  "type": "module"
 }