rollup-plugin-concurrent-top-level-await 0.0.3 → 0.0.5

package/dist/index.d.mts

@@ -7,7 +7,7 @@ declare function concurrentTopLevelAwait(options?: {
   exclude?: FilterPattern;
 }): {
   name: string;
-  apply: string;
+  apply: "build";
   transform: {
     handler(this: rollup0.TransformPluginContext, code: string, id: string): Promise<{
       code: string;

package/dist/index.mjs

@@ -2,27 +2,17 @@ import { createFilter } from "@rollup/pluginutils";
 import MagicString from "magic-string";
 
 //#region src/hasTopLevelAwait.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 isAwaitNode(node) {
+	return node.type === "AwaitExpression" || node.type === "ForOfStatement" && node.await || node.type === "VariableDeclaration" && node.kind === "await using";
+}
 function hasTopLevelAwait(ast) {
-	let found = false;
-	function isFunctionNode(node) {
-		if (!node || typeof node.type !== "string") return false;
-		return node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression" || node.type === "ClassPrivateMethod" || node.type === "MethodDefinition";
-	}
-	function walk(node, functionDepth = 0) {
-		if (!node || found) return;
-		if (node.type === "AwaitExpression" && functionDepth === 0) {
-			found = true;
-			return;
-		}
-		const nextDepth = functionDepth + (isFunctionNode(node) ? 1 : 0);
-		for (const key of Object.keys(node)) {
-			const child = node[key];
-			if (Array.isArray(child)) for (const c of child) walk(c, nextDepth);
-			else if (child && typeof child.type === "string") walk(child, nextDepth);
-		}
-	}
-	walk(ast, 0);
-	return found;
+	if (ast?.type == null) return false;
+	if (isAwaitNode(ast)) return true;
+	if (isFunctionNode(ast)) return false;
+	return Object.values(ast).flat().some(hasTopLevelAwait);
 }
 
 //#endregion

package/package.json

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