rollup-plugin-concurrent-top-level-await 0.2.0 → 0.2.1

package/dist/index.d.mts

@@ -1,6 +1,7 @@
 import { FilterPattern } from "@rollup/pluginutils";
 import * as magic_string0 from "magic-string";
 import * as rollup0 from "rollup";
+import { TransformPluginContext } from "rollup";
 
 //#region src/index.d.ts
 declare function concurrentTopLevelAwait(options?: {
@@ -17,7 +18,10 @@ declare function concurrentTopLevelAwait(options?: {
   name: string;
   apply: "build";
   transform: {
-    handler(this: rollup0.TransformPluginContext, code: string, id: string): Promise<{
+    handler(this: TransformPluginContext, code: string, id: string, transformOptions: {
+      ssr?: boolean | undefined;
+      attributes?: Record<string, string>;
+    } | undefined): Promise<{
       code: string;
       map: magic_string0.SourceMap | null;
     } | undefined>;
@@ -25,6 +29,7 @@ declare function concurrentTopLevelAwait(options?: {
   resolveImportMeta(this: rollup0.PluginContext, property: string | null, {
     moduleId
   }: {
+    attributes: Record<string, string>;
     chunkId: string;
     format: rollup0.InternalModuleFormat;
     moduleId: string;

package/dist/index.mjs

@@ -243,13 +243,20 @@ function getNames(pattern) {
 
 //#endregion
 //#region src/index.ts
+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: {}
+	});
+}
 function concurrentTopLevelAwait(options = {}) {
 	const filter = createFilter(options.include, options.exclude);
 	const asyncTracker = new AsyncModuleTracker();
 	return {
 		name: "rollup-plugin-concurrent-tla-plugin",
 		apply: "build",
-		transform: { async handler(code, id) {
+		transform: { async handler(code, id, transformOptions) {
 			if (!filter(id)) return;
 			const ast = this.parse(code);
 			const importDeclarations = ast.body.filter((a) => a.type === "ImportDeclaration");
@@ -258,14 +265,14 @@ function concurrentTopLevelAwait(options = {}) {
 			if (hasAwait) asyncTracker.setDependencies(id, []);
 			else {
 				const childrenIds = (await Promise.all(importDeclarations.map(async (declaration) => {
-					const importId = await this.resolve(declaration.source.value, id);
+					const importId = await resolveDeclarationSource(this, id, transformOptions?.attributes, declaration);
 					if (!importId || !filter(importId.id)) return null;
 					return importId.id;
 				}))).filter((a) => a != null);
 				asyncTracker.setDependencies(id, childrenIds);
 			}
 			const asyncImports = (await Promise.all(importDeclarations.map(async (declaration) => {
-				const importId = await this.resolve(declaration.source.value, id);
+				const importId = await resolveDeclarationSource(this, id, transformOptions?.attributes, declaration);
 				if (!importId || !filter(importId.id)) return null;
 				this.load(importId);
 				if (!await asyncTracker.isAsync(importId.id)) return null;
@@ -282,9 +289,9 @@ function concurrentTopLevelAwait(options = {}) {
 		resolveImportMeta(property, { moduleId }) {
 			if (property !== "useTla") return;
 			const moduleInfo = this.getModuleInfo(moduleId);
-			const importers = moduleInfo?.importers;
-			if (moduleInfo?.isEntry || !importers?.length) return "true";
-			if (importers.some((id) => !filter(id))) return "true";
+			if (moduleInfo?.isEntry) return "true";
+			if (moduleInfo?.dynamicImporters.length) return "true";
+			if ((moduleInfo?.importers)?.some((id) => !filter(id))) return "true";
 			return "false";
 		}
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup-plugin-concurrent-top-level-await",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Rollup (and Vite) plugin enabling concurrent execution of modules that contain top level await.",
   "keywords": [
     "rollup-plugin",
@@ -46,7 +46,8 @@
   },
   "devDependencies": {
     "@types/estree": "^1.0.8",
-    "prettier": "3.7.4"
+    "prettier": "3.7.4",
+    "rollup": "^4.57.1"
   },
   "scripts": {
     "build": "tsdown --dts"