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

package/README.md

@@ -97,18 +97,6 @@ can lead to `const` variables being assignable at runtime instead of throwing an
 
 Additionally, variable declarations may be hoisted, which removes temporal dead zone (TDZ) checks.
 
-### Exporting var
-
-The plugin only checks the very top level of a module for potentially exported variables. This means that if a `var`
-variable is declared inside a block but exported, the variable might not get handled correctly.
-
-```js
-if (something) {
-	var myValue = 42;
-}
-export default myValue;
-```
-
 ### Class Decorators
 
 Class declarations still get evaluated before any top level await expressions. This means that if a class decorator

package/dist/index.mjs

@@ -1,18 +1,24 @@
 import { createFilter } from "@rollup/pluginutils";
 import MagicString from "magic-string";
 
-//#region src/hasTopLevelAwait.ts
+//#region src/ast.ts
 function isFunctionNode(node) {
 	return node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression" || node.type === "MethodDefinition" || node.type === "Property" && node.value.type === "FunctionExpression";
 }
+function visitScope(node, cb) {
+	if (node?.type == null) return false;
+	if (cb(node)) return true;
+	if (isFunctionNode(node)) return false;
+	return Object.values(node).flat().some((n) => visitScope(n, cb));
+}
+
+//#endregion
+//#region src/hasTopLevelAwait.ts
 function isAwaitNode(node) {
 	return node.type === "AwaitExpression" || node.type === "ForOfStatement" && node.await || node.type === "VariableDeclaration" && node.kind === "await using";
 }
-function hasTopLevelAwait(ast) {
-	if (ast?.type == null) return false;
-	if (isAwaitNode(ast)) return true;
-	if (isFunctionNode(ast)) return false;
-	return Object.values(ast).flat().some(hasTopLevelAwait);
+function hasTopLevelAwait(node) {
+	return visitScope(node, isAwaitNode);
 }
 
 //#endregion
@@ -161,10 +167,19 @@ function tansformAndMoveDeclarationsToModuleScope(s, ast, asyncImports) {
 				s = s.remove(node.start, node.declaration.start);
 				s = moveVariableDeclarationToModuleScope(s, node.declaration, moduleScopeEnd);
 			}
-		}
-		if (node.type === "VariableDeclaration") if (node.kind.endsWith("using")) s = moveVariableDeclarationWithUsingToModuleScope(s, node, moduleScopeEnd);
+		} else 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) {
+		else visitScope(node, (n) => {
+			if (n.type === "VariableDeclaration" && n.kind === "var") s = moveVariableDeclarationToModuleScope(s, n, moduleScopeEnd);
+			return false;
+		});
+		if (node.type === "ExportDefaultDeclaration" && !isDeclaration(node.declaration.type)) {
+			s = s.appendLeft(moduleScopeEnd, "let __tla_default;\nexport { __tla_default as default };\n");
+			s = s.remove(node.start, node.declaration.start);
+			s = s.appendRight(node.declaration.start, ";__tla_default = (");
+			s = s.appendLeft(node.declaration.end, ");");
+		}
+		if (isDeclaration(node.type) || node.type === "ImportDeclaration" || node.type === "ExportDefaultDeclaration" && isDeclaration(node.declaration.type) || node.type === "ExportNamedDeclaration" && isDeclaration(node.declaration?.type) || node.type === "ExportNamedDeclaration" && node.declaration == null || node.type === "ExportAllDeclaration") if (node.start > moduleScopeEnd) {
 			s = s.appendRight(node.start, ";\n");
 			s = s.move(node.start, node.end, moduleScopeEnd);
 		} else moduleScopeEnd = node.end;

package/package.json

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