rollup-plugin-concurrent-top-level-await 0.3.1 → 0.3.2

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { createFilter } from "@rollup/pluginutils";
 import MagicString from "magic-string";
 
-//#region src/ast.ts
+//#region ../shared/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";
 }
@@ -13,7 +13,7 @@ function visitScope(node, cb) {
 }
 
 //#endregion
-//#region src/hasTopLevelAwait.ts
+//#region ../shared/src/hasTopLevelAwait.ts
 function isAwaitNode(node) {
 	return node.type === "AwaitExpression" || node.type === "ForOfStatement" && node.await || node.type === "VariableDeclaration" && node.kind === "await using";
 }
@@ -22,7 +22,7 @@ function hasTopLevelAwait(node) {
 }
 
 //#endregion
-//#region src/polyfills/promise.ts
+//#region ../shared/src/polyfills/promise.ts
 function withResolvers() {
 	let resolve;
 	let reject;
@@ -37,7 +37,7 @@ function withResolvers() {
 }
 
 //#endregion
-//#region src/AsyncModuleTracker.ts
+//#region ../shared/src/AsyncModuleTracker.ts
 var AwaitableCache = class {
 	#store = /* @__PURE__ */ new Map();
 	#getPromise(key) {
@@ -127,7 +127,7 @@ var AsyncModuleTracker = class {
 };
 
 //#endregion
-//#region src/transform.ts
+//#region ../shared/src/transform.ts
 function transform(s, ast, registerModuleSource, asyncImports, hasAwait, variablePrefix) {
 	const declarationsEnd = transformAndMoveDeclarationsToModuleScope(s, ast, asyncImports, variablePrefix);
 	s.appendRight(declarationsEnd, `${hasAwait ? "async " : ""}function ${variablePrefix}_initModuleExports() {\n`);
@@ -135,7 +135,6 @@ function transform(s, ast, registerModuleSource, asyncImports, hasAwait, variabl
 	s.prepend(`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`);
-	s.append(`if (import.meta.useTla) await new Promise(${variablePrefix}_access);\n`);
 }
 function transformAndMoveDeclarationsToModuleScope(s, ast, asyncImports, variablePrefix) {
 	let moduleScopeEnd = 0;
@@ -187,7 +186,7 @@ function isFunctionDeclaration(type) {
 	return type === "FunctionDeclaration";
 }
 function getClassDeclarationStart(node) {
-	return node.decorators[0]?.start ?? node.start;
+	return node.decorators?.[0]?.start ?? node.start;
 }
 function moveVariableDeclarationToModuleScope(s, node, declarationsEnd) {
 	const kind = replaceConstWithLet(node.kind);
@@ -321,7 +320,8 @@ const tlaModule = `export default function register(fn, evaluate_accesses) {
 `;
 function concurrentTopLevelAwait(options = {}) {
 	const filter = createFilter(options.include, options.exclude);
-	const registerModuleSource = `\0${options.generatedVariablePrefix ?? "__tla"}Register`;
+	const generatedVariablePrefix = options.generatedVariablePrefix ?? "__tla";
+	const registerModuleSource = `\0${generatedVariablePrefix}Register`;
 	const asyncTracker = new AsyncModuleTracker();
 	return {
 		name: "rollup-plugin-concurrent-tla-plugin",
@@ -355,7 +355,8 @@ function concurrentTopLevelAwait(options = {}) {
 			}))).filter(Boolean);
 			if (!(asyncImports.length > 0 || hasAwait)) return;
 			const s = new MagicString(code);
-			transform(s, ast, registerModuleSource, asyncImports, hasAwait, options.generatedVariablePrefix ?? "__tla");
+			transform(s, ast, registerModuleSource, asyncImports, hasAwait, generatedVariablePrefix);
+			s.append(`if (import.meta.useTla) await new Promise(${generatedVariablePrefix}_access);\n`);
 			return {
 				code: s.toString(),
 				map: options.sourceMap !== false ? s.generateMap({ hires: true }) : null

package/package.json

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