@askrjs/askr 0.0.48 → 0.0.49

package/dist/boot/index.js

@@ -1,218 +1,21 @@
-import { isDevelopmentEnvironment, isProductionEnvironment } from "../common/env.js";
-import { logger } from "../dev/logger.js";
-import { globalScheduler } from "../runtime/scheduler.js";
-import { ELEMENT_TYPE, Fragment } from "../common/jsx.js";
-import { isPromiseLike } from "../common/promise.js";
-import { cleanupComponent, createComponentInstance, mountComponent } from "../runtime/component.js";
-import { removeAllListeners, teardownNodeSubtree } from "../renderer/cleanup.js";
-import { setStaticChildSlotsCacheEnabled } from "../renderer/dom.js";
-import { installRendererBridge } from "../renderer/index.js";
+import { isProductionEnvironment } from "../common/env.js";
+import { configureScrollRestoration } from "../router/navigation-scroll.js";
 import { assertExecutionModel } from "../runtime/execution-model.js";
-import { _applyManifest, _drainLazy, _setActiveRouteAuthOptions, _snapshotLazy, clearRoutes, lockRouteRegistration, resolveRouteRequest, route, setServerLocation } from "../router/route.js";
-import "../jsx/index.js";
-import { DefaultPortal, disposeDefaultPortalScope } from "../foundations/structures/portal.js";
-import { configureScrollRestoration, initializeNavigation, registerAppInstance, unregisterAppInstance } from "../router/navigate.js";
-import "../common/ssr.js";
-import { startHydrationRenderPhase, stopHydrationRenderPhase } from "../ssr/render-keys.js";
+import { startHydrationRenderPhase, stopHydrationRenderPhase } from "../common/render-context.js";
+import { _setActiveRouteAuthOptions, hasRegisteredRoutes, lockRouteRegistration } from "../router/store.js";
+import { route } from "../router/authoring.js";
+import { setServerLocation } from "../router/activity.js";
+import { _drainLazy, _snapshotLazy, _snapshotRouteSourceLazy } from "../router/lazy.js";
+import { _applyManifest, clearRoutes } from "../router/manifest.js";
+import "../router/route.js";
+import "../router/navigate.js";
+import { applySelectiveHydration, markSkippedElements, shouldVerifyHydrationMarkup, takeHydrationRenderData } from "./hydration.js";
+import { cleanupApp, flushHydrationActivation, hasApp, mountOrUpdate, registerAppNavigation, registerRootCleanupCallback } from "./root-lifecycle.js";
+import { bindDeniedRouteHandler, bindDeniedStatus, bindResolvedRouteHandler, resolveInitialRoute } from "./route-startup.js";
 //#region src/boot/index.ts
 /**
 * App bootstrap and mount
 */
-const HAS_ROUTES_KEY = Symbol.for("__ASKR_HAS_ROUTES__");
-let componentIdCounter = 0;
-const instancesByRoot = /* @__PURE__ */ new WeakMap();
-const CLEANUP_SYMBOL = Symbol.for("__askrCleanup__");
-const ROOT_CLEANUP_CALLBACKS_SYMBOL = Symbol.for("__askrRootCleanupCallbacks__");
-function takeHydrationRenderData(rootElement) {
-	for (const child of Array.from(rootElement.children)) if (child instanceof HTMLScriptElement && child.getAttribute("data-askr-render-data") === "true") {
-		const raw = child.textContent ?? "";
-		child.remove();
-		if (!raw) return {};
-		try {
-			return JSON.parse(raw);
-		} catch (err) {
-			throw new Error("[Askr] Failed to parse embedded SSR render data during hydration.", { cause: err });
-		}
-	}
-	return null;
-}
-function clearRootCleanupCallbacks(rootElement) {
-	try {
-		delete rootElement[ROOT_CLEANUP_CALLBACKS_SYMBOL];
-	} catch {
-		rootElement[ROOT_CLEANUP_CALLBACKS_SYMBOL]?.clear();
-	}
-}
-function registerRootCleanupCallback(rootElement, callback) {
-	const elementWithCleanup = rootElement;
-	const callbacks = elementWithCleanup[ROOT_CLEANUP_CALLBACKS_SYMBOL] ?? /* @__PURE__ */ new Set();
-	callbacks.add(callback);
-	elementWithCleanup[ROOT_CLEANUP_CALLBACKS_SYMBOL] = callbacks;
-	return () => {
-		callbacks.delete(callback);
-		if (callbacks.size === 0) clearRootCleanupCallbacks(rootElement);
-	};
-}
-function runRootCleanupCallbacks(rootElement, errors) {
-	const callbacks = rootElement[ROOT_CLEANUP_CALLBACKS_SYMBOL];
-	if (!callbacks || callbacks.size === 0) {
-		clearRootCleanupCallbacks(rootElement);
-		return;
-	}
-	clearRootCleanupCallbacks(rootElement);
-	for (const callback of callbacks) try {
-		callback();
-	} catch (e) {
-		errors.push(e);
-	}
-}
-function cleanupRootInstance(rootElement, instance, options) {
-	const errors = [];
-	try {
-		teardownNodeSubtree(rootElement);
-	} catch (e) {
-		errors.push(e);
-	}
-	try {
-		cleanupComponent(instance);
-	} catch (e) {
-		errors.push(e);
-	}
-	runRootCleanupCallbacks(rootElement, errors);
-	if (!options?.preserveInstance) {
-		unregisterAppInstance(instance);
-		instancesByRoot.delete(rootElement);
-		clearRootCleanupCallbacks(rootElement);
-		try {
-			delete rootElement[CLEANUP_SYMBOL];
-		} catch {}
-	}
-	if (errors.length > 0) {
-		if (instance.cleanupStrict) throw new AggregateError(errors, `cleanup failed for app root`);
-		else if (isDevelopmentEnvironment()) for (const err of errors) logger.warn("[Askr] cleanup error:", err);
-	}
-}
-function attachCleanupForRoot(rootElement, instance) {
-	rootElement[CLEANUP_SYMBOL] = (options) => {
-		cleanupRootInstance(rootElement, instance, options);
-	};
-	try {
-		const descriptor = Object.getOwnPropertyDescriptor(rootElement, "innerHTML") || Object.getOwnPropertyDescriptor(Object.getPrototypeOf(rootElement), "innerHTML") || Object.getOwnPropertyDescriptor(Element.prototype, "innerHTML");
-		if (descriptor && (descriptor.get || descriptor.set)) Object.defineProperty(rootElement, "innerHTML", {
-			get: descriptor.get ? function() {
-				return descriptor.get.call(this);
-			} : void 0,
-			set: function(value) {
-				if (value === "" && instancesByRoot.get(this) === instance) cleanupRootInstance(rootElement, instance);
-				if (descriptor.set) return descriptor.set.call(this, value);
-			},
-			configurable: true
-		});
-	} catch {}
-}
-function mountOrUpdate(rootElement, componentFn, options) {
-	const wrappedFn = (props, ctx) => {
-		const out = componentFn(props, ctx);
-		if (isPromiseLike(out)) throw new Error("Async components are not supported. Components must return synchronously.");
-		const portalVNode = {
-			$$typeof: ELEMENT_TYPE,
-			type: DefaultPortal,
-			props: {},
-			key: "__default_portal"
-		};
-		return {
-			$$typeof: ELEMENT_TYPE,
-			type: Fragment,
-			props: { children: out === void 0 || out === null ? [portalVNode] : [out, portalVNode] }
-		};
-	};
-	Object.defineProperty(wrappedFn, "name", { value: componentFn.name || "Component" });
-	const existingCleanup = rootElement[CLEANUP_SYMBOL];
-	const reusedExistingInstance = typeof existingCleanup === "function";
-	if (reusedExistingInstance) existingCleanup({ preserveInstance: true });
-	let instance = instancesByRoot.get(rootElement);
-	if (instance) {
-		const shouldResetHookState = instance.fn.name !== wrappedFn.name;
-		if (!reusedExistingInstance) {
-			removeAllListeners(rootElement);
-			try {
-				cleanupComponent(instance);
-			} catch (e) {
-				if (isDevelopmentEnvironment()) logger.warn("[Askr] prior cleanup threw:", e);
-			}
-		}
-		instance.fn = wrappedFn;
-		instance.evaluationGeneration++;
-		instance.mounted = false;
-		instance.expectedStateIndices = [];
-		instance.firstRenderComplete = false;
-		instance.isRoot = true;
-		instance.portalScope = instance;
-		if (shouldResetHookState) {
-			instance.stateValues = [];
-			instance.hasPendingUpdate = false;
-			instance.notifyUpdate = null;
-			instance.stateIndexCheck = -1;
-			instance.mountOperations = [];
-			instance.commitOperations = [];
-			instance.lifecycleSlots = [];
-			instance.cleanupFns = [];
-			instance._currentRenderToken = void 0;
-			instance.lastRenderToken = 0;
-			instance._pendingReadSources = void 0;
-			instance._lastReadSources = void 0;
-			instance._placeholder = void 0;
-			instance.errorBoundaryState = void 0;
-			instance.devWarningsEmitted = void 0;
-		}
-		if (options && typeof options.cleanupStrict === "boolean") instance.cleanupStrict = options.cleanupStrict;
-	} else {
-		instance = createComponentInstance(String(++componentIdCounter), wrappedFn, {}, rootElement);
-		instancesByRoot.set(rootElement, instance);
-		instance.isRoot = true;
-		instance.portalScope = instance;
-		if (options && typeof options.cleanupStrict === "boolean") instance.cleanupStrict = options.cleanupStrict;
-	}
-	attachCleanupForRoot(rootElement, instance);
-	registerRootCleanupCallback(rootElement, () => {
-		disposeDefaultPortalScope(instance.portalScope ?? instance);
-	});
-	mountComponent(instance);
-	globalScheduler.flush();
-}
-function bindResolvedRouteHandler(resolved) {
-	return () => resolved.handler(resolved.params);
-}
-function bindDeniedStatus(status) {
-	return () => ({
-		type: "div",
-		props: { "data-route-denied": String(status) },
-		children: [String(status)]
-	});
-}
-installRendererBridge();
-const MAX_INITIAL_ROUTE_REDIRECTS = 20;
-async function resolveInitialRoute(auth) {
-	let path = typeof window !== "undefined" ? window.location.pathname : "/";
-	let href = typeof window !== "undefined" ? `${window.location.pathname}${window.location.search}${window.location.hash}` : path;
-	const visited = /* @__PURE__ */ new Set();
-	for (let redirects = 0; redirects <= MAX_INITIAL_ROUTE_REDIRECTS; redirects++) {
-		if (visited.has(href)) throw new Error(`[Askr] Route redirect cycle detected at ${href}.`);
-		visited.add(href);
-		const resolved = await resolveRouteRequest(href, { auth });
-		if (typeof window === "undefined" || !resolved || resolved.kind !== "redirect") return {
-			path,
-			href,
-			resolved
-		};
-		const redirectTarget = new URL(resolved.to, window.location.href);
-		const redirectHref = `${redirectTarget.pathname}${redirectTarget.search}${redirectTarget.hash}`;
-		window.history.replaceState({ path: redirectHref }, "", redirectHref);
-		path = redirectTarget.pathname;
-		href = redirectHref;
-	}
-	throw new Error(`[Askr] Route redirect limit exceeded (${MAX_INITIAL_ROUTE_REDIRECTS}).`);
-}
 /**
 * createIsland: Enhances existing DOM (no router, mounts once)
 */
@@ -223,9 +26,7 @@ function createIsland(config) {
 	const rootElement = typeof config.root === "string" ? document.getElementById(config.root) : config.root;
 	if (!rootElement) throw new Error(`Root element not found: ${config.root}`);
 	if ("routes" in config) throw new Error("createIsland does not accept routes; use createSPA for routed apps");
-	try {
-		if (globalThis[HAS_ROUTES_KEY]) throw new Error("Routes are not supported with islands. Use createSPA (client) or createSSR (server) instead.");
-	} catch {}
+	if (hasRegisteredRoutes()) throw new Error("Routes are not supported with islands. Use createSPA (client) or createSSR (server) instead.");
 	mountOrUpdate(rootElement, config.component, { cleanupStrict: config.cleanupStrict });
 }
 /**
@@ -255,17 +56,27 @@ function createIslands(config) {
 async function createSPA(config) {
 	assertExecutionModel("spa");
 	if (!config || typeof config !== "object") throw new Error("createSPA requires a config object");
-	const hasManifest = config.manifest != null && config.manifest.records.length > 0;
-	const hasRoutes = Array.isArray(config.routes) && config.routes.length > 0;
+	const manifest = config.manifest ?? config.registry?.manifest;
+	const routeTable = config.routes ?? config.registry?.routes;
+	const hasManifest = manifest != null && manifest.records.length > 0;
+	const hasRoutes = Array.isArray(routeTable) && routeTable.length > 0;
 	if (!hasManifest && !hasRoutes) throw new Error("createSPA requires a route manifest or route table. Pass `manifest: getManifest()` or `routes: getRoutes()`. If you are enhancing existing HTML, use createIsland instead.");
 	const rootElement = typeof config.root === "string" ? document.getElementById(config.root) : config.root;
 	if (!rootElement) throw new Error(`Root element not found: ${config.root}`);
-	const pendingLazyAtBoot = _snapshotLazy();
+	const pendingLazyAtBoot = [..._snapshotLazy(), ..._snapshotRouteSourceLazy({
+		registry: config.registry,
+		manifest
+	})];
 	configureScrollRestoration(config.scrollRestoration);
 	clearRoutes();
-	if (hasManifest) _applyManifest(config.manifest);
-	else for (const r of config.routes) route(r.path, r.handler);
-	const routeAuth = config.auth ?? config.manifest?.auth;
+	if (hasManifest) _applyManifest(manifest);
+	else for (const r of routeTable) route(r.path, r.handler);
+	const routeAuth = config.auth ?? manifest?.auth;
+	const appRouteSource = {
+		manifest: hasManifest ? manifest : void 0,
+		routes: hasManifest ? void 0 : routeTable,
+		auth: routeAuth
+	};
 	_setActiveRouteAuthOptions(routeAuth);
 	await _drainLazy(pendingLazyAtBoot);
 	if (isProductionEnvironment()) lockRouteRegistration();
@@ -275,11 +86,7 @@ async function createSPA(config) {
 			type: "div",
 			children: []
 		}), { cleanupStrict: config.cleanupStrict });
-		await registerAppNavigation(rootElement, path, {
-			manifest: config.manifest,
-			routes: config.routes,
-			auth: routeAuth
-		});
+		await registerAppNavigation(rootElement, path, { ...appRouteSource });
 		return;
 	}
 	if (resolved.kind === "redirect") {
@@ -287,156 +94,14 @@ async function createSPA(config) {
 			type: "div",
 			children: []
 		}), { cleanupStrict: config.cleanupStrict });
-		await registerAppNavigation(rootElement, path, {
-			manifest: config.manifest,
-			routes: config.routes,
-			auth: routeAuth
-		});
+		await registerAppNavigation(rootElement, path, { ...appRouteSource });
 		return;
 	}
 	mountOrUpdate(rootElement, resolved.kind === "deny" ? bindDeniedStatus(resolved.status) : bindResolvedRouteHandler({
 		handler: resolved.handler,
 		params: resolved.params
 	}), { cleanupStrict: config.cleanupStrict });
-	await registerAppNavigation(rootElement, path, {
-		manifest: config.manifest,
-		routes: config.routes,
-		auth: routeAuth
-	});
-}
-/**
-* Mark elements that should be skipped during hydration
-*/
-function markSkippedElements(root, skipSelectors) {
-	if (skipSelectors.length === 0) return;
-	const selectorList = Array.from(new Set(skipSelectors)).join(", ");
-	root.querySelectorAll(selectorList).forEach((el) => el.setAttribute("data-skip-hydrate", "true"));
-}
-function collectDeferredBelowFoldBoundaries(root, foldY) {
-	const boundaries = [];
-	const stack = [];
-	for (let index = root.children.length - 1; index >= 0; index -= 1) stack.push(root.children[index]);
-	while (stack.length > 0) {
-		const element = stack.pop();
-		if (element.hasAttribute("data-skip-hydrate")) continue;
-		if (element.getBoundingClientRect().top >= foldY) {
-			element.setAttribute("data-skip-hydrate", "true");
-			boundaries.push(element);
-			continue;
-		}
-		for (let index = element.children.length - 1; index >= 0; index -= 1) stack.push(element.children[index]);
-	}
-	return boundaries;
-}
-function activateVisibleDeferredBoundaries(boundaries, foldY) {
-	let activated = false;
-	let remaining = 0;
-	for (const element of boundaries) {
-		if (!element.hasAttribute("data-skip-hydrate")) continue;
-		if (element.getBoundingClientRect().top < foldY) {
-			element.removeAttribute("data-skip-hydrate");
-			activated = true;
-		} else remaining += 1;
-	}
-	return {
-		activated,
-		remaining
-	};
-}
-function queueIdleWork(work) {
-	return new Promise((resolve) => {
-		if (typeof requestIdleCallback !== "undefined") {
-			requestIdleCallback(() => {
-				work();
-				resolve();
-			}, { timeout: 2e3 });
-			return;
-		}
-		setTimeout(() => {
-			work();
-			resolve();
-		}, 0);
-	});
-}
-function flushHydrationActivation(rootElement) {
-	const instance = instancesByRoot.get(rootElement);
-	if (!instance) return;
-	instance._enqueueRun?.();
-	globalScheduler.flush();
-}
-function shouldVerifyHydrationMarkup(config) {
-	const explicit = config.hydrate?.verifyMarkup;
-	if (typeof explicit === "boolean") return explicit;
-	return !isProductionEnvironment();
-}
-async function registerAppNavigation(rootElement, path, source) {
-	const instance = instancesByRoot.get(rootElement);
-	if (!instance) throw new Error("Internal error: app instance missing");
-	registerAppInstance(instance, path, source);
-	initializeNavigation();
-}
-/**
-* Apply selective hydration with deferral options
-*/
-async function applySelectiveHydration(rootElement, resolved, path, cleanupStrict, hydrateOptions) {
-	const hasPermanentSkips = (hydrateOptions.skipSelectors?.length ?? 0) > 0;
-	const hasBelowFoldDeferral = !!hydrateOptions.deferBelowFold;
-	const hasSelectiveBoundaries = hasPermanentSkips || hasBelowFoldDeferral;
-	let staticChildSlotsCacheSuspended = false;
-	let releaseSelectiveHydrationResources = () => {};
-	const restoreStaticChildSlotsCache = () => {
-		if (!staticChildSlotsCacheSuspended) return;
-		setStaticChildSlotsCacheEnabled(true);
-		staticChildSlotsCacheSuspended = false;
-	};
-	if (hydrateOptions.skipSelectors?.length) markSkippedElements(rootElement, hydrateOptions.skipSelectors);
-	let deferredBoundaries = [];
-	if (hydrateOptions.deferBelowFold) {
-		setStaticChildSlotsCacheEnabled(false);
-		staticChildSlotsCacheSuspended = true;
-		const foldY = hydrateOptions.foldThreshold ?? window.innerHeight;
-		deferredBoundaries = collectDeferredBelowFoldBoundaries(rootElement, foldY);
-		let selectiveHydrationResourcesReleased = false;
-		let unregisterRootCleanupCallback = () => {};
-		function handleScroll() {
-			const { activated, remaining } = activateVisibleDeferredBoundaries(deferredBoundaries, foldY);
-			if (!activated) return;
-			flushHydrationActivation(rootElement);
-			if (remaining === 0) releaseSelectiveHydrationResources();
-		}
-		releaseSelectiveHydrationResources = () => {
-			if (selectiveHydrationResourcesReleased) return;
-			selectiveHydrationResourcesReleased = true;
-			unregisterRootCleanupCallback();
-			window.removeEventListener("scroll", handleScroll);
-			restoreStaticChildSlotsCache();
-		};
-		unregisterRootCleanupCallback = registerRootCleanupCallback(rootElement, releaseSelectiveHydrationResources);
-		window.addEventListener("scroll", handleScroll, { passive: true });
-	}
-	if (hydrateOptions.deferUntilIdle && !hasSelectiveBoundaries) {
-		await queueIdleWork(() => {
-			mountOrUpdate(rootElement, (() => resolved.handler(resolved.params)), { cleanupStrict });
-		});
-		await registerAppNavigation(rootElement, path);
-		return;
-	}
-	try {
-		mountOrUpdate(rootElement, (() => resolved.handler(resolved.params)), { cleanupStrict });
-		await registerAppNavigation(rootElement, path);
-	} catch (error) {
-		releaseSelectiveHydrationResources();
-		throw error;
-	}
-	if (hydrateOptions.deferUntilIdle && deferredBoundaries.length > 0) await queueIdleWork(() => {
-		try {
-			const { activated } = activateVisibleDeferredBoundaries(deferredBoundaries, Number.POSITIVE_INFINITY);
-			if (activated) flushHydrationActivation(rootElement);
-		} finally {
-			releaseSelectiveHydrationResources();
-		}
-	});
-	if (deferredBoundaries.length === 0) releaseSelectiveHydrationResources();
+	await registerAppNavigation(rootElement, path, { ...appRouteSource });
 }
 /**
 * hydrateSPA: Hydrate server-rendered HTML.
@@ -445,37 +110,49 @@ async function applySelectiveHydration(rootElement, resolved, path, cleanupStric
 async function hydrateSPA(config) {
 	assertExecutionModel("spa");
 	if (!config || typeof config !== "object") throw new Error("hydrateSPA requires a config object");
-	const hasManifest = config.manifest != null && config.manifest.records.length > 0;
-	const hasRoutes = Array.isArray(config.routes) && config.routes.length > 0;
+	const manifest = config.manifest ?? config.registry?.manifest;
+	const routeTable = config.routes ?? config.registry?.routes;
+	const hasManifest = manifest != null && manifest.records.length > 0;
+	const hasRoutes = Array.isArray(routeTable) && routeTable.length > 0;
 	if (!hasManifest && !hasRoutes) throw new Error("hydrateSPA requires a route manifest or route table. Pass `manifest: getManifest()` or `routes: getRoutes()`. If you are enhancing existing HTML, use createIsland instead.");
 	const rootElement = typeof config.root === "string" ? document.getElementById(config.root) : config.root;
 	if (!rootElement) throw new Error(`Root element not found: ${config.root}`);
 	const hydrationRenderData = takeHydrationRenderData(rootElement);
-	const pendingLazyAtHydrationBoot = _snapshotLazy();
+	const pendingLazyAtHydrationBoot = [..._snapshotLazy(), ..._snapshotRouteSourceLazy({
+		registry: config.registry,
+		manifest
+	})];
 	configureScrollRestoration(config.scrollRestoration);
 	clearRoutes();
-	if (hasManifest) _applyManifest(config.manifest);
-	else for (const r of config.routes) route(r.path, r.handler);
-	_setActiveRouteAuthOptions(config.auth ?? config.manifest?.auth);
+	if (hasManifest) _applyManifest(manifest);
+	else for (const r of routeTable) route(r.path, r.handler);
+	const routeAuth = config.auth ?? manifest?.auth;
+	const appRouteSource = {
+		manifest: hasManifest ? manifest : void 0,
+		routes: hasManifest ? void 0 : routeTable,
+		auth: routeAuth
+	};
+	_setActiveRouteAuthOptions(routeAuth);
 	await _drainLazy(pendingLazyAtHydrationBoot);
-	const { path, href: currentUrl, resolved } = await resolveInitialRoute(config.auth ?? config.manifest?.auth);
+	const { path, href: currentUrl, resolved } = await resolveInitialRoute(routeAuth);
 	setServerLocation(currentUrl);
 	if (isProductionEnvironment()) lockRouteRegistration();
 	if (!resolved) throw new Error(`hydrateSPA: no route found for current path (${path}).`);
 	if (resolved.kind === "redirect") throw new Error(`hydrateSPA: unresolved redirect for current path (${path}).`);
 	const hydrationResolved = resolved.kind === "deny" ? {
-		handler: bindDeniedStatus(resolved.status),
+		handler: bindDeniedRouteHandler(resolved.status),
 		params: {}
 	} : {
 		handler: resolved.handler,
 		params: resolved.params
 	};
 	if (shouldVerifyHydrationMarkup(config)) {
-		const legacyRouteTable = hasManifest ? config.manifest.records.map((r) => ({
+		const legacyRouteTable = hasManifest ? manifest.records.map((r) => ({
+			...r,
 			path: r.path,
 			handler: r.handler,
 			namespace: r.options.namespace
-		})) : config.routes;
+		})) : routeTable;
 		const { verifyHydrationSyncForUrl } = await import("../ssr/verify-hydration.js");
 		if (!verifyHydrationSyncForUrl({
 			root: rootElement,
@@ -490,7 +167,12 @@ async function hydrateSPA(config) {
 		if (hydrateOptions.deferUntilIdle || hydrateOptions.deferBelowFold) {
 			if (hydrationRenderData) startHydrationRenderPhase(hydrationRenderData);
 			try {
-				await applySelectiveHydration(rootElement, hydrationResolved, path, config.cleanupStrict, hydrateOptions);
+				await applySelectiveHydration(rootElement, hydrationResolved, path, config.cleanupStrict, hydrateOptions, appRouteSource, {
+					mountOrUpdate,
+					registerAppNavigation,
+					registerRootCleanupCallback,
+					flushHydrationActivation
+				});
 			} finally {
 				if (hydrationRenderData) stopHydrationRenderPhase();
 			}
@@ -504,37 +186,7 @@ async function hydrateSPA(config) {
 	} finally {
 		if (hydrationRenderData) stopHydrationRenderPhase();
 	}
-	await registerAppNavigation(rootElement, path, {
-		manifest: config.manifest,
-		routes: config.routes,
-		auth: config.auth ?? config.manifest?.auth
-	});
-}
-/**
-* Cleanup an app mounted on a root element (element or id).
-* Safe to call multiple times — no-op when nothing is mounted.
-*/
-function cleanupApp(root) {
-	const rootElement = typeof root === "string" ? document.getElementById(root) : root;
-	if (!rootElement) return;
-	const cleanupFn = rootElement[CLEANUP_SYMBOL];
-	try {
-		if (typeof cleanupFn === "function") cleanupFn();
-	} finally {
-		instancesByRoot.delete(rootElement);
-		clearRootCleanupCallbacks(rootElement);
-		try {
-			delete rootElement[CLEANUP_SYMBOL];
-		} catch {}
-	}
-}
-/**
-* Check whether an app is mounted on the given root
-*/
-function hasApp(root) {
-	const rootElement = typeof root === "string" ? document.getElementById(root) : root;
-	if (!rootElement) return false;
-	return instancesByRoot.has(rootElement);
+	await registerAppNavigation(rootElement, path, { ...appRouteSource });
 }
 //#endregion
 export { cleanupApp, createIsland, createIslands, createSPA, hasApp, hydrateSPA };