rollup-plugin-concurrent-top-level-await 0.0.6 → 0.0.7

package/README.md

@@ -24,12 +24,46 @@ import concurrentTopLevelAwait from "rollup-plugin-concurrent-top-level-await";
 export default {
 	plugins: [
 		concurrentTopLevelAwait({
-			include: "**/*.ts",
+			include: "**/*.js",
 		}),
 	],
 };
 ```
 
+### Which modules to include
+
+The plugin needs to handle not only modules that directly contain a top-level `await`, but also their ancestor modules up to the lowest common ancestor. Ancestor modules must be transformed to handle the asynchronous completion of their children concurrently. As an example, consider the following module structure:
+
+```mermaid
+flowchart LR
+	app[app.js]
+	moduleA[moduleA.js]
+	moduleB[moduleB.js]
+	moduleC[moduleC.js]
+	tla1[tla1.js]
+	tla2[tla2.js]
+	tla3[tla3.js]
+	other[other.js]
+
+	app --> moduleA
+	moduleA --> moduleB
+	moduleA --> moduleC
+	moduleB --> tla1
+	moduleC --> tla2
+	moduleC --> tla3
+	app --> other
+
+	classDef tla fill:#ffe6e6,stroke:#ff0000,color:#660000
+	classDef ancestor fill:#fff4cc,stroke:#ffcc00,color:#663300
+	classDef unaffected fill:#e6ffe6,stroke:#00cc00,color:#006600
+
+	class tla1,tla2,tla3 tla
+	class moduleA,moduleB,moduleC ancestor
+	class app,other unaffected
+```
+
+If the red modules contain top level awaits, these and their yellow ancestors should be included in the plugin's `include` option.
+
 ## Known Limitations
 
 ### Execution Order

package/dist/index.mjs

@@ -159,10 +159,11 @@ function tansformAndMoveDeclarationsToModuleScope(s, ast, asyncImports) {
 			if (node.declaration?.type === "VariableDeclaration") {
 				s = s.appendLeft(moduleScopeEnd, ";export ");
 				s = s.remove(node.start, node.declaration.start);
-				s = moveVarDeclarationToModuleScope(s, node.declaration, moduleScopeEnd);
+				s = moveVariableDeclarationToModuleScope(s, node.declaration, moduleScopeEnd);
 			}
 		}
-		if (node.type === "VariableDeclaration") s = moveVarDeclarationToModuleScope(s, node, moduleScopeEnd);
+		if (node.type === "VariableDeclaration") if (node.kind.endsWith("using")) s = moveVariableDeclarationWithUsingToModuleScope(s, node, moduleScopeEnd);
+		else s = moveVariableDeclarationToModuleScope(s, node, moduleScopeEnd);
 		if (isDeclaration(node.type) || node.type === "ImportDeclaration" || node.type === "ExportNamedDeclaration" && isDeclaration(node.declaration?.type) || node.type === "ExportNamedDeclaration" && node.declaration == null || node.type === "ExportDefaultDeclaration" || node.type === "ExportAllDeclaration") if (node.start > moduleScopeEnd) {
 			s = s.appendRight(node.start, ";\n");
 			s = s.move(node.start, node.end, moduleScopeEnd);
@@ -173,7 +174,7 @@ function tansformAndMoveDeclarationsToModuleScope(s, ast, asyncImports) {
 function isDeclaration(type) {
 	return type === "ClassDeclaration" || type === "FunctionDeclaration";
 }
-function moveVarDeclarationToModuleScope(s, node, declarationsEnd) {
+function moveVariableDeclarationToModuleScope(s, node, declarationsEnd) {
 	const kind = replaceConstWithLet(node.kind);
 	const names = node.declarations.flatMap((decl) => getNames(decl.id)).join(", ");
 	s = s.appendRight(node.declarations[0].start, ";(");
@@ -182,6 +183,17 @@ function moveVarDeclarationToModuleScope(s, node, declarationsEnd) {
 	s = s.remove(node.start, node.declarations[0].start);
 	return s;
 }
+function moveVariableDeclarationWithUsingToModuleScope(s, node, declarationsEnd) {
+	node.declarations.forEach((declaration) => {
+		const id = declaration.id;
+		if (id.type !== "Identifier") throw new Error("'using' declarations may not have binding patterns.");
+		const name = id.name;
+		s = s.appendRight(id.start, `__tla_using_`);
+		s = s.appendLeft(node.end, `;\n${name} = __tla_using_${name};`);
+		s = s.appendLeft(declarationsEnd, `\nlet ${name};\n`);
+	});
+	return s;
+}
 function replaceConstWithLet(value) {
 	if (value === "const") return "let";
 	return value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup-plugin-concurrent-top-level-await",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Rollup (and Vite) plugin enabling concurrent execution of modules that contain top level await.",
   "keywords": [
     "rollup-plugin",