rolldown-plugin-concurrent-top-level-await 0.1.0 → 0.2.1

package/README.md

@@ -47,7 +47,7 @@ export default defineConfig({
 | 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\//`                                                                                                      | A RegExp specifying which files to exclude. Must still follow the [same considerations](#which-modules-to-include) as `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.mjs

@@ -46,17 +46,18 @@ function awaitEntrypointsPlugin(options) {
 			order: "pre",
 			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 (!extraOptions.isEntry && extraOptions.kind !== "dynamic-import") return;
-				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}`;
 			}
 		},
 		load: {
@@ -65,12 +66,16 @@ function awaitEntrypointsPlugin(options) {
 				if (id.startsWith(proxyPrefix)) {
 					const resolved = awaitedEntriesMap.get(id.slice(proxyPrefix.length));
 					if (!resolved) throw new Error("Name collision in concurrent-tla plugin, please change the generatedVariablePrefix option");
-					if ((await this.load(resolved)).meta[generatedVariablePrefix + "_async"]) return `import { ${generatedVariablePrefix}_access } from "${resolved.id}";
+					const module = await this.load(resolved);
+					let code = "";
+					if (module.meta[generatedVariablePrefix + "_async"]) code += `import { ${generatedVariablePrefix}_access } from "${resolved.id}";
 await new Promise(${generatedVariablePrefix}_access);
-export * from "${resolved.id}";
 `;
-					return `export * from "${resolved.id}";
+					if (module.exports.includes("default")) code += `import ${generatedVariablePrefix}_default from "${resolved.id}";
+export default ${generatedVariablePrefix}_default;
 `;
+					code += `export * from "${resolved.id}";\n`;
+					return code;
 				}
 			}
 		}
@@ -361,7 +366,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);
@@ -411,6 +416,7 @@ const supportedModuleTypes = new Set([
 	"ts",
 	"tsx"
 ]);
+let nativeMagicStringWarned = false;
 function resolveDeclarationSource(context, id, declaration) {
 	return context.resolve(declaration.source.value, id, { custom: {} });
 }
@@ -450,10 +456,13 @@ function transformPlugin(options) {
 				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");
+				if (!_magicString && !nativeMagicStringWarned) {
+					this.warn("Enable experimental.nativeMagicString for source maps support");
+					nativeMagicStringWarned = true;
+				}
 				transform$1(magicString, ast, options.registerModuleSource, asyncImports, hasAwait, generatedVariablePrefix);
 				return {
-					code: magicString,
+					code: _magicString != null ? magicString : magicString.toString(),
 					meta: { [generatedVariablePrefix + "_async"]: true }
 				};
 			}
@@ -469,7 +478,7 @@ function concurrentTopLevelAwait(options = {}) {
 		...options,
 		generatedVariablePrefix,
 		registerModuleSource: `\0${generatedVariablePrefix}Register`,
-		filter: createFilter(options.include, options.exclude ?? /\/node_modules\//)
+		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.1.0",
+  "version": "0.2.1",
   "description": "Rolldown (and Vite) plugin enabling concurrent execution of modules that contain top level await.",
   "keywords": [
     "rolldown-plugin",