rolldown-plugin-concurrent-top-level-await 0.0.3 → 0.2.0

package/README.md

@@ -1,5 +1,5 @@
 > [!Warning]
-> This plugin is currently in development. A filter option will be added soon. For more information, see [this issue](https://github.com/zOadT/concurrent-top-level-await-plugins/issues/35).
+> This plugin is currently in development. For more information, see [this issue](https://github.com/zOadT/concurrent-top-level-await-plugins/issues/35).
 
 # rolldown-plugin-concurrent-top-level-await
 
@@ -45,7 +45,9 @@ export default defineConfig({
 ## Options
 
 | Option                    | Type     | Default   | Description                                                                                                               |
-| ------------------------- | -------- | --------- | ------------------------------------------------------------------------------------------------------------------------- |
+| ------------------------- | -------- | --------- | ------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- |
+| `include`                 | `RegExp  | RegExp[]` | `undefined`                                                                                                               | A RegExp specifying which files to include. See [below](#which-modules-to-include) to determine which modules to include.        |
+| `exclude`                 | `RegExp  | RegExp[]` | `[/\/node_modules\//, /\.html$/]`                                                                                         | A RegExp specifying which files to exclude. Must still follow the [same considerations](#which-modules-to-include) as `include`. |
 | `generatedVariablePrefix` | `string` | `"__tla"` | Prefix used for internal variables generated by the plugin. Change this if it conflicts with variable names in your code. |
 
 ### Which modules to include?

package/dist/index.d.mts

@@ -1,5 +1,7 @@
 //#region src/index.d.ts
 declare function concurrentTopLevelAwait(options?: {
+  include?: RegExp | RegExp[];
+  exclude?: RegExp | RegExp[];
   /**
    * Prefix used for internal variables generated by the plugin.
    * Change this if it conflicts with variable names in your code.

package/dist/index.mjs

@@ -2,6 +2,38 @@ import { randomUUID } from "node:crypto";
 import { RolldownMagicString } from "rolldown";
 import { transform } from "rolldown/utils";
 
+//#region src/utils/filter.ts
+function matchesPattern(id, pattern) {
+	if (Array.isArray(pattern)) return pattern.some((p) => p.test(id));
+	return pattern.test(id);
+}
+function createFilter(include, exclude) {
+	return {
+		include,
+		exclude,
+		includes(id) {
+			if (exclude && matchesPattern(id, exclude)) return false;
+			if (include) return matchesPattern(id, include);
+			return true;
+		}
+	};
+}
+function ensureArray(item) {
+	if (item == null) return [];
+	return Array.isArray(item) ? item : [item];
+}
+function withExclude(filter, exclude) {
+	return createFilter(filter.include, [...ensureArray(filter.exclude), exclude]);
+}
+function prefixRegex(str, flags) {
+	return new RegExp(`^${escapeRegex(str)}`, flags);
+}
+const escapeRegexRE = /[-/\\^$*+?.()|[\]{}]/g;
+function escapeRegex(str) {
+	return str.replace(escapeRegexRE, "\\$&");
+}
+
+//#endregion
 //#region src/awaitEntriesPlugin.ts
 function awaitEntrypointsPlugin(options) {
 	const generatedVariablePrefix = options.generatedVariablePrefix;
@@ -12,19 +44,20 @@ function awaitEntrypointsPlugin(options) {
 		apply: "build",
 		resolveId: {
 			order: "pre",
-			async handler(source, importer, options$1) {
+			async handler(source, importer, extraOptions) {
 				if (importer?.startsWith(proxyPrefix)) {
-					const key$1 = importer.slice(proxyPrefix.length);
-					const resolved$1 = awaitedEntriesMap.get(key$1);
-					if (!resolved$1) throw new Error("Name collision in concurrent-tla plugin, please change the generatedVariablePrefix option");
-					return resolved$1;
+					const key = importer.slice(proxyPrefix.length);
+					const resolved = awaitedEntriesMap.get(key);
+					if (!resolved) throw new Error("Name collision in concurrent-tla plugin, please change the generatedVariablePrefix option");
+					return resolved;
+				}
+				if (extraOptions.isEntry || extraOptions.kind === "dynamic-import" || importer != null && !options.filter.includes(importer)) {
+					const resolved = await this.resolve(source, importer, extraOptions);
+					if (resolved == null || !options.filter.includes(resolved.id)) return;
+					const key = randomUUID();
+					awaitedEntriesMap.set(key, resolved);
+					return `${proxyPrefix}${key}`;
 				}
-				if (!options$1.isEntry && options$1.kind !== "dynamic-import") return;
-				const resolved = await this.resolve(source, importer, options$1);
-				if (resolved == null) return;
-				const key = randomUUID();
-				awaitedEntriesMap.set(key, resolved);
-				return `${proxyPrefix}${key}`;
 			}
 		},
 		load: {
@@ -379,12 +412,9 @@ const supportedModuleTypes = new Set([
 	"ts",
 	"tsx"
 ]);
-function resolveDeclarationSource(context, id, importerAttributes = {}, declaration) {
-	return context.resolve(declaration.source.value, id, {
-		attributes: Object.fromEntries(declaration.attributes.map((attr) => [attr.key.type === "Identifier" ? attr.key.name : attr.key.value, attr.value.value])),
-		importerAttributes,
-		custom: {}
-	});
+let nativeMagicStringWarned = false;
+function resolveDeclarationSource(context, id, declaration) {
+	return context.resolve(declaration.source.value, id, { custom: {} });
 }
 function transformPlugin(options) {
 	const generatedVariablePrefix = options.generatedVariablePrefix;
@@ -392,42 +422,47 @@ function transformPlugin(options) {
 	return {
 		name: "rolldown-plugin-concurrent-tla-plugin-transform",
 		apply: "build",
-		transform: { async handler(_code, id, transformOptions) {
-			if (id.startsWith(`\0${generatedVariablePrefix}AwaitEntry:`)) return;
-			if (!supportedModuleTypes.has(transformOptions?.moduleType)) {
-				asyncTracker.setEntryAsync(id, false);
-				asyncTracker.setDependencies(id, []);
-			}
-			const code = (await transform(id, _code)).code;
-			const ast = this.parse(code);
-			const importDeclarations = ast.body.filter((a) => a.type === "ImportDeclaration");
-			const hasAwait = hasTopLevelAwait(ast);
-			asyncTracker.setEntryAsync(id, hasAwait);
-			if (hasAwait) asyncTracker.setDependencies(id, []);
-			let imports = (await Promise.all(importDeclarations.map(async (declaration) => {
-				const importId = await resolveDeclarationSource(this, id, transformOptions?.attributes, declaration);
-				if (!importId) return null;
+		transform: {
+			filter: { id: withExclude(options.filter, prefixRegex(`\0${generatedVariablePrefix}AwaitEntry:`)) },
+			async handler(_code, id, transformOptions) {
+				if (!supportedModuleTypes.has(transformOptions?.moduleType)) {
+					asyncTracker.setEntryAsync(id, false);
+					asyncTracker.setDependencies(id, []);
+				}
+				const code = (await transform(id, _code)).code;
+				const ast = this.parse(code);
+				const importDeclarations = ast.body.filter((a) => a.type === "ImportDeclaration");
+				const hasAwait = hasTopLevelAwait(ast);
+				asyncTracker.setEntryAsync(id, hasAwait);
+				if (hasAwait) asyncTracker.setDependencies(id, []);
+				let imports = (await Promise.all(importDeclarations.map(async (declaration) => {
+					const importId = await resolveDeclarationSource(this, id, declaration);
+					if (!importId || !options.filter.includes(importId.id)) return null;
+					return {
+						declaration,
+						id: importId.id
+					};
+				}))).filter(Boolean);
+				if (!hasAwait) asyncTracker.setDependencies(id, imports.map((x) => x.id));
+				const asyncImports = (await Promise.all(imports.map(async ({ declaration, id: id$1 }) => {
+					this.load({ id: id$1 });
+					if (!await asyncTracker.isAsync(id$1)) return null;
+					return declaration;
+				}))).filter(Boolean);
+				if (!(asyncImports.length > 0 || hasAwait)) return;
+				const { magicString: _magicString } = transformOptions;
+				const magicString = new RolldownMagicString(code);
+				if (!_magicString && !nativeMagicStringWarned) {
+					this.warn("Enable experimental.nativeMagicString for source maps support");
+					nativeMagicStringWarned = true;
+				}
+				transform$1(magicString, ast, options.registerModuleSource, asyncImports, hasAwait, generatedVariablePrefix);
 				return {
-					declaration,
-					id: importId.id
+					code: _magicString != null ? magicString : magicString.toString(),
+					meta: { [generatedVariablePrefix + "_async"]: true }
 				};
-			}))).filter(Boolean);
-			if (!hasAwait) asyncTracker.setDependencies(id, imports.map((x) => x.id));
-			const asyncImports = (await Promise.all(imports.map(async ({ declaration, id: id$1 }) => {
-				this.load({ id: id$1 });
-				if (!await asyncTracker.isAsync(id$1)) return null;
-				return declaration;
-			}))).filter(Boolean);
-			if (!(asyncImports.length > 0 || hasAwait)) return;
-			const { magicString: _magicString } = transformOptions;
-			const magicString = new RolldownMagicString(code);
-			if (!_magicString) throw new Error("experimental.nativeMagicString must be enabled in the Rolldown options to use the concurrent-tla plugin");
-			transform$1(magicString, ast, options.registerModuleSource, asyncImports, hasAwait, generatedVariablePrefix);
-			return {
-				code: magicString,
-				meta: { [generatedVariablePrefix + "_async"]: true }
-			};
-		} }
+			}
+		}
 	};
 }
 
@@ -438,7 +473,8 @@ function concurrentTopLevelAwait(options = {}) {
 	const enrichedOptions = {
 		...options,
 		generatedVariablePrefix,
-		registerModuleSource: `\0${generatedVariablePrefix}Register`
+		registerModuleSource: `\0${generatedVariablePrefix}Register`,
+		filter: createFilter(options.include, options.exclude ?? [/\/node_modules\//, /\.html$/])
 	};
 	return [
 		awaitEntrypointsPlugin(enrichedOptions),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rolldown-plugin-concurrent-top-level-await",
-  "version": "0.0.3",
+  "version": "0.2.0",
   "description": "Rolldown (and Vite) plugin enabling concurrent execution of modules that contain top level await.",
   "keywords": [
     "rolldown-plugin",
@@ -52,6 +52,7 @@
     }
   },
   "devDependencies": {
+    "@oxc-project/types": "^0.122.0",
     "@types/estree": "^1.0.8",
     "prettier": "3.7.4",
     "rolldown": "1.0.0-rc.9"