@markless/router 0.6.0 → 0.7.0

package/dist/{create-server-entry-DaYssO9x.js → create-server-entry-yboa-2m6.js}

@@ -1,4 +1,4 @@
-import { a as ROUTE_SCRIPT_TYPE, c as PREFETCH_ATTRIBUTE, i as HTML_ATTRIBUTES_SLOT, l as REPLACE_ATTRIBUTE, n as requestLocals, r as takeMiddlewareHeaders, s as LINK_ATTRIBUTE, u as SCROLL_ATTRIBUTE } from "./request-locals-z3rJTizs.js";
+import { a as ROUTE_SCRIPT_TYPE, c as servedHtmlAttributesScript, d as REPLACE_ATTRIBUTE, f as SCROLL_ATTRIBUTE, i as HTML_ATTRIBUTES_SLOT, l as LINK_ATTRIBUTE, n as requestLocals, o as SERVED_HTML_ATTRIBUTES_PROPERTY, r as takeMiddlewareHeaders, u as PREFETCH_ATTRIBUTE } from "./request-locals-BDAhNpEa.js";
 import { i as matchRouteManifest, n as buildRouteManifestFromFileIds, o as normalizeRouteFileId } from "./route-manifest-DMizh42B.js";
 import { n as __marklessDebugBootstrapSource } from "./debug-channel-Di6SppZv.js";
 import { CONTAINER_ATTRIBUTE, PROTOCOL_CONTAINER_END_COMMENT, PROTOCOL_CONTAINER_START_COMMENT, PROTOCOL_LOCATOR_PATHS_ATTRIBUTE } from "@markless/web/fns/container-region";
@@ -864,16 +864,17 @@ function createServerEntry(options) {
 			resumeModuleUrl: options.resumeEntryPath ?? baseArtifact?.resumeModuleUrl,
 			modulePreloads: (html, resumes) => landingModulePreloads(resumes ? options.routeSsrModulePreloads?.[file] : void 0, linkBridges?.[html.includes("href=\"#/") ? 1 : 0])
 		};
+		const headStart = (documentLoads && fragmentNavigation && !fragment ? servedHtmlAttributesScript() : "") + (options.importMap ?? "");
 		if (options.render === "blocking") {
 			const pageHtml = splitPageHtml(await renderToString(routedArtifact, renderOptions));
 			privateToVisitor();
-			const shell = await renderDocumentShell(documentModule, pageProps, pageHtml.headHtml, options.importMap);
+			const shell = await renderDocumentShell(documentModule, pageProps, pageHtml.headHtml, headStart);
 			return new Response(wholeDocument(shell, pageHtml, fragment, documentLoads), http.commit(status, headers));
 		}
 		const stream = await renderToStream(routedArtifact, renderOptions);
 		privateToVisitor();
 		const pageHtml = splitPageHtml(stream.shell);
-		const shell = await renderDocumentShell(documentModule, pageProps, pageHtml.headHtml, options.importMap);
+		const shell = await renderDocumentShell(documentModule, pageProps, pageHtml.headHtml, headStart);
 		if (stream.pendingArmCount === 0) return new Response(wholeDocument(shell, pageHtml, fragment, documentLoads), http.commit(status, headers));
 		const placed = placePage(shell, DOCUMENT_CHILDREN_PLACEHOLDER, pageHtml);
 		const prefix = fragment ? fragmentDocument(shell, pageHtml, documentLoads) + FRAGMENT_REGION_END : placed.prefix;
@@ -1269,6 +1270,7 @@ function fragmentConfig(fragment, documentLoads) {
 		replaceAttribute: REPLACE_ATTRIBUTE,
 		scrollAttribute: SCROLL_ATTRIBUTE,
 		routeScriptType: ROUTE_SCRIPT_TYPE,
+		servedHtmlAttributesProperty: SERVED_HTML_ATTRIBUTES_PROPERTY,
 		retireProperty: CONTAINER_RETIRE_PROPERTY,
 		streamExecutorGlobal: STREAM_ARM_EXECUTOR_GLOBAL,
 		streamedArmSelector: STREAMED_ARM_SELECTOR,

package/dist/index.js

@@ -1,4 +1,4 @@
-import { c as PREFETCH_ATTRIBUTE, i as HTML_ATTRIBUTES_SLOT, l as REPLACE_ATTRIBUTE, o as routeMountTarget, s as LINK_ATTRIBUTE, t as rememberRequestLocals, u as SCROLL_ATTRIBUTE } from "./request-locals-z3rJTizs.js";
+import { d as REPLACE_ATTRIBUTE, f as SCROLL_ATTRIBUTE, i as HTML_ATTRIBUTES_SLOT, l as LINK_ATTRIBUTE, s as routeMountTarget, t as rememberRequestLocals, u as PREFETCH_ATTRIBUTE } from "./request-locals-BDAhNpEa.js";
 import { a as normalizeRequestPathname, c as parseRequestFile, i as matchRouteManifest, l as transformRequestFileSource, n as buildRouteManifestFromFileIds, o as normalizeRouteFileId, s as normalizeRequestFileId } from "./route-manifest-DMizh42B.js";
 import { createExternalDelegateStructureTokens, createExternalDelegateView } from "@markless/web/fns/external-delegate";
 import { render } from "@markless/web/render";

package/dist/{request-locals-z3rJTizs.js → request-locals-BDAhNpEa.js}

@@ -8,6 +8,10 @@ const PREFETCH_ATTRIBUTE = "data-markless-router-prefetch";
 //#region src/route-dom.ts
 const ROUTE_SCRIPT_TYPE = "@markless/core/route";
 const HTML_ATTRIBUTES_SLOT = "__marklessRouterHtmlAttributes";
+const SERVED_HTML_ATTRIBUTES_PROPERTY = "__marklessServedHtmlAttributes";
+function servedHtmlAttributesScript() {
+	return `<script>document.documentElement.${SERVED_HTML_ATTRIBUTES_PROPERTY}=document.documentElement.getAttributeNames()<\/script>`;
+}
 function routeMountTarget(document, currentRoot) {
 	const root = currentRoot ?? document.querySelector(`script[type="@markless/core/route"]`)?.parentElement;
 	if (!root) return document.body;
@@ -87,4 +91,4 @@ function takeMiddlewareHeaders(request) {
 	return record.taken;
 }
 //#endregion
-export { ROUTE_SCRIPT_TYPE as a, PREFETCH_ATTRIBUTE as c, HTML_ATTRIBUTES_SLOT as i, REPLACE_ATTRIBUTE as l, requestLocals as n, routeMountTarget as o, takeMiddlewareHeaders as r, LINK_ATTRIBUTE as s, rememberRequestLocals as t, SCROLL_ATTRIBUTE as u };
+export { ROUTE_SCRIPT_TYPE as a, servedHtmlAttributesScript as c, REPLACE_ATTRIBUTE as d, SCROLL_ATTRIBUTE as f, HTML_ATTRIBUTES_SLOT as i, LINK_ATTRIBUTE as l, requestLocals as n, SERVED_HTML_ATTRIBUTES_PROPERTY as o, takeMiddlewareHeaders as r, routeMountTarget as s, rememberRequestLocals as t, PREFETCH_ATTRIBUTE as u };

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

@@ -1,2 +1,2 @@
-import { n as routerLinkBridgeModules, t as createServerEntry } from "../../create-server-entry-DaYssO9x.js";
+import { n as routerLinkBridgeModules, t as createServerEntry } from "../../create-server-entry-yboa-2m6.js";
 export { createServerEntry, routerLinkBridgeModules };

package/dist/vite/runtime/mdx-route.js

@@ -1,5 +1,64 @@
 import { i as protocolStateVersion, n as protocolInstanceQualifies, t as protocolInstancePath } from "../../protocol-constants-B4WxrZAS.js";
 //#endregion
+//#region ../serializer/src/protocol-record-keys.ts
+/** The field names each templated record list may spell, in the order its templates index them. */
+const PROTOCOL_RECORD_KEYS = {
+	"markless/state": {
+		computed: "graphNodeId name async deriveSymbolId value version root $type $ref source flags records id type fields items entries values bytes arrayType buffer byteOffset length byteLength directValue dependencies path snapshot status key error",
+		sharedSeeds: "graphNodeId deriveSymbolId dependencies path reads",
+		sharedDefinitions: "id name exportedName scope version graphNodeIds projectionIds dependencies definitionId definitionName returnProperties kind graphNodeId path"
+	},
+	"markless/view": {
+		domUpdates: "hostNodeId source graphNodeId path target kind prefix suffix trueValue falseValue textNode name constantClass leadingClass symbolId",
+		behaviors: "hostNodeId source functionSource inputSources inputValues inputGraphReads inputIndex graphNodeId path symbolId usesGraph",
+		elementHandles: "hostNodeId handleId name plural"
+	}
+};
+//#endregion
+//#region ../serializer/src/protocol-templated-lists.ts
+/**
+* The record lists a payload script may serve as record templates instead of a plain array. The
+* inline resumer reads the others at page load, before any decoder has loaded, so they stay plain.
+*/
+const PROTOCOL_TEMPLATED_LISTS = {
+	"markless/state": [
+		"computed",
+		"sharedSeeds",
+		"sharedDefinitions"
+	],
+	"markless/view": [
+		"domUpdates",
+		"behaviors",
+		"elementHandles"
+	]
+};
+//#endregion
+//#region ../serializer/src/protocol-record-templates.ts
+function expandRecordTemplates(list, keys = "") {
+	if (Array.isArray(list)) return list;
+	const { t, r } = list;
+	const names = keys.split(" ");
+	const parts = t.map((text) => text.replace(/~(\d+):/g, (_, at) => `"${names[+at]}":`).split(/\^(\d+)/));
+	return r.map((ref) => {
+		if (typeof ref === "number") return JSON.parse(parts[ref][0]);
+		if (!Array.isArray(ref)) return ref;
+		const part = parts[ref[0]];
+		let text = part[0];
+		for (let at = 1; at < part.length; at += 2) text += ref[+part[at] + 1] + part[at + 1];
+		return JSON.parse(text);
+	});
+}
+/** Expands, in place, every templated list of a freshly parsed payload script. */
+function decodeProtocolPayloadLists(type, payload) {
+	const record = payload;
+	const keys = PROTOCOL_RECORD_KEYS[type];
+	if (record) for (const key of PROTOCOL_TEMPLATED_LISTS[type]) {
+		const list = record[key];
+		if (list && !Array.isArray(list)) record[key] = expandRecordTemplates(list, keys[key]);
+	}
+	return payload;
+}
+//#endregion
 //#region ../serializer/src/storage-cookie.ts
 const STORAGE_RENDER_CONTEXT_READER = "storageValue";
 //#endregion
@@ -747,7 +806,7 @@ function locate(root, view, host) {
 }
 function readScript(root, type) {
 	const text = root.querySelector(`script[type="${type}"]`)?.textContent;
-	return text ? JSON.parse(text) : void 0;
+	return text ? decodeProtocolPayloadLists(type, JSON.parse(text)) : void 0;
 }
 function references(value, id) {
 	return value === id || !!value && typeof value === "object" && Object.values(value).some((child) => references(child, id));

package/dist/vite.js

@@ -1,11 +1,11 @@
-import { c as PREFETCH_ATTRIBUTE, l as REPLACE_ATTRIBUTE, s as LINK_ATTRIBUTE, u as SCROLL_ATTRIBUTE } from "./request-locals-z3rJTizs.js";
-import { l as transformRequestFileSource, n as buildRouteManifestFromFileIds, o as normalizeRouteFileId, r as isPageModuleFile, t as assertNoEndpointConflicts } from "./route-manifest-DMizh42B.js";
+import { d as REPLACE_ATTRIBUTE, f as SCROLL_ATTRIBUTE, l as LINK_ATTRIBUTE, u as PREFETCH_ATTRIBUTE } from "./request-locals-BDAhNpEa.js";
+import { i as matchRouteManifest, l as transformRequestFileSource, n as buildRouteManifestFromFileIds, o as normalizeRouteFileId, r as isPageModuleFile, t as assertNoEndpointConflicts } from "./route-manifest-DMizh42B.js";
 import { t as __marklessRouteHref } from "./route-href-CGooO_g6.js";
 import { r as protocolIslandSegment } from "./protocol-constants-B4WxrZAS.js";
-import { a as runFragmentNavigation, i as FRAGMENT_PATH_PREFIX, n as routerLinkBridgeModules, o as startFragmentNavigation, s as listenForLinkIntent } from "./create-server-entry-DaYssO9x.js";
+import { a as runFragmentNavigation, i as FRAGMENT_PATH_PREFIX, n as routerLinkBridgeModules, o as startFragmentNavigation, s as listenForLinkIntent } from "./create-server-entry-yboa-2m6.js";
 import { dirname, extname, isAbsolute, join, normalize, relative, resolve } from "pathe";
-import { decodePath, joinURL, parsePath, parseQuery, parseURL, stringifyQuery, withLeadingSlash, withQuery, withoutLeadingSlash } from "ufo";
-import { existsSync } from "node:fs";
+import { decodePath, joinURL, parsePath, parseQuery, parseURL, stringifyQuery, withLeadingSlash, withQuery, withoutBase, withoutLeadingSlash } from "ufo";
+import { existsSync, readdirSync } from "node:fs";
 import { mkdir, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
 import { nitro } from "nitro/vite";
 import { minifySync, sortUserPlugins } from "vite";
@@ -1574,6 +1574,7 @@ function router(options = {}) {
 	return [
 		routerConfigPlugin(nitroPlugins, resumeEntry, prerenderWakeEntry, navigationEntry, routePreloads, fragmentEntry, serverBuildState()),
 		devSourceModuleRequestPlugin(),
+		devPageForUrlPlugin(options),
 		pageServerOnlyPropsPlugin(),
 		mdxTransformPlugin(),
 		requestFileTransformPlugin(),
@@ -1595,6 +1596,37 @@ function pageServerOnlyPropsPlugin() {
 		}
 	};
 }
+function devPageForUrlPlugin(options) {
+	return {
+		name: "markless-router:dev-page-for-url",
+		apply: "serve",
+		configResolved(config) {
+			config.plugins.find((plugin) => typeof plugin.api?.declarePageForUrl === "function")?.api.declarePageForUrl((href) => devPageForUrl(config.root, config.base, options.mode, href));
+		}
+	};
+}
+function devPageForUrl(root, base, mode, href) {
+	let url;
+	try {
+		url = new URL(href);
+	} catch {
+		return;
+	}
+	const pagesDir = join(root, "pages");
+	if (!existsSync(pagesDir)) return void 0;
+	const fileIds = readdirSync(pagesDir, {
+		recursive: true,
+		encoding: "utf8"
+	}).map((file) => join("pages", file));
+	let manifest;
+	try {
+		manifest = buildRouteManifestFromFileIds(fileIds);
+	} catch {
+		return;
+	}
+	const pathname = mode === "hash" && url.hash.startsWith("#/") ? url.hash.slice(1) : withoutBase(url.pathname, base);
+	return matchRouteManifest(pathname, manifest)?.route.file ?? manifest.statusPages.notFound;
+}
 function devSourceModuleRequestPlugin() {
 	let root = "";
 	return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markless/router",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Markless router: client-side navigation with SSR streaming and build-time preload maps.",
   "license": "MIT",
   "repository": {
@@ -64,11 +64,11 @@
     "pathe": "^2.0.3",
     "satteri": "0.6.3",
     "ufo": "^1.6.4",
-    "@markless/bundler": "0.6.0",
-    "@markless/web": "0.6.0"
+    "@markless/web": "0.7.0",
+    "@markless/bundler": "0.7.0"
   },
   "devDependencies": {
-    "@markless/analyzer": "0.6.0"
+    "@markless/analyzer": "0.7.0"
   },
   "peerDependencies": {
     "typescript": "^5.9.3",

package/src/vite/entries/fragment-entry.ts

@@ -9,6 +9,7 @@ export interface FragmentNavigationConfig {
 	readonly replaceAttribute: string;
 	readonly scrollAttribute: string;
 	readonly routeScriptType: string;
+	readonly servedHtmlAttributesProperty: string;
 	readonly retireProperty: string;
 	readonly streamExecutorGlobal: string;
 	readonly streamedArmSelector: string;
@@ -409,10 +410,13 @@ async function mergeHead(d: Document, next: Document) {
 // Only attributes a server document set are the server's to remove: scripts own the rest (a theme class).
 const serverHtmlAttributes = new WeakMap<Document, Set<string>>();
 
-function syncHtmlAttributes(d: Document, next: Document): void {
+function syncHtmlAttributes(d: Document, next: Document, servedProperty: string): void {
 	const root = d.documentElement;
 	const incoming = next.documentElement;
-	for (const name of serverHtmlAttributes.get(d) ?? [])
+	const served =
+		serverHtmlAttributes.get(d) ??
+		((root as unknown as Record<string, readonly string[] | undefined>)[servedProperty] || []);
+	for (const name of served)
 		if (!incoming.hasAttribute(name)) root.removeAttribute(name);
 	for (const attribute of incoming.attributes)
 		if (root.getAttribute(attribute.name) !== attribute.value)
@@ -702,7 +706,7 @@ export async function navigate(
 	(w as unknown as Record<string, unknown>)[state.config.streamExecutorGlobal] = undefined;
 	for (const element of d.querySelectorAll(state.config.streamedArmSelector)) element.remove();
 	state.shown = pageKey(new URL(w.location.href));
-	if (documentLoads) syncHtmlAttributes(d, next);
+	if (documentLoads) syncHtmlAttributes(d, next, state.config.servedHtmlAttributesProperty);
 	let region: Element;
 	let end: Comment;
 	let scripts: Element[];