@markless/router 0.1.0 → 0.2.0

package/dist/typescript-plugin.js

@@ -15,12 +15,13 @@ function init(modules) {
 		const projectRoot = getProjectRoot(typeScript, info);
 		const pagesDir = resolvePagesDir(getConfiguredProjectRoot(info) ?? projectRoot, pluginConfig);
 		proxy.getCompletionsAtPosition = (fileName, position, options, formattingSettings) => {
-			return withRouteHrefCompletions(typeScript, info, pagesDir, languageService.getCompletionsAtPosition(fileName, position, options, formattingSettings));
+			return withRouteHrefCompletions(typeScript, info, pagesDir, fileName, position, languageService.getCompletionsAtPosition(fileName, position, options, formattingSettings));
 		};
 		return proxy;
 	} };
 }
-function withRouteHrefCompletions(typeScript, info, pagesDir, completions) {
+function withRouteHrefCompletions(typeScript, info, pagesDir, fileName, position, completions) {
+	if (!isRouteHrefCompletionContext(typeScript, info, fileName, position)) return completions;
 	const routeHrefs = routeHrefCompletions(typeScript, info, pagesDir);
 	if (routeHrefs.length === 0) return completions;
 	const baseCompletions = completions ?? emptyCompletionInfo();
@@ -36,6 +37,95 @@ function withRouteHrefCompletions(typeScript, info, pagesDir, completions) {
 		entries: [...routeEntries, ...baseCompletions.entries.filter((entry) => !routeHrefSet.has(entry.name))]
 	};
 }
+function isRouteHrefCompletionContext(typeScript, info, fileName, position) {
+	if (extname(fileName).toLowerCase() === ".tsrx") {
+		const snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
+		if (!snapshot || position < 0 || position > snapshot.getLength()) return false;
+		const source = snapshot.getText(0, snapshot.getLength());
+		return isInsideStringLikeToken(typeScript, source, position) || isInsideHrefAttributeInitializer(source, position);
+	}
+	const sourceFile = info.languageService.getProgram()?.getSourceFile(fileName);
+	if (!sourceFile || position < 0 || position > sourceFile.getFullText().length) return false;
+	const node = deepestNodeAtPosition(sourceFile, position);
+	if (node && isStringLikeNode(typeScript, node)) return true;
+	for (let current = node; current; current = current.parent) {
+		if (!typeScript.isJsxAttribute(current) || current.name.getText(sourceFile) !== "href") continue;
+		const initializer = current.initializer;
+		return Boolean(initializer && initializer.getStart(sourceFile) <= position && position <= initializer.end);
+	}
+	return isInsideHrefAttributeInitializer(sourceFile.getFullText(), position);
+}
+function isInsideStringLikeToken(typeScript, source, position) {
+	const scanner = typeScript.createScanner(typeScript.ScriptTarget.Latest, false, typeScript.LanguageVariant.JSX, source);
+	const stringLikeTokens = new Set([
+		typeScript.SyntaxKind.StringLiteral,
+		typeScript.SyntaxKind.NoSubstitutionTemplateLiteral,
+		typeScript.SyntaxKind.TemplateHead,
+		typeScript.SyntaxKind.TemplateMiddle,
+		typeScript.SyntaxKind.TemplateTail
+	]);
+	for (let token = scanner.scan(); token !== typeScript.SyntaxKind.EndOfFileToken; token = scanner.scan()) {
+		const start = scanner.getTokenPos();
+		const end = scanner.getTextPos();
+		if (position < start) return false;
+		if (stringLikeTokens.has(token) && start < position) {
+			if (position < end || position === end && scanner.isUnterminated()) return true;
+		}
+		if (position < end) return false;
+	}
+	return false;
+}
+function isInsideHrefAttributeInitializer(source, position) {
+	const tagStart = openJsxTagStartAtPosition(source, position);
+	if (tagStart === void 0) return false;
+	const prefix = source.slice(tagStart + 1, position);
+	return /(?:^|\s)href\s*=\s*(?:\{(?:[^{}]|\{[^{}]*\})*|[^\s>]*)$/s.test(prefix);
+}
+function openJsxTagStartAtPosition(source, position) {
+	let tagStart;
+	let braceDepth = 0;
+	let quote;
+	let escaped = false;
+	for (let index = 0; index < position; index += 1) {
+		const character = source[index];
+		if (quote) {
+			if (escaped) escaped = false;
+			else if (character === "\\") escaped = true;
+			else if (character === quote) quote = void 0;
+			continue;
+		}
+		if (character === "'" || character === "\"" || character === "`") {
+			quote = character;
+			continue;
+		}
+		if (tagStart === void 0 && character === "<") {
+			const next = source[index + 1];
+			if (next && /[A-Za-z_$/{>]/.test(next)) {
+				tagStart = index;
+				braceDepth = 0;
+			}
+			continue;
+		}
+		if (tagStart === void 0) continue;
+		if (character === "{") braceDepth += 1;
+		else if (character === "}" && braceDepth > 0) braceDepth -= 1;
+		else if (character === ">" && braceDepth === 0) tagStart = void 0;
+	}
+	return tagStart;
+}
+function deepestNodeAtPosition(sourceFile, position) {
+	let deepest;
+	const visit = (node) => {
+		if (position < node.getFullStart() || position > node.end) return;
+		deepest = node;
+		node.forEachChild(visit);
+	};
+	visit(sourceFile);
+	return deepest;
+}
+function isStringLikeNode(typeScript, node) {
+	return typeScript.isStringLiteral(node) || typeScript.isNoSubstitutionTemplateLiteral(node) || node.kind === typeScript.SyntaxKind.TemplateHead || node.kind === typeScript.SyntaxKind.TemplateMiddle || node.kind === typeScript.SyntaxKind.TemplateTail;
+}
 function emptyCompletionInfo() {
 	return {
 		isGlobalCompletion: false,

package/dist/vite/runtime/create-route-discovery.js

@@ -1,4 +1,4 @@
-import { i as normalizeRouteFileId } from "../../route-manifest-OTaWQ_TC.js";
+import { i as normalizeRouteFileId } from "../../route-manifest-DPgGIyrS.js";
 //#region src/vite/runtime/create-route-discovery.ts
 function createRouteDiscovery(discoveredPageModuleLoaders) {
 	const pageModuleLoaders = Object.fromEntries(Object.entries(discoveredPageModuleLoaders).map(([file, loader]) => [normalizeRouteFileId(file), loader]));

package/dist/vite/runtime/create-server-entry.d.ts

@@ -2,10 +2,12 @@ import { ModulePreloadInput } from "@markless/web/render-to-string";
 
 //#region src/vite/runtime/create-server-entry.d.ts
 interface ServerEntryOptions {
+  readonly dev?: boolean;
   readonly navigationEntryPath?: string;
   readonly resumeEntryPath?: string;
   readonly routeModulePreloads?: Record<string, readonly ModulePreloadInput[]>;
   readonly routeSsrModulePreloads?: Record<string, readonly ModulePreloadInput[]>;
+  readonly routeStylesheets?: Record<string, readonly string[]>;
   readonly documentModuleLoader: (() => Promise<unknown>) | undefined;
   readonly pageModuleLoaders: Record<string, () => Promise<unknown>>;
   readonly routeFileIds: readonly string[];

package/dist/vite/runtime/create-server-entry.js

@@ -1,10 +1,13 @@
-import { n as matchRouteManifest, t as buildRouteManifestFromFileIds } from "../../route-manifest-OTaWQ_TC.js";
+import { t as __marklessDebugBootstrapSource } from "../../debug-channel-C7v9u5SM.js";
+import { i as normalizeRouteFileId, n as matchRouteManifest, t as buildRouteManifestFromFileIds } from "../../route-manifest-DPgGIyrS.js";
 import { renderToString } from "@markless/web/render-to-string";
 import { renderToStream } from "@markless/web/render-to-stream";
+import { normalizeMarklessDevError, renderMarklessDevErrorDocument } from "@markless/bundler/dev-error";
 //#region src/vite/runtime/create-server-entry.ts
 const DOCUMENT_CHILDREN_PLACEHOLDER = "__markless_router_document_children__";
 function createServerEntry(options) {
 	const manifest = buildRouteManifestFromFileIds(options.routeFileIds);
+	assertCurrentRouteAssets(options);
 	async function fetch(request) {
 		const url = new URL(request.url);
 		if (isNitroApiPathname(url.pathname)) return new Response("Not found", { status: 404 });
@@ -14,7 +17,37 @@ function createServerEntry(options) {
 			return await renderPage(url, match.route.file, match.params, 200);
 		} catch (error) {
 			console.error("[markless-router] page render failed:", error);
-			return renderStatusPage(url, manifest.statusPages.error, 500, "Internal Server Error");
+			if (options.dev) return renderDevelopmentError(url, error);
+			try {
+				return await renderStatusPage(url, manifest.statusPages.error, 500, "Internal Server Error");
+			} catch (errorPageError) {
+				console.error("[markless-router] error page render failed:", errorPageError);
+				return new Response("Internal Server Error", {
+					status: 500,
+					headers: { "content-type": "text/plain;charset=utf-8" }
+				});
+			}
+		}
+	}
+	function renderDevelopmentError(url, error) {
+		const headers = {
+			"cache-control": "no-store",
+			"content-type": "text/html;charset=utf-8"
+		};
+		try {
+			const payload = normalizeMarklessDevError(error, { id: `navigation:${url.pathname}` });
+			return new Response(renderMarklessDevErrorDocument(payload), {
+				status: 500,
+				headers
+			});
+		} catch {
+			return new Response(escapeHtml(flattenError(error)), {
+				status: 500,
+				headers: {
+					...headers,
+					"content-type": "text/plain;charset=utf-8"
+				}
+			});
 		}
 	}
 	async function renderStatusPage(url, file, status, fallbackText) {
@@ -46,14 +79,14 @@ function createServerEntry(options) {
 				headers
 			});
 		}
-		const pageArtifact = routedPageArtifact(renderSsr, baseArtifact, pageProps, file, options.navigationEntryPath);
+		const pageArtifact = routedPageArtifact(renderSsr, baseArtifact, pageProps, file, options.navigationEntryPath, options.routeStylesheets?.[file]);
 		const renderOptions = {
 			props: pageProps,
 			resumeModuleUrl: options.resumeEntryPath ?? baseArtifact?.resumeModuleUrl,
 			modulePreloads: (html) => modulePreloadsForPage(file, html, pageProps.url.href, manifest, options.routeModulePreloads, options.routeSsrModulePreloads)
 		};
 		if (options.render === "blocking") {
-			const pageHtml = splitLeadingModulePreloadLinks(await renderToString(pageArtifact, renderOptions));
+			const pageHtml = splitLeadingHeadHtml(await renderToString(pageArtifact, renderOptions));
 			const shell = await renderDocumentShell(documentModule, pageProps, pageHtml.headHtml);
 			return new Response(fillDocumentChildren(shell, pageHtml.bodyHtml), {
 				status,
@@ -61,7 +94,7 @@ function createServerEntry(options) {
 			});
 		}
 		const stream = await renderToStream(pageArtifact, renderOptions);
-		const pageHtml = splitLeadingModulePreloadLinks(stream.shell);
+		const pageHtml = splitLeadingHeadHtml(stream.shell);
 		const shell = await renderDocumentShell(documentModule, pageProps, pageHtml.headHtml);
 		if (stream.pendingArmCount === 0) return new Response(fillDocumentChildren(shell, pageHtml.bodyHtml), {
 			status,
@@ -90,9 +123,38 @@ function createServerEntry(options) {
 	}
 	return { fetch };
 }
-function routedPageArtifact(renderSsr, baseArtifact, pageProps, file, navigationEntryPath) {
+function flattenError(error) {
+	if (error instanceof Error) return error.message;
+	if (typeof error === "object" && error !== null && "message" in error && typeof error.message === "string") return error.message;
+	return String(error);
+}
+function assertCurrentRouteAssets(options) {
+	if (options.routeStylesheets === void 0) return;
+	const routeMaps = [
+		["navigation", options.routeModulePreloads ?? {}],
+		["SSR", options.routeSsrModulePreloads ?? {}],
+		["style", options.routeStylesheets]
+	];
+	const expected = [...new Set(options.routeFileIds.map(normalizeRouteFileId))].filter((file) => /^pages\/.+\.(?:tsrx|mdx)$/.test(file)).toSorted();
+	for (const [label, routes] of routeMaps) {
+		const actual = Object.keys(routes).toSorted();
+		if (JSON.stringify(actual) !== JSON.stringify(expected)) throw new Error(`Markless Router ${label} client-asset routes are stale; expected ${JSON.stringify(expected)}, received ${JSON.stringify(actual)}. Rebuild the client environment before the server environment.`);
+	}
+}
+function routedPageArtifact(renderSsr, baseArtifact, pageProps, file, navigationEntryPath, stylesheetHrefs) {
+	const headInjections = [...baseArtifact?.headInjections ?? [], ...(stylesheetHrefs ?? []).map((href) => ({
+		tag: "link",
+		location: "head",
+		attributes: {
+			rel: "stylesheet",
+			href
+		}
+	}))];
 	return {
 		resumeModuleUrl: baseArtifact?.resumeModuleUrl,
+		inlineResumerSources: baseArtifact?.inlineResumerSources,
+		storageSeeds: baseArtifact?.storageSeeds,
+		...headInjections.length > 0 ? { headInjections } : {},
 		async renderSsr(renderProps, renderContext) {
 			const output = await renderSsr(renderProps ?? pageProps, renderContext);
 			if (!output) return { html: "" };
@@ -156,20 +218,15 @@ function addModulePreloads(preloads, seen, items) {
 		preloads.push(preload);
 	}
 }
-function splitLeadingModulePreloadLinks(html) {
-	let bodyHtml = html;
-	const links = [];
-	while (bodyHtml.startsWith("<link ")) {
-		const end = bodyHtml.indexOf(">");
-		if (end === -1) break;
-		const link = bodyHtml.slice(0, end + 1);
-		if (!link.includes("rel=\"modulepreload\"")) break;
-		links.push(link);
-		bodyHtml = bodyHtml.slice(end + 1);
-	}
+function splitLeadingHeadHtml(html) {
+	const containerStart = html.indexOf("<div data-async-container");
+	if (containerStart <= 0) return {
+		bodyHtml: html,
+		headHtml: ""
+	};
 	return {
-		bodyHtml,
-		headHtml: links.join("")
+		bodyHtml: html.slice(containerStart),
+		headHtml: html.slice(0, containerStart)
 	};
 }
 async function renderDocumentShell(documentModule, pageProps, headHtml) {
@@ -216,7 +273,20 @@ function renderRouteScript(file) {
 	return `<script type="@markless/core/route">${escapeScriptJson({ file })}<\/script>`;
 }
 function renderLinkBridgeScript(resumeEntryPath) {
-	return `<script data-markless-router-link-resumer>${escapeInlineScript(`(() => {
+	const debugBootstrap = typeof __MARKLESS_DEBUG_ENABLED__ !== "undefined" && __MARKLESS_DEBUG_ENABLED__ ? `<script data-markless-router-debug-bootstrap>${escapeInlineScript(`(() => {
+	const d = document;
+	const s = d.currentScript;
+	const r = s && s.closest('[data-async-container]');
+	if (!r) return;
+	try { globalThis[Symbol.for('markless.debug.channel.v1.bootstrap')] = ${__marklessDebugBootstrapSource()}(r, 'ssr-inline', false); } catch {}
+})();`)}<\/script>` : "";
+	const debugRegistration = typeof __MARKLESS_DEBUG_ENABLED__ !== "undefined" && __MARKLESS_DEBUG_ENABLED__ ? `
+	try {
+		const key = Symbol.for('markless.debug.channel.v1.bootstrap');
+		const md = globalThis[key];
+		if (md) { md.router('ssr-link-bridge'); md.activate(); }
+	} catch {}` : "";
+	return `${debugBootstrap}<script data-markless-router-link-resumer>${escapeInlineScript(`(() => {
 	const d = document;
 	const s = d.currentScript;
 	const r = s && s.closest('[data-async-container]');
@@ -266,7 +336,7 @@ function renderLinkBridgeScript(resumeEntryPath) {
 			setTimeout(() => { throw error; });
 			location.assign(url.href);
 		}
-	}, true);
+	}, true);${debugRegistration}
 })();`)}<\/script>`;
 }
 function htmlAttributes(documentModule, pageProps) {