@astroscope/node 2.1.1 → 3.1.0

package/dist/index.js

@@ -1,33 +1,33 @@
 import { n as setBootContext } from "./context-Bkg-FnnQ.js";
-import { a as runShutdown, i as createRequestInstrumentation, o as runStartup, t as preparePlatform } from "./prepare-CXZsyAVk.js";
+import { a as createRequestInstrumentation, n as preparePlatform, o as runShutdown, s as runStartup, t as redirectDuplicateSlashes } from "./duplicate-slashes-C6hmOLl9.js";
 import { n as dispatchNativeMount, t as clearNativeMounts } from "./native-mount-DjYEnO4X.js";
 import { n as getCurrentGeneration, r as incrementGeneration, t as GEN_HEADER } from "./generation-Bp2IA0jf.js";
-import { r as RECOMMENDED_EXCLUDES } from "./excludes-pE23EbmQ.js";
+import { r as RECOMMENDED_EXCLUDES, s as serializeExcludePatterns } from "./excludes-10eDopVB.js";
+import { n as routeEntrypoints, r as stripQuery, t as collectRouteIslands } from "./route-islands-B53rE5MH.js";
 import { i as registerIslandEmitter } from "./emitters-C20tjKLp.js";
-import { t as getRequestRouteData } from "./route-store-DdxGePj2.js";
+import { t as getRequestRouteData } from "./route-store-DVSmOa34.js";
 import fs, { readFileSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { defined } from "@entwico/dash";
 import { parse } from "@astrojs/compiler-rs";
-import { Parser } from "acorn";
-import MagicString from "magic-string";
 //#region src/dev-mode/island-warmup.ts
 function isAstNode(value) {
 	return typeof value === "object" && value !== null && typeof value.type === "string";
 }
-function walk$1(node, visit) {
+function walk(node, visit) {
 	if (Array.isArray(node)) {
-		for (const item of node) walk$1(item, visit);
+		for (const item of node) walk(item, visit);
 		return;
 	}
 	if (typeof node !== "object" || node === null) return;
 	if (isAstNode(node)) visit(node);
-	for (const value of Object.values(node)) walk$1(value, visit);
+	for (const value of Object.values(node)) walk(value, visit);
 }
 /** local binding name → import specifier, from the frontmatter program */
 function collectImports(program) {
 	const imports = /* @__PURE__ */ new Map();
-	walk$1(program, (node) => {
+	walk(program, (node) => {
 		if (node.type !== "ImportDeclaration") return;
 		const decl = node;
 		if (decl.importKind === "type") return;
@@ -68,7 +68,7 @@ function scanAstroSource(source) {
 	const imports = collectImports(root.frontmatter?.program);
 	if (imports.size === 0) return [];
 	const specifiers = /* @__PURE__ */ new Set();
-	walk$1(root.body, (node) => {
+	walk(root.body, (node) => {
 		if (node.type !== "JSXOpeningElement") return;
 		const element = node;
 		if (!hasClientDirective(element.attributes)) return;
@@ -568,23 +568,16 @@ function createDevMachinery(options) {
 		}
 	}];
 }
-//#endregion
-//#region src/excludes/serialize.ts
-/**
-* Serialize exclude patterns to JavaScript code for use in virtual modules.
-* Handles RegExp objects which JSON.stringify cannot serialize.
-*/
-function serializeExcludePatterns(patterns) {
-	return `[${patterns.map((p) => "pattern" in p ? `{ pattern: ${p.pattern.toString()} }` : JSON.stringify(p)).join(", ")}]`;
-}
 const RESOLVED_ISLANDS_VIRTUAL_MODULE_ID = `\0virtual:@astroscope/node/islands-manifest`;
 const MANIFEST_FILE_NAME = "islands-manifest.json";
 /**
-* Client-build side of island preloading: records the chunk import graph (direct
-* static and dynamic edges per chunk), embeds the gate runtime source (inlined
-* into documents rather than shipped as an asset — an external fetch would
-* install the gates a round-trip after astro's inline island machinery), and
-* drops the manifest next to the server chunks, mirroring the i18n manifest.
+* Build side of island preloading: the server build attributes islands to routes
+* (its module graph is the only place a page's components are visible together),
+* the client build records the chunk import graph (direct static and dynamic edges
+* per chunk), embeds the gate runtime source (inlined into documents rather than
+* shipped as an asset — an external fetch would install the gates a round-trip
+* after astro's inline island machinery), and drops the manifest next to the
+* server chunks, mirroring the i18n manifest.
 *
 * The client build runs after the server build, so the SSR bundle can only carry
 * code that reads the file lazily; in dev there is no manifest and the middleware
@@ -592,6 +585,7 @@ const MANIFEST_FILE_NAME = "islands-manifest.json";
 */
 function createIslandsManifestPlugin(options) {
 	let isBuild = false;
+	const routeIslands = /* @__PURE__ */ new Map();
 	return {
 		name: "@astroscope/node/islands-manifest",
 		configResolved(config) {
@@ -628,21 +622,31 @@ for (const candidate of [
 export { manifest };
 `;
 		},
+		async generateBundle() {
+			if (!options.enabled || this.environment.name === "client") return;
+			const { routes } = await collectRouteIslands(this, options.pages());
+			for (const [pattern, islands] of routes) routeIslands.set(pattern, islands);
+		},
 		writeBundle(outputOptions, bundle) {
 			if (!options.enabled || this.environment.name !== "client" || !outputOptions.dir) return;
 			const chunks = {};
+			const entryByComponent = /* @__PURE__ */ new Map();
 			for (const chunk of Object.values(bundle)) {
 				if (chunk.type !== "chunk") continue;
 				chunks[chunk.fileName] = {
 					...chunk.imports.length > 0 && { i: chunk.imports },
 					...chunk.dynamicImports.length > 0 && { d: chunk.dynamicImports }
 				};
+				if (chunk.isEntry && chunk.facadeModuleId) entryByComponent.set(stripQuery(chunk.facadeModuleId), chunk.fileName);
 			}
+			const routes = {};
+			for (const [pattern, islands] of routeIslands) routes[pattern] = [...islands].map((component) => entryByComponent.get(component)).filter(defined);
 			const runtimeSource = fs.readFileSync(new URL("./islands-runtime.iife.js", import.meta.url), "utf-8").trim();
 			if (runtimeSource.toLowerCase().includes("<\/script")) throw new Error("islands gate runtime must not contain \"<\/script\"");
 			const manifest = {
 				runtimeSource,
-				chunks
+				chunks,
+				routes
 			};
 			const chunksDir = path.resolve(outputOptions.dir, "..", "server", "chunks");
 			if (fs.existsSync(chunksDir)) fs.writeFileSync(path.join(chunksDir, MANIFEST_FILE_NAME), JSON.stringify(manifest));
@@ -671,94 +675,6 @@ function ssrSourcemapPlugin() {
 	};
 }
 //#endregion
-//#region src/tweaks/strip-effects.ts
-const HOOK_NAMES = /* @__PURE__ */ new Set([
-	"useEffect",
-	"useLayoutEffect",
-	"useInsertionEffect"
-]);
-const REACT_SOURCE = /^react(\/.*)?$/;
-const TRANSFORMABLE = /\.(?:[mc]?[jt]sx?)$/;
-const EMPTY_FN = "(()=>{})";
-/**
-* in SSR builds, react effect hooks never execute. emptying their callbacks
-* lets rolldown drop dead branches — including dynamic imports of client-only
-* libs (maplibre-gl, hls.js, etc.) — from the server bundle, which in turn
-* stops nft from tracing them at docker-image time.
-*
-* scope is deliberately narrow: first-party code only (no node_modules), only
-* in the SSR pass, and binding-aware (the React import must resolve to the
-* real react package). raw chunks where bundling has erased the binding are
-* left alone — that's NFT's domain, not ours.
-*/
-function stripSsrEffectsPlugin() {
-	return {
-		name: "@astroscope/node/tweaks/strip-effects",
-		enforce: "post",
-		transform(code, id, options) {
-			if (!options?.ssr) return null;
-			if (id.includes("/node_modules/")) return null;
-			const cleanId = id.split("?")[0] ?? id;
-			if (!TRANSFORMABLE.test(cleanId)) return null;
-			if (!code.includes("useEffect") && !code.includes("useLayoutEffect") && !code.includes("useInsertionEffect")) return null;
-			let ast;
-			try {
-				ast = Parser.parse(code, {
-					ecmaVersion: "latest",
-					sourceType: "module",
-					allowReturnOutsideFunction: true,
-					allowAwaitOutsideFunction: true,
-					allowImportExportEverywhere: true,
-					allowHashBang: true
-				});
-			} catch {
-				return null;
-			}
-			const directHooks = /* @__PURE__ */ new Set();
-			const namespaceHooks = /* @__PURE__ */ new Set();
-			walk(ast, (node) => {
-				if (node.type !== "ImportDeclaration") return;
-				const src = node.source?.value;
-				if (typeof src !== "string" || !REACT_SOURCE.test(src)) return;
-				for (const spec of node.specifiers ?? []) if (spec.type === "ImportSpecifier") {
-					const imported = spec.imported?.name ?? spec.imported?.value;
-					if (HOOK_NAMES.has(imported)) directHooks.add(spec.local.name);
-				} else if (spec.type === "ImportDefaultSpecifier" || spec.type === "ImportNamespaceSpecifier") namespaceHooks.add(spec.local.name);
-			});
-			if (directHooks.size === 0 && namespaceHooks.size === 0) return null;
-			const replacements = [];
-			walk(ast, (node) => {
-				if (node.type !== "CallExpression" || !node.arguments?.length) return;
-				const callee = node.callee;
-				const isDirect = callee.type === "Identifier" && directHooks.has(callee.name);
-				const isMember = callee.type === "MemberExpression" && !callee.computed && callee.object?.type === "Identifier" && namespaceHooks.has(callee.object.name) && callee.property?.type === "Identifier" && HOOK_NAMES.has(callee.property.name);
-				if (!isDirect && !isMember) return;
-				const arg = node.arguments[0];
-				replacements.push({
-					start: arg.start,
-					end: arg.end
-				});
-			});
-			if (replacements.length === 0) return null;
-			const s = new MagicString(code);
-			for (const { start, end } of replacements) s.overwrite(start, end, EMPTY_FN);
-			return {
-				code: s.toString(),
-				map: s.generateMap({ hires: true }).toString()
-			};
-		}
-	};
-}
-function walk(node, visit) {
-	if (!node || typeof node !== "object") return;
-	if (typeof node.type === "string") visit(node);
-	for (const key of Object.keys(node)) {
-		const v = node[key];
-		if (Array.isArray(v)) for (const item of v) walk(item, visit);
-		else if (v && typeof v === "object") walk(v, visit);
-	}
-}
-//#endregion
 //#region src/integration/integration.ts
 const CONFIG_VIRTUAL_MODULE_ID = "virtual:@astroscope/node/config";
 const BOOT_VIRTUAL_MODULE_ID = "virtual:@astroscope/node/boot";
@@ -813,6 +729,7 @@ function node(options = {}) {
 	const loggingExclude = loggingOptions ? loggingOptions.exclude ?? DEFAULT_REQUEST_EXCLUDES : [];
 	const telemetryExclude = telemetryOptions ? telemetryOptions.exclude ?? DEFAULT_REQUEST_EXCLUDES : [];
 	let astroConfig = null;
+	let resolvedRoutes = [];
 	let bootEntry;
 	let configSeam;
 	let instrumentationSeam;
@@ -845,7 +762,7 @@ function node(options = {}) {
 				const devMachinery = command === "dev" && bootOptions !== false ? createDevMachinery({
 					entry: bootEntry ? path.relative(root, bootEntry) : void 0,
 					watch,
-					watchEntries: [relativeSeam(configSeam), relativeSeam(logSeam)].filter((entry) => !!entry),
+					watchEntries: [relativeSeam(configSeam), relativeSeam(logSeam)].filter(defined),
 					prepare: (importModule) => preparePlatform({
 						dev: true,
 						telemetry: telemetryOptions && telemetryOptions.dev ? { prometheus: telemetryOptions.prometheus ?? {} } : false,
@@ -891,10 +808,10 @@ function node(options = {}) {
 						...islandWarmup,
 						createIslandsManifestPlugin({
 							logger,
-							enabled: islandsEnabled
+							enabled: islandsEnabled,
+							pages: () => routeEntrypoints(root, resolvedRoutes)
 						}),
 						ssrSourcemapPlugin(),
-						stripSsrEffectsPlugin(),
 						{
 							name: "@astroscope/node",
 							configEnvironment(environmentName) {
@@ -951,6 +868,7 @@ function node(options = {}) {
 				}) : void 0;
 				server.middlewares.use((req, res, next) => {
 					const inner = () => {
+						if (redirectDuplicateSlashes(req, res)) return;
 						if (!dispatchNativeMount(req, res)) next();
 					};
 					if (instrument) instrument(req, res, inner);
@@ -978,14 +896,17 @@ function node(options = {}) {
 					}
 				});
 			},
+			"astro:routes:resolved": ({ routes }) => {
+				resolvedRoutes = routes;
+			},
 			"astro:build:done": async ({ logger }) => {
 				if (!astroConfig) return;
 				if (islandsEnabled) {
 					const manifestPath = path.join(fileURLToPath(astroConfig.build.server), "chunks", "islands-manifest.json");
 					if (fs.existsSync(manifestPath)) {
-						const { transformPrerenderedHtml } = await import("./prerendered-DVjzWNbW.js");
+						const { transformPrerenderedHtml } = await import("./prerendered-Z-Qi-FFK.js");
 						const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
-						const transformed = await transformPrerenderedHtml(fileURLToPath(astroConfig.build.client), manifest);
+						const transformed = transformPrerenderedHtml(fileURLToPath(astroConfig.build.client), manifest);
 						if (transformed > 0) logger.info(`island preloading applied to ${transformed} prerendered page(s)`);
 					}
 				}