From 29da012350ee40cd3a26699fcdddb291d651511e Mon Sep 17 00:00:00 2001
From: Goulven Clec'h <goulven.clech@protonmail.com>
Date: Thu, 25 Apr 2024 18:20:07 +0200
Subject: [PATCH] internals: getPageDatasByHoistedScriptId &
 getPagesDatasByComponent

---
 packages/astro/src/core/build/internal.ts     | 40 ++++++++++---------
 .../src/core/build/plugins/plugin-css.ts      |  3 +-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/packages/astro/src/core/build/internal.ts b/packages/astro/src/core/build/internal.ts
index 3786002550..952ea2c343 100644
--- a/packages/astro/src/core/build/internal.ts
+++ b/packages/astro/src/core/build/internal.ts
@@ -233,17 +233,19 @@ export function getPageData(
 }
 
 /**
- * TODO: remove this function, obsolete.
- * last usage in astro/packages/astro/src/core/build/generate.ts
+ * Get all pages datas from the build internals, using a specific component.
+ * @param internals Build Internals with all the pages
+ * @param component path to the component, used to identify related pages
  */
-export function getPageDataByComponent(
+export function getPagesDatasByComponent(
 	internals: BuildInternals,
 	component: string
-): PageBuildData | undefined {
-	if (internals.pagesByKeys.has(component)) {
-		return internals.pagesByKeys.get(component);
-	}
-	return undefined;
+): PageBuildData[] {
+	const pageDatas: PageBuildData[] = [];
+		Array.from(internals.pagesByKeys.values()).forEach((pageData) => {
+			if (component === pageData.component) pageDatas.push(pageData);
+	})
+	return pageDatas;
 }
 
 /**
@@ -360,21 +362,23 @@ export function mergeInlineCss(
 	return acc;
 }
 
-export function isHoistedScript(internals: BuildInternals, id: string): boolean {
-	return internals.hoistedScriptIdToPagesMap.has(id);
-}
-
-export function* getPageDatasByHoistedScriptId(
+/**
+ * Get all pages data from the build internals, using a specific hoisted script id.
+ * @param internals Build Internals with all the pages
+ * @param id Hoisted script id, used to identify the pages using it
+ */
+export function getPageDatasByHoistedScriptId(
 	internals: BuildInternals,
 	id: string
-): Generator<PageBuildData, void, unknown> {
+): PageBuildData[]{
 	const set = internals.hoistedScriptIdToPagesMap.get(id);
+	const pageDatas: PageBuildData[] = [];
 	if (set) {
 		for (const pageId of set) {
-			const pageData = getPageDataByComponent(internals, pageId.slice(1));
-			if (pageData) {
-				yield pageData;
-			}
+			getPagesDatasByComponent(internals, pageId.slice(1)).forEach((pageData) => {
+				pageDatas.push(pageData);
+			});
 		}
 	}
+	return pageDatas;
 }
diff --git a/packages/astro/src/core/build/plugins/plugin-css.ts b/packages/astro/src/core/build/plugins/plugin-css.ts
index e435578a22..3e35a9bb09 100644
--- a/packages/astro/src/core/build/plugins/plugin-css.ts
+++ b/packages/astro/src/core/build/plugins/plugin-css.ts
@@ -18,7 +18,6 @@ import {
 	getPageDataByViteID,
 	getPageDatasByClientOnlyID,
 	getPageDatasByHoistedScriptId,
-	isHoistedScript,
 } from '../internal.js';
 import { extendManualChunks, shouldInlineAsset } from './util.js';
 
@@ -161,7 +160,7 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
 							if (pageData) {
 								appendCSSToPage(pageData, meta, pagesToCss, depth, order);
 							}
-						} else if (options.target === 'client' && isHoistedScript(internals, pageInfo.id)) {
+						} else if (options.target === 'client' && internals.hoistedScriptIdToPagesMap.has(pageInfo.id)) {
 							for (const pageData of getPageDatasByHoistedScriptId(internals, pageInfo.id)) {
 								appendCSSToPage(pageData, meta, pagesToCss, -1, order);
 							}