rari 0.5.28 → 0.5.29

package/dist/client.mjs

@@ -1,3 +1,3 @@
-import { C as createNavigationError, S as NavigationErrorHandler, _ as LayoutErrorBoundary, a as LoadingSpinner, b as routeInfoCache, c as createHttpRuntimeClient, d as clearPropsCacheForComponent, f as extractMetadata, g as hasServerSideDataFetching, h as extractStaticParams, i as HttpRuntimeClient, l as createLoadingBoundary, m as extractServerPropsWithCache, n as DefaultLoading, o as NotFound, p as extractServerProps, r as ErrorBoundary, s as createErrorBoundary, t as DefaultError, u as clearPropsCache, v as ClientRouter, w as fetchWithTimeout, x as NavigationErrorOverlay, y as StatePreserver } from "./runtime-client-DXbydP6X.mjs";
+import { C as createNavigationError, S as NavigationErrorHandler, _ as LayoutErrorBoundary, a as LoadingSpinner, b as routeInfoCache, c as createHttpRuntimeClient, d as clearPropsCacheForComponent, f as extractMetadata, g as hasServerSideDataFetching, h as extractStaticParams, i as HttpRuntimeClient, l as createLoadingBoundary, m as extractServerPropsWithCache, n as DefaultLoading, o as NotFound, p as extractServerProps, r as ErrorBoundary, s as createErrorBoundary, t as DefaultError, u as clearPropsCache, v as ClientRouter, w as fetchWithTimeout, x as NavigationErrorOverlay, y as StatePreserver } from "./runtime-client-Cbat2QnR.mjs";
 
 export { ClientRouter, DefaultError, DefaultLoading, ErrorBoundary, HttpRuntimeClient, LayoutErrorBoundary, LoadingSpinner, NavigationErrorHandler, NavigationErrorOverlay, NotFound, StatePreserver, clearPropsCache, clearPropsCacheForComponent, createErrorBoundary, createHttpRuntimeClient, createLoadingBoundary, createNavigationError, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, fetchWithTimeout, hasServerSideDataFetching, routeInfoCache };

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-Crp6BBHv.mjs";
+import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-CHxbBtJP.mjs";
 import { t as generateAppRouteManifest } from "./app-routes-KhTu0CFP.mjs";
-import { c as createHttpRuntimeClient, d as clearPropsCacheForComponent, f as extractMetadata, g as hasServerSideDataFetching, h as extractStaticParams, i as HttpRuntimeClient, m as extractServerPropsWithCache, p as extractServerProps, u as clearPropsCache } from "./runtime-client-DXbydP6X.mjs";
+import { c as createHttpRuntimeClient, d as clearPropsCacheForComponent, f as extractMetadata, g as hasServerSideDataFetching, h as extractStaticParams, i as HttpRuntimeClient, m as extractServerPropsWithCache, p as extractServerProps, u as clearPropsCache } from "./runtime-client-Cbat2QnR.mjs";
 import "./server-build-CQpjQCX6.mjs";
 
 export { HttpRuntimeClient, RariResponse, clearPropsCache, clearPropsCacheForComponent, createHttpRuntimeClient, defineRariConfig, defineRariOptions, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, generateAppRouteManifest, hasServerSideDataFetching, headers, rari, rariRouter };

package/dist/{runtime-client-DXbydP6X.mjs → runtime-client-Cbat2QnR.mjs}

@@ -836,12 +836,8 @@ function updateDocumentMetadata(metadata) {
 function ClientRouter({ children, initialRoute }) {
 	const [navigationState, setNavigationState] = useState(() => ({
 		currentRoute: normalizePath(initialRoute),
-		targetRoute: null,
-		isNavigating: false,
 		navigationId: 0,
-		error: null,
-		showingLoadingComponent: false,
-		loadingComponentRoute: null
+		error: null
 	}));
 	const abortControllerRef = useRef(null);
 	const isMountedRef = useRef(true);
@@ -874,13 +870,7 @@ function ClientRouter({ children, initialRoute }) {
 	};
 	const cleanupAbortedNavigation = (path, navigationId) => {
 		pendingNavigationsRef.current.delete(path);
-		if (isMountedRef.current && navigationState.navigationId === navigationId) setNavigationState((prev) => ({
-			...prev,
-			targetRoute: null,
-			isNavigating: false,
-			showingLoadingComponent: false,
-			loadingComponentRoute: null
-		}));
+		if (isMountedRef.current && navigationState.navigationId === navigationId) setNavigationState((prev) => ({ ...prev }));
 	};
 	const getRouteInfo = async (route) => {
 		return routeInfoCache.get(route);
@@ -895,34 +885,12 @@ function ClientRouter({ children, initialRoute }) {
 		if (targetPath === currentRouteRef.current && !options.replace) return;
 		const existingPending = pendingNavigationsRef.current.get(targetPath);
 		if (existingPending) return existingPending.promise;
-		if (navigationState.isNavigating && navigationState.targetRoute !== targetPath) {
-			navigationQueueRef.current.push({
-				path: targetPath,
-				options
-			});
-			return;
-		}
 		const routeInfo = await getRouteInfo(targetPath);
 		cancelAllPendingNavigations();
 		cancelNavigation();
 		const abortController = new AbortController();
 		abortControllerRef.current = abortController;
 		const navigationId = navigationState.navigationId + 1;
-		const loadingComponentPath = routeInfo.loading;
-		setNavigationState((prev) => ({
-			...prev,
-			targetRoute: targetPath,
-			isNavigating: true,
-			navigationId,
-			error: null,
-			showingLoadingComponent: !!loadingComponentPath,
-			loadingComponentRoute: loadingComponentPath
-		}));
-		if (loadingComponentPath) window.dispatchEvent(new CustomEvent("rari:show-loading", { detail: {
-			route: targetPath,
-			navigationId,
-			loadingPath: loadingComponentPath
-		} }));
 		const navigationPromise = (async () => {
 			const fromRoute = currentRouteRef.current;
 			try {
@@ -957,18 +925,50 @@ function ClientRouter({ children, initialRoute }) {
 						updateDocumentMetadata(JSON.parse(decodedMetadata));
 					}
 				} catch {}
-				const rscWireFormat = await response.text();
-				window.dispatchEvent(new CustomEvent("rari:navigate", { detail: {
-					from: fromRoute,
-					to: targetPath,
-					navigationId,
-					options,
-					routeInfo,
-					abortSignal: abortController.signal,
-					rscWireFormat,
-					loadingComponentPath,
-					hasLoadingComponent: !!loadingComponentPath
-				} }));
+				if (response.headers.get("x-render-mode") === "streaming" && response.body) {
+					const reader = response.body.getReader();
+					const decoder = new TextDecoder();
+					let buffer = "";
+					try {
+						while (true) {
+							const { done, value } = await reader.read();
+							if (done) break;
+							if (abortController.signal.aborted) {
+								await reader.cancel();
+								cleanupAbortedNavigation(targetPath, navigationId);
+								return;
+							}
+							buffer += decoder.decode(value, { stream: true });
+							const lines = buffer.split("\n");
+							buffer = lines.pop() || "";
+							for (const line of lines) if (line.trim()) window.dispatchEvent(new CustomEvent("rari:rsc-row", { detail: { rscRow: line } }));
+						}
+						if (buffer.trim()) window.dispatchEvent(new CustomEvent("rari:rsc-row", { detail: { rscRow: buffer } }));
+						window.dispatchEvent(new CustomEvent("rari:navigate", { detail: {
+							from: fromRoute,
+							to: targetPath,
+							navigationId,
+							options,
+							routeInfo,
+							abortSignal: abortController.signal,
+							isStreaming: true
+						} }));
+					} catch (streamError) {
+						console.error("[ClientRouter] Streaming error:", streamError);
+						throw streamError;
+					}
+				} else {
+					const rscWireFormat = await response.text();
+					window.dispatchEvent(new CustomEvent("rari:navigate", { detail: {
+						from: fromRoute,
+						to: targetPath,
+						navigationId,
+						options,
+						routeInfo,
+						abortSignal: abortController.signal,
+						rscWireFormat
+					} }));
+				}
 				if (abortController.signal.aborted) {
 					cleanupAbortedNavigation(targetPath, navigationId);
 					return;
@@ -978,11 +978,7 @@ function ClientRouter({ children, initialRoute }) {
 					setNavigationState((prev) => ({
 						...prev,
 						currentRoute: targetPath,
-						targetRoute: null,
-						isNavigating: false,
-						error: null,
-						showingLoadingComponent: false,
-						loadingComponentRoute: null
+						error: null
 					}));
 					errorHandlerRef.current.resetRetry(targetPath);
 					if (options.historyKey) requestAnimationFrame(() => {
@@ -999,11 +995,7 @@ function ClientRouter({ children, initialRoute }) {
 				const navError = errorHandlerRef.current.handleError(error, targetPath);
 				if (isMountedRef.current) setNavigationState((prev) => ({
 					...prev,
-					targetRoute: null,
-					isNavigating: false,
-					error: navError,
-					showingLoadingComponent: false,
-					loadingComponentRoute: null
+					error: navError
 				}));
 				pendingNavigationsRef.current.delete(targetPath);
 				window.dispatchEvent(new CustomEvent("rari:navigate-error", { detail: {
@@ -1024,7 +1016,7 @@ function ClientRouter({ children, initialRoute }) {
 		return navigationPromise;
 	};
 	const processNavigationQueue = async () => {
-		if (navigationQueueRef.current.length === 0 || navigationState.isNavigating) return;
+		if (navigationQueueRef.current.length === 0) return;
 		const lastNavigation = navigationQueueRef.current[navigationQueueRef.current.length - 1];
 		navigationQueueRef.current = [];
 		await navigate(lastNavigation.path, lastNavigation.options);

package/dist/{vite-Crp6BBHv.mjs → vite-CHxbBtJP.mjs}

@@ -1677,7 +1677,7 @@ function getAffectedRoutes(routePath, fileType, allRoutes) {
 	});
 	return affected.length > 0 ? affected : [routePath];
 }
-function extractMetadata$1(fileContent) {
+function extractMetadata(fileContent) {
 	try {
 		const match = fileContent.match(/export\s+const\s+metadata\s*(?::\s*\w+\s*)?=\s*(\{[\s\S]*?\n\})/);
 		if (!match) return null;
@@ -1784,8 +1784,8 @@ function rariRouter(options = {}) {
 			const currentRouteFiles = await scanRouteFiles(appDir);
 			const currentHash = computeRouteStructureHash(currentRouteFiles);
 			if (!forceRegenerate && routeStructureHash === currentHash && cachedManifestContent) return cachedManifestContent;
-			const { generateAppRouteManifest: generateAppRouteManifest$1 } = await import("./app-routes-q03OTf5N.mjs");
-			const manifest = await generateAppRouteManifest$1(appDir, { extensions: opts.extensions });
+			const { generateAppRouteManifest } = await import("./app-routes-q03OTf5N.mjs");
+			const manifest = await generateAppRouteManifest(appDir, { extensions: opts.extensions });
 			const manifestContent = JSON.stringify(manifest, null, 2);
 			const outDir = path.resolve(root, opts.outDir);
 			await promises.mkdir(outDir, { recursive: true });
@@ -1869,7 +1869,7 @@ function rariRouter(options = {}) {
 						let metadataChanged = false;
 						let methods;
 						if (fileType === "page" || fileType === "layout") try {
-							const extractedMetadata = extractMetadata$1(await promises.readFile(file, "utf-8"));
+							const extractedMetadata = extractMetadata(await promises.readFile(file, "utf-8"));
 							if (extractedMetadata) {
 								metadata = extractedMetadata;
 								metadataChanged = true;

package/dist/vite.mjs

@@ -1,6 +1,6 @@
-import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-Crp6BBHv.mjs";
+import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-CHxbBtJP.mjs";
 import { t as generateAppRouteManifest } from "./app-routes-KhTu0CFP.mjs";
-import { c as createHttpRuntimeClient, d as clearPropsCacheForComponent, f as extractMetadata, g as hasServerSideDataFetching, h as extractStaticParams, i as HttpRuntimeClient, m as extractServerPropsWithCache, p as extractServerProps, u as clearPropsCache } from "./runtime-client-DXbydP6X.mjs";
+import { c as createHttpRuntimeClient, d as clearPropsCacheForComponent, f as extractMetadata, g as hasServerSideDataFetching, h as extractStaticParams, i as HttpRuntimeClient, m as extractServerPropsWithCache, p as extractServerProps, u as clearPropsCache } from "./runtime-client-Cbat2QnR.mjs";
 import "./server-build-CQpjQCX6.mjs";
 
 export { HttpRuntimeClient, RariResponse, clearPropsCache, clearPropsCacheForComponent, createHttpRuntimeClient, defineRariConfig, defineRariOptions, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, generateAppRouteManifest, hasServerSideDataFetching, headers, rari, rariRouter };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rari",
   "type": "module",
-  "version": "0.5.28",
+  "version": "0.5.29",
   "description": "Runtime Accelerated Rendering Infrastructure (Rari)",
   "author": "Ryan Skinner",
   "license": "MIT",
@@ -89,20 +89,20 @@
     "picocolors": "^1.1.1"
   },
   "optionalDependencies": {
-    "rari-darwin-arm64": "0.5.22",
-    "rari-darwin-x64": "0.5.22",
-    "rari-linux-arm64": "0.5.22",
-    "rari-linux-x64": "0.5.22",
-    "rari-win32-x64": "0.5.22"
+    "rari-darwin-arm64": "0.5.23",
+    "rari-darwin-x64": "0.5.23",
+    "rari-linux-arm64": "0.5.23",
+    "rari-linux-x64": "0.5.23",
+    "rari-win32-x64": "0.5.23"
   },
   "devDependencies": {
     "@types/node": "^25.0.3",
     "@types/react": "^19.2.7",
-    "@typescript/native-preview": "^7.0.0-dev.20251223.1",
+    "@typescript/native-preview": "^7.0.0-dev.20260102.1",
     "chokidar": "^5.0.0",
     "eslint": "^9.39.2",
-    "oxlint": "^1.35.0",
+    "oxlint": "^1.36.0",
     "rolldown-vite": "^7.3.0",
-    "tsdown": "^0.17.3"
+    "tsdown": "^0.18.4"
   }
 }

package/src/router/ClientRouter.tsx

@@ -205,12 +205,8 @@ export interface ClientRouterProps {
 
 interface NavigationState {
   currentRoute: string
-  targetRoute: string | null
-  isNavigating: boolean
   navigationId: number
   error: NavigationError | null
-  showingLoadingComponent: boolean
-  loadingComponentRoute: string | null
 }
 
 interface PendingNavigation {
@@ -231,12 +227,8 @@ interface HistoryState {
 export function ClientRouter({ children, initialRoute }: ClientRouterProps) {
   const [navigationState, setNavigationState] = useState<NavigationState>(() => ({
     currentRoute: normalizePath(initialRoute),
-    targetRoute: null,
-    isNavigating: false,
     navigationId: 0,
     error: null,
-    showingLoadingComponent: false,
-    loadingComponentRoute: null,
   }))
 
   const abortControllerRef = useRef<AbortController | null>(null)
@@ -288,10 +280,6 @@ export function ClientRouter({ children, initialRoute }: ClientRouterProps) {
     if (isMountedRef.current && navigationState.navigationId === navigationId) {
       setNavigationState(prev => ({
         ...prev,
-        targetRoute: null,
-        isNavigating: false,
-        showingLoadingComponent: false,
-        loadingComponentRoute: null,
       }))
     }
   }
@@ -319,11 +307,6 @@ export function ClientRouter({ children, initialRoute }: ClientRouterProps) {
       return existingPending.promise
     }
 
-    if (navigationState.isNavigating && navigationState.targetRoute !== targetPath) {
-      navigationQueueRef.current.push({ path: targetPath, options })
-      return
-    }
-
     const routeInfo = await getRouteInfo(targetPath)
 
     cancelAllPendingNavigations()
@@ -334,28 +317,6 @@ export function ClientRouter({ children, initialRoute }: ClientRouterProps) {
 
     const navigationId = navigationState.navigationId + 1
 
-    const loadingComponentPath = routeInfo.loading
-
-    setNavigationState(prev => ({
-      ...prev,
-      targetRoute: targetPath,
-      isNavigating: true,
-      navigationId,
-      error: null,
-      showingLoadingComponent: !!loadingComponentPath,
-      loadingComponentRoute: loadingComponentPath,
-    }))
-
-    if (loadingComponentPath) {
-      window.dispatchEvent(new CustomEvent('rari:show-loading', {
-        detail: {
-          route: targetPath,
-          navigationId,
-          loadingPath: loadingComponentPath,
-        },
-      }))
-    }
-
     const navigationPromise = (async () => {
       const fromRoute = currentRouteRef.current
       try {
@@ -416,21 +377,79 @@ export function ClientRouter({ children, initialRoute }: ClientRouterProps) {
         }
         catch {}
 
-        const rscWireFormat = await response.text()
-
-        window.dispatchEvent(new CustomEvent('rari:navigate', {
-          detail: {
-            from: fromRoute,
-            to: targetPath,
-            navigationId,
-            options,
-            routeInfo,
-            abortSignal: abortController.signal,
-            rscWireFormat,
-            loadingComponentPath,
-            hasLoadingComponent: !!loadingComponentPath,
-          },
-        }))
+        const renderMode = response.headers.get('x-render-mode')
+        const isStreaming = renderMode === 'streaming'
+
+        if (isStreaming && response.body) {
+          const reader = response.body.getReader()
+          const decoder = new TextDecoder()
+          let buffer = ''
+
+          try {
+            while (true) {
+              const { done, value } = await reader.read()
+
+              if (done)
+                break
+
+              if (abortController.signal.aborted) {
+                await reader.cancel()
+                cleanupAbortedNavigation(targetPath, navigationId)
+                return
+              }
+
+              buffer += decoder.decode(value, { stream: true })
+
+              const lines = buffer.split('\n')
+              buffer = lines.pop() || ''
+
+              for (const line of lines) {
+                if (line.trim()) {
+                  window.dispatchEvent(new CustomEvent('rari:rsc-row', {
+                    detail: { rscRow: line },
+                  }))
+                }
+              }
+            }
+
+            if (buffer.trim()) {
+              window.dispatchEvent(new CustomEvent('rari:rsc-row', {
+                detail: { rscRow: buffer },
+              }))
+            }
+
+            window.dispatchEvent(new CustomEvent('rari:navigate', {
+              detail: {
+                from: fromRoute,
+                to: targetPath,
+                navigationId,
+                options,
+                routeInfo,
+                abortSignal: abortController.signal,
+                isStreaming: true,
+              },
+            }))
+          }
+          catch (streamError) {
+            console.error('[ClientRouter] Streaming error:', streamError)
+            throw streamError
+          }
+        }
+        else {
+          const rscWireFormat = await response.text()
+
+          window.dispatchEvent(new CustomEvent('rari:navigate', {
+            detail: {
+              from: fromRoute,
+              to: targetPath,
+              navigationId,
+              options,
+              routeInfo,
+              abortSignal: abortController.signal,
+              rscWireFormat,
+            },
+          }))
+        }
 
         if (abortController.signal.aborted) {
           cleanupAbortedNavigation(targetPath, navigationId)
@@ -443,11 +462,7 @@ export function ClientRouter({ children, initialRoute }: ClientRouterProps) {
           setNavigationState(prev => ({
             ...prev,
             currentRoute: targetPath,
-            targetRoute: null,
-            isNavigating: false,
             error: null,
-            showingLoadingComponent: false,
-            loadingComponentRoute: null,
           }))
 
           errorHandlerRef.current.resetRetry(targetPath)
@@ -474,11 +489,7 @@ export function ClientRouter({ children, initialRoute }: ClientRouterProps) {
         if (isMountedRef.current) {
           setNavigationState(prev => ({
             ...prev,
-            targetRoute: null,
-            isNavigating: false,
             error: navError,
-            showingLoadingComponent: false,
-            loadingComponentRoute: null,
           }))
         }
 
@@ -508,7 +519,7 @@ export function ClientRouter({ children, initialRoute }: ClientRouterProps) {
   }
 
   const processNavigationQueue = async () => {
-    if (navigationQueueRef.current.length === 0 || navigationState.isNavigating) {
+    if (navigationQueueRef.current.length === 0) {
       return
     }
 

package/src/router/rsc-parser.ts

@@ -13,6 +13,7 @@ export function parseRscWireFormat(
   try {
     const lines = wireFormat.trim().split('\n')
     const modules = new Map<string, any>()
+    const symbols = new Map<string, string>()
     let rootElement = null
     const layoutBoundaries: LayoutBoundary[] = []
     let currentLayoutPath: string | null = null
@@ -30,6 +31,12 @@ export function parseRscWireFormat(
       const content = line.substring(colonIndex + 1)
 
       try {
+        if (content.startsWith('"$S')) {
+          const symbolName = content.slice(1, -1)
+          symbols.set(`$${rowId}`, symbolName)
+          continue
+        }
+
         if (content.startsWith('I[')) {
           const importData = JSON.parse(content.substring(1))
           if (Array.isArray(importData) && importData.length >= 3) {
@@ -118,6 +125,7 @@ export function parseRscWireFormat(
     return {
       element: rootElement,
       modules,
+      symbols,
       wireFormat,
       layoutBoundaries: options.extractLayoutBoundaries ? layoutBoundaries : undefined,
       routeMetadata,

package/src/router/rsc-types.ts

@@ -22,6 +22,7 @@ export interface EnhancedRSCPayload {
 export interface ParsedRSCPayload {
   element: any
   modules: Map<string, any>
+  symbols?: Map<string, string>
   wireFormat: string
   layoutBoundaries?: LayoutBoundary[]
   routeMetadata?: RSCRouteMetadata