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

package/dist/index.d.mts

@@ -18,7 +18,7 @@ declare function concurrentTopLevelAwait(options?: {
   name: string;
   apply: "build";
   resolveId(this: rollup0.PluginContext, source: string): string | undefined;
-  load(this: rollup0.PluginContext, id: string): "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\n    return evaluate;\n\n    function evaluate(whenDone, onError) {\n        if (state === \"done\") {\n            if (whenDone)\n                whenDone();\n            return;\n        }\n        if (state === \"failed\") {\n            if (onError)\n                onError(error);\n            return;\n        }\n        if (whenDone)\n            whenDones.push(whenDone);\n        if (onError)\n            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)\n                x();\n        };\n        let moduleError = (err) => {\n            state = \"failed\";\n            error = err;\n            for (let x of whenErrors)\n                x(err);\n        };\n        let importDone = () => {\n            if (state !== \"busy\")\n                return;\n            if (--remaining !== 0)\n                return;\n            try {\n                let result = fn();\n                if (result) {\n                    result\n                        .then(moduleDone)\n                        .catch(moduleError);\n                }\n                else {\n                    moduleDone();\n                }\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)\n                    continue;\n            }\n            catch (_a) {\n                continue;\n            }\n            remaining++;\n            evaluate(importDone, moduleError);\n        }\n        importDone();\n    }\n}\n" | undefined;
+  load(this: rollup0.PluginContext, id: string): string | undefined;
   transform: {
     handler(this: TransformPluginContext, code: string, id: string, transformOptions: {
       ssr?: boolean | undefined;

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,24 +127,29 @@ 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`);
 	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`);
-	s.append(`if (import.meta.useTla) await new Promise(${variablePrefix}_access);\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`);
@@ -187,6 +192,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) {
@@ -229,6 +235,16 @@ function getNames(pattern) {
 	}
 }
 
+//#endregion
+//#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;
+
 //#endregion
 //#region src/index.ts
 function resolveDeclarationSource(context, id, importerAttributes = {}, declaration) {
@@ -238,90 +254,10 @@ function resolveDeclarationSource(context, id, importerAttributes = {}, declarat
 		custom: {}
 	});
 }
-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;
-
-    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();
-    }
-}
-`;
 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",
@@ -330,7 +266,7 @@ function concurrentTopLevelAwait(options = {}) {
 			if (source === registerModuleSource) return registerModuleSource;
 		},
 		load(id) {
-			if (id === registerModuleSource) return tlaModule;
+			if (id === registerModuleSource) return registerSource_default;
 		},
 		transform: { async handler(code, id, transformOptions) {
 			if (!filter(id)) return;
@@ -355,7 +291,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.4.0",
   "description": "Rollup (and Vite) plugin enabling concurrent execution of modules that contain top level await.",
   "keywords": [
     "rollup-plugin",
@@ -58,7 +58,8 @@
   "devDependencies": {
     "@types/estree": "^1.0.8",
     "prettier": "3.7.4",
-    "rollup": "^4.57.1"
+    "rollup": "^4.57.1",
+    "unplugin-macros": "^0.19.1"
   },
   "scripts": {
     "build": "tsdown --dts"