rolldown-plugin-concurrent-top-level-await 0.2.0 → 0.3.0

package/README.md

@@ -44,11 +44,11 @@ export default defineConfig({
 
 ## Options
 
-| Option                    | Type     | Default   | Description                                                                                                               |
-| ------------------------- | -------- | --------- | ------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- |
-| `include`                 | `RegExp  | RegExp[]` | `undefined`                                                                                                               | A RegExp specifying which files to include. See [below](#which-modules-to-include) to determine which modules to include.        |
-| `exclude`                 | `RegExp  | RegExp[]` | `[/\/node_modules\//, /\.html$/]`                                                                                         | A RegExp specifying which files to exclude. Must still follow the [same considerations](#which-modules-to-include) as `include`. |
-| `generatedVariablePrefix` | `string` | `"__tla"` | Prefix used for internal variables generated by the plugin. Change this if it conflicts with variable names in your code. |
+| Option                    | Type                            | Default                           | Description                                                                                                                      |
+| ------------------------- | ------------------------------- | --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- |
+| `include`                 | <code>RegExp \| RegExp[]</code> | `undefined`                       | A RegExp specifying which files to include. See [below](#which-modules-to-include) to determine which modules to include.        |
+| `exclude`                 | <code>RegExp \| RegExp[]</code> | `[/\/node_modules\//, /\.html$/]` | A RegExp specifying which files to exclude. Must still follow the [same considerations](#which-modules-to-include) as `include`. |
+| `generatedVariablePrefix` | `string`                        | `"__tla"`                         | Prefix used for internal variables generated by the plugin. Change this if it conflicts with variable names in your code.        |
 
 ### Which modules to include?
 

package/dist/index.mjs

@@ -66,12 +66,16 @@ function awaitEntrypointsPlugin(options) {
 				if (id.startsWith(proxyPrefix)) {
 					const resolved = awaitedEntriesMap.get(id.slice(proxyPrefix.length));
 					if (!resolved) throw new Error("Name collision in concurrent-tla plugin, please change the generatedVariablePrefix option");
-					if ((await this.load(resolved)).meta[generatedVariablePrefix + "_async"]) return `import { ${generatedVariablePrefix}_access } from "${resolved.id}";
+					const module = await this.load(resolved);
+					let code = "";
+					if (module.meta[generatedVariablePrefix + "_async"]) code += `import { ${generatedVariablePrefix}_access } from "${resolved.id}";
 await new Promise(${generatedVariablePrefix}_access);
-export * from "${resolved.id}";
 `;
-					return `export * from "${resolved.id}";
+					if (module.exports.includes("default")) code += `import ${generatedVariablePrefix}_default from "${resolved.id}";
+export default ${generatedVariablePrefix}_default;
 `;
+					code += `export * from "${resolved.id}";\n`;
+					return code;
 				}
 			}
 		}
@@ -79,88 +83,17 @@ export * from "${resolved.id}";
 }
 
 //#endregion
-//#region src/registerModulePlugin.ts
-const tlaModule = `export default function register(fn, evaluate_accesses) {
-    let state = "ready";
-    let whenDones = [];
-    let whenErrors = [];
-    let remaining = 1;
-    let error = undefined;
-    // evaluate eagerly
-    evaluate();
-
-    return evaluate;
+//#region ../shared/src/registerSource.ts
+var registerSource_default = {
+	"code": "export default function register(fn, evaluate_accesses) {\n	let state = \"ready\";\n	let whenDones = [];\n	let whenErrors = [];\n	let remaining = 1;\n	let error = undefined;\n	// evaluate eagerly\n	evaluate();\n	return evaluate;\n	function evaluate(whenDone, onError) {\n		if (state === \"done\") {\n			if (whenDone) whenDone();\n			return;\n		}\n		if (state === \"failed\") {\n			if (onError) onError(error);\n			return;\n		}\n		if (whenDone) whenDones.push(whenDone);\n		if (onError) whenErrors.push(onError);\n		if (state === \"busy\") {\n			return;\n		}\n		state = \"busy\";\n		let moduleDone = () => {\n			state = \"done\";\n			for (let x of whenDones) x();\n		};\n		let moduleError = (err) => {\n			state = \"failed\";\n			error = err;\n			for (let x of whenErrors) x(err);\n		};\n		let importDone = () => {\n			if (state !== \"busy\") return;\n			if (--remaining !== 0) return;\n			try {\n				let result = fn();\n				if (result) {\n					result.then(moduleDone).catch(moduleError);\n				} else {\n					moduleDone();\n				}\n			} catch (err) {\n				moduleError(err);\n			}\n		};\n		for (const access of evaluate_accesses) {\n			let evaluate;\n			try {\n				// Environment-dependent behavior:\n				// - throws on cyclic dependencies in V8\n				// - returns undefined in some environments (e.g., vitest)\n				evaluate = access();\n				if (evaluate == null) continue;\n			} catch {\n				continue;\n			}\n			remaining++;\n			evaluate(importDone, moduleError);\n		}\n		importDone();\n	}\n}\n",
+	"helpersUsed": {},
+	"errors": [],
+	"warnings": [],
+	"tsconfigFilePaths": []
+}.code;
 
-    function evaluate(whenDone, onError) {
-        if (state === "done") {
-            if (whenDone)
-                whenDone();
-            return;
-        }
-        if (state === "failed") {
-            if (onError)
-                onError(error);
-            return;
-        }
-        if (whenDone)
-            whenDones.push(whenDone);
-        if (onError)
-            whenErrors.push(onError);
-        if (state === "busy") {
-            return;
-        }
-        state = "busy";
-        let moduleDone = () => {
-            state = "done";
-            for (let x of whenDones)
-                x();
-        };
-        let moduleError = (err) => {
-            state = "failed";
-            error = err;
-            for (let x of whenErrors)
-                x(err);
-        };
-        let importDone = () => {
-            if (state !== "busy")
-                return;
-            if (--remaining !== 0)
-                return;
-            try {
-                let result = fn();
-                if (result) {
-                    result
-                        .then(moduleDone)
-                        .catch(moduleError);
-                }
-                else {
-                    moduleDone();
-                }
-            }
-            catch (err) {
-                moduleError(err);
-            }
-        };
-        for (const access of evaluate_accesses) {
-            let evaluate;
-            try {
-                // Environment-dependent behavior:
-                // - throws on cyclic dependencies in V8
-                // - returns undefined in some environments (e.g., vitest)
-                evaluate = access();
-                if (evaluate == null)
-                    continue;
-            }
-            catch (_a) {
-                continue;
-            }
-            remaining++;
-            evaluate(importDone, moduleError);
-        }
-        importDone();
-    }
-}
-`;
+//#endregion
+//#region src/registerModulePlugin.ts
 function registerModulePlugin(options) {
 	options.generatedVariablePrefix;
 	const registerModuleSource = options.registerModuleSource;
@@ -171,7 +104,7 @@ function registerModulePlugin(options) {
 			if (source === registerModuleSource) return registerModuleSource;
 		},
 		load(id) {
-			if (id === registerModuleSource) return tlaModule;
+			if (id === registerModuleSource) return registerSource_default;
 		}
 	};
 }
@@ -308,18 +241,24 @@ function transform$1(s, ast, registerModuleSource, asyncImports, hasAwait, varia
 	const declarationsEnd = transformAndMoveDeclarationsToModuleScope(s, ast, asyncImports, variablePrefix);
 	s.appendRight(declarationsEnd, `${hasAwait ? "async " : ""}function ${variablePrefix}_initModuleExports() {\n`);
 	s.append("\n}\n");
-	s.prepend(`import ${variablePrefix}_register from ${JSON.stringify(registerModuleSource)};\n`);
+	s.append(`import ${variablePrefix}_register from ${JSON.stringify(registerModuleSource)};\n`);
 	const asyncDeps = `[${asyncImports.map((_, i) => `() => ${variablePrefix}${i}`).join(", ")}]`;
 	s.append(`export const ${variablePrefix}_access = ${variablePrefix}_register(${variablePrefix}_initModuleExports, ${asyncDeps});\n`);
 }
 function transformAndMoveDeclarationsToModuleScope(s, ast, asyncImports, variablePrefix) {
 	let moduleScopeEnd = 0;
-	let i = 0;
+	let importDeclarationIndex = 0;
+	let inDirectivePrologue = true;
 	for (const node of ast.body) {
+		if (inDirectivePrologue && node.type === "ExpressionStatement" && node.expression.type === "Literal") {
+			moduleScopeEnd = node.end;
+			continue;
+		}
+		inDirectivePrologue = false;
 		if (asyncImports.includes(node)) {
-			const tlaImport = `\nimport { ${variablePrefix}_access as ${variablePrefix}${i}} from '${node.source.value}';`;
+			const tlaImport = `\nimport { ${variablePrefix}_access as ${variablePrefix}${importDeclarationIndex}} from '${node.source.value}';`;
 			s.appendLeft(node.end, tlaImport);
-			i++;
+			importDeclarationIndex++;
 		}
 		if (node.type === "ClassDeclaration") {
 			s.appendLeft(moduleScopeEnd, `let ${node.id.name};\n`);
@@ -362,6 +301,7 @@ function isFunctionDeclaration(type) {
 	return type === "FunctionDeclaration";
 }
 function getClassDeclarationStart(node) {
+	if (!("decorators" in node)) return node.start;
 	return node.decorators[0]?.start ?? node.start;
 }
 function moveVariableDeclarationToModuleScope(s, node, declarationsEnd) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rolldown-plugin-concurrent-top-level-await",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Rolldown (and Vite) plugin enabling concurrent execution of modules that contain top level await.",
   "keywords": [
     "rolldown-plugin",
@@ -55,7 +55,8 @@
     "@oxc-project/types": "^0.122.0",
     "@types/estree": "^1.0.8",
     "prettier": "3.7.4",
-    "rolldown": "1.0.0-rc.9"
+    "rolldown": "1.0.0-rc.9",
+    "unplugin-macros": "^0.19.1"
   },
   "scripts": {
     "build": "tsdown --dts"