feat: handle complex options.require config property

avajs · Mar 9, 2023 · 95f2f52 · 95f2f52
1 parent 1c56764
commit 95f2f52
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/lib/api.js b/lib/api.js
@@ -24,13 +24,28 @@ import serializeError from './serialize-error.js';
 
 function resolveModules(modules) {
 	return arrify(modules).map(name => {
-		const modulePath = resolveCwd.silent(name);
+		if (typeof name === 'string') {
+			const modulePath = resolveCwd.silent(name);
 
-		if (modulePath === undefined) {
-			throw new Error(`Could not resolve required module ’${name}’`);
+			if (modulePath === undefined) {
+				throw new Error(`Could not resolve required module ’${name}’`);
+			}
+
+			return modulePath;
+		}
+
+		if (Array.isArray(name) && name.length > 0) {
+			const modulePath = resolveCwd.silent(name[0]);
+
+			if (modulePath === undefined) {
+				throw new Error(`Could not resolve required module ’${name[0]}’`);
+			}
+
+			name[0] = modulePath;
+			return name;
 		}
 
-		return modulePath;
+		return name;
 	});
 }
 

diff --git a/lib/worker/base.js b/lib/worker/base.js
@@ -176,7 +176,14 @@ const run = async options => {
 
 	try {
 		for await (const ref of (options.require || [])) {
-			await load(ref);
+			if (typeof ref === 'string') {
+				await load(ref);
+			} else if (Array.isArray(ref)) {
+				const [path, options] = ref;
+
+				const mod = await load(path);
+				mod.apply(null, ...options);
+			}
 		}
 
 		// Install dependency tracker after the require configuration has been evaluated