rari 0.2.22 → 0.2.23

package/dist/index.js

@@ -1,5 +1,5 @@
 import { HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent, RouterProvider, Routes, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-BXoadxa8.js";
-import { FileRouteGenerator, convertFilePatternToRoutePattern, createRouteManifest, defineRariConfig, defineRariOptions, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-BK7rNurU.js";
-import "./server-build-BM8_GFF5.js";
+import { FileRouteGenerator, convertFilePatternToRoutePattern, createRouteManifest, defineRariConfig, defineRariOptions, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-C3POnIbO.js";
+import "./server-build-DeJfuJb8.js";
 
 export { FileRouteGenerator, HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent as Route, RouterProvider, Routes, buildSearchString, buildUrl, convertFilePatternToRoutePattern, createHttpRuntimeClient, createRouteManifest, defineRariConfig, defineRariOptions, extractParamNames, findMatchingRoute, generateFileRoutes, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, loadRouteManifest, normalizePathname, parseSearchParams, parseUrl, rari, rariRouter, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, validateRoutes, watchFileRoutes, withRouter };

package/dist/{server-BK7rNurU.js → server-C3POnIbO.js}

@@ -1,6 +1,6 @@
 import { __commonJS, __require, __toESM } from "./chunk-BLXvPPr8.js";
 import { analyzeFilePath } from "./runtime-client-BXoadxa8.js";
-import { createServerBuildPlugin } from "./server-build-BM8_GFF5.js";
+import { createServerBuildPlugin } from "./server-build-DeJfuJb8.js";
 import fs, { promises } from "node:fs";
 import path from "node:path";
 import process$1 from "node:process";
@@ -5693,7 +5693,7 @@ function rari(options = {}) {
 			const serverDirectives = ["'use server'", "\"use server\""];
 			const trimmedCode = code.trim();
 			const hasServerDirective = serverDirectives.some((directive) => trimmedCode.startsWith(directive) || code.includes(directive));
-			const isInFunctionsDir = filePath.includes("/functions/") || filePath.includes("\\functions\\");
+			const isInFunctionsDir = filePath.includes("/functions/") || filePath.includes("\\\\functions\\\\");
 			const hasServerFunctionSignature = (code.includes("export async function") || code.includes("export function")) && code.includes("'use server'");
 			if (hasServerDirective || isInFunctionsDir && hasServerFunctionSignature) return true;
 			return false;
@@ -5980,6 +5980,11 @@ if (import.meta.hot) {
   import.meta.hot.accept();
 }
 
+if (typeof globalThis !== 'undefined') {
+  globalThis.__rari_server_components = globalThis.__rari_server_components || new Set();
+  globalThis.__rari_server_components.add(${JSON.stringify(id)});
+}
+
 ${clientTransformedCode}`;
 					return clientTransformedCode;
 				}
@@ -6065,14 +6070,35 @@ const ${componentName$1} = registerClientReference(
 			const srcDir = path.join(projectRoot, "src");
 			const discoverAndRegisterComponents = async () => {
 				try {
-					const { ServerComponentBuilder, scanDirectory } = await import("./server-build-DcbOtG3e.js");
+					const { ServerComponentBuilder, scanDirectory } = await import("./server-build-Cs2pfA52.js");
 					const builder = new ServerComponentBuilder(projectRoot, {
 						outDir: "temp",
 						serverDir: "server",
 						manifestPath: "server-manifest.json"
 					});
 					const srcDir$1 = path.join(projectRoot, "src");
-					if (fs.existsSync(srcDir$1)) scanDirectory(srcDir$1, builder);
+					const serverComponentPaths = [];
+					if (fs.existsSync(srcDir$1)) {
+						const collectServerComponents = (dir) => {
+							const entries = fs.readdirSync(dir, { withFileTypes: true });
+							for (const entry of entries) {
+								const fullPath = path.join(dir, entry.name);
+								if (entry.isDirectory()) collectServerComponents(fullPath);
+								else if (entry.isFile() && /\.(?:tsx?|jsx?)$/.test(entry.name)) try {
+									if (isServerComponent(fullPath)) serverComponentPaths.push(fullPath);
+								} catch (error) {
+									console.warn(`[RARI] Error checking ${fullPath}:`, error);
+								}
+							}
+						};
+						collectServerComponents(srcDir$1);
+						scanDirectory(srcDir$1, builder);
+					}
+					if (serverComponentPaths.length > 0) server.ws.send({
+						type: "custom",
+						event: "rari:server-components-registry",
+						data: { serverComponents: serverComponentPaths }
+					});
 					const components = await builder.getTransformedComponentsForDevelopment();
 					const serverPort = process$1.env.SERVER_PORT ? Number(process$1.env.SERVER_PORT) : Number(process$1.env.PORT || process$1.env.RSC_PORT || 3e3);
 					const baseUrl = `http://localhost:${serverPort}`;
@@ -6200,7 +6226,7 @@ const ${componentName$1} = registerClientReference(
 			};
 			const handleServerComponentHMR = async (filePath) => {
 				try {
-					const { ServerComponentBuilder } = await import("./server-build-DcbOtG3e.js");
+					const { ServerComponentBuilder } = await import("./server-build-Cs2pfA52.js");
 					const builder = new ServerComponentBuilder(projectRoot, {
 						outDir: "temp",
 						serverDir: "server",
@@ -6236,8 +6262,14 @@ const ${componentName$1} = registerClientReference(
 			startRustServer();
 			server.watcher.on("change", async (filePath) => {
 				if (/\.(?:tsx?|jsx?)$/.test(filePath)) componentTypeCache.delete(filePath);
-				if (/\.(?:tsx?|jsx?)$/.test(filePath) && filePath.includes(srcDir)) if (isServerComponent(filePath)) await handleServerComponentHMR(filePath);
-				else setTimeout(discoverAndRegisterComponents, 1e3);
+				if (/\.(?:tsx?|jsx?)$/.test(filePath) && filePath.includes(srcDir)) if (isServerComponent(filePath)) {
+					server.ws.send({
+						type: "custom",
+						event: "rari:register-server-component",
+						data: { filePath }
+					});
+					await handleServerComponentHMR(filePath);
+				} else setTimeout(discoverAndRegisterComponents, 1e3);
 			});
 			server.middlewares.use("/api/vite/hmr-transform", async (req, res) => {
 				if (req.method !== "POST") {
@@ -6591,7 +6623,9 @@ class RscClient {
   }
 
   async fetchServerComponent(componentId, props = {}) {
-    const cacheKey = componentId + ':' + JSON.stringify(props);
+    const hmrCounter = (typeof window !== 'undefined' && window.__rscRefreshCounters && window.__rscRefreshCounters[componentId]) || 0;
+    const cacheKey = componentId + ':' + JSON.stringify(props) + ':hmr:' + hmrCounter;
+
 
     if (this.componentCache.has(cacheKey)) {
       return this.componentCache.get(cacheKey);
@@ -6837,14 +6871,15 @@ class RscClient {
           buffered = lines[lines.length - 1];
 
           for (const line of completeLines) {
-            if (!line.trim()) continue;
+              if (!line.trim()) continue;
+
+              try {
+                const colonIndex = line.indexOf(':');
+                if (colonIndex === -1) continue;
 
-            try {
-              const colonIndex = line.indexOf(':');
-              if (colonIndex === -1) continue;
+                const rowId = line.substring(0, colonIndex);
+                const content = line.substring(colonIndex + 1);
 
-              const rowId = line.substring(0, colonIndex);
-              const content = line.substring(colonIndex + 1);
 
               if (content.includes('STREAM_COMPLETE')) {
                 isComplete = true;
@@ -7379,6 +7414,9 @@ function createServerComponentWrapper(componentName, importPath) {
       const handleRscInvalidate = (event) => {
         const detail = event.detail;
         if (detail && detail.filePath && isServerComponent(detail.filePath)) {
+
+          rscClient.clearCache();
+
           if (typeof window !== 'undefined') {
             window.__rscRefreshCounters[componentName] = (window.__rscRefreshCounters[componentName] || 0) + 1;
             setMountKey(window.__rscRefreshCounters[componentName]);
@@ -7414,17 +7452,48 @@ export const fetchServerComponent = (componentId, props) =>
 
 // Helper function to check if a file is a server component (client-side)
 function isServerComponent(filePath) {
-  // Simple client-side check based on file path patterns
-  return filePath && (
-    filePath.includes('ServerWithClient') ||
-    filePath.includes('server') ||
-    filePath.includes('Server')
-  );
+  if (!filePath) {
+    return false;
+  }
+
+  try {
+    if (typeof globalThis !== 'undefined' && globalThis.__rari_server_components) {
+      return globalThis.__rari_server_components.has(filePath);
+    }
+
+    const hasServerPattern = (
+      filePath.includes('/functions/') ||
+      filePath.includes('\\\\functions\\\\')
+    );
+
+    return hasServerPattern;
+  } catch (error) {
+    console.warn('Error checking if file is server component:', error);
+    return false;
+  }
 }
 
-// HMR support for RSC cache invalidation
 if (import.meta.hot) {
-  // Listen for Vite's beforeFullReload event for server components
+  import.meta.hot.on('rari:register-server-component', (data) => {
+    if (data?.filePath) {
+      if (typeof globalThis !== 'undefined') {
+        globalThis.__rari_server_components = globalThis.__rari_server_components || new Set();
+        globalThis.__rari_server_components.add(data.filePath);
+      }
+    }
+  });
+
+  import.meta.hot.on('rari:server-components-registry', (data) => {
+    if (data?.serverComponents && Array.isArray(data.serverComponents)) {
+      if (typeof globalThis !== 'undefined') {
+        globalThis.__rari_server_components = globalThis.__rari_server_components || new Set();
+        data.serverComponents.forEach(path => {
+          globalThis.__rari_server_components.add(path);
+        });
+      }
+    }
+  });
+
   import.meta.hot.on('vite:beforeFullReload', async (data) => {
     if (data?.path && isServerComponent(data.path)) {
       // Immediately invalidate cache and trigger re-registration before reload
@@ -7432,13 +7501,17 @@ if (import.meta.hot) {
     }
   });
 
+  import.meta.hot.on('rari:server-component-updated', async (data) => {
+    if (data?.path && isServerComponent(data.path)) {
+      await invalidateRscCache({ filePath: data.path, forceReload: false });
+    }
+  });
+
 
 
-  // Helper function to invalidate RSC cache and trigger component re-registration
   async function invalidateRscCache(data) {
     const filePath = data?.filePath || data;
 
-    // Wait for server to be ready
     const waitForServerReady = async () => {
       for (let i = 0; i < 20; i++) { // Try for up to 2 seconds
         try {
@@ -7535,9 +7608,11 @@ ${registrations.join("\n")}
 			}
 		},
 		handleHotUpdate({ file, server }) {
-			if (/\.(?:tsx?|jsx?)$/.test(file) && isServerComponent(file)) {
-				server.hot.send("vite:beforeFullReload", {
-					type: "full-reload",
+			const isReactFile = /\.(?:tsx?|jsx?)$/.test(file);
+			const isServerComp = isServerComponent(file);
+			if (isReactFile && isServerComp) {
+				server.hot.send("rari:server-component-updated", {
+					type: "rari-hmr",
 					path: file
 				});
 				return [];

package/dist/server-build-Cs2pfA52.js

@@ -0,0 +1,3 @@
+import { ServerComponentBuilder, createServerBuildPlugin, scanDirectory } from "./server-build-DeJfuJb8.js";
+
+export { ServerComponentBuilder, scanDirectory };

package/dist/{server-build-BM8_GFF5.js → server-build-DeJfuJb8.js}

@@ -32,7 +32,7 @@ var ServerComponentBuilder = class {
 			];
 			const trimmedCode = code.trim();
 			const hasServerDirective = serverDirectives.some((directive) => trimmedCode.startsWith(directive) || code.includes(directive));
-			const isInFunctionsDir = filePath.includes("/functions/") || filePath.includes("\\functions\\");
+			const isInFunctionsDir = filePath.includes("/functions/") || filePath.includes("\\\\functions\\\\");
 			const hasServerFunctionSignature = (code.includes("export async function") || code.includes("export function")) && code.includes("'use server'");
 			const hasNodeImports = code.includes("from 'node:") || code.includes("from \"node:") || code.includes("from 'fs'") || code.includes("from \"fs\"") || code.includes("from 'path'") || code.includes("from \"path\"");
 			const hasAsyncDefaultExport = /export\s+default\s+async\s+function/.test(code);

package/dist/server.js

@@ -1,5 +1,5 @@
 import { HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent, RouterProvider, Routes, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-BXoadxa8.js";
-import { FileRouteGenerator, convertFilePatternToRoutePattern, createRouteManifest, defineRariConfig, defineRariOptions, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-BK7rNurU.js";
-import "./server-build-BM8_GFF5.js";
+import { FileRouteGenerator, convertFilePatternToRoutePattern, createRouteManifest, defineRariConfig, defineRariOptions, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-C3POnIbO.js";
+import "./server-build-DeJfuJb8.js";
 
 export { FileRouteGenerator, HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent as Route, RouterProvider, Routes, buildSearchString, buildUrl, convertFilePatternToRoutePattern, createHttpRuntimeClient, createRouteManifest, defineRariConfig, defineRariOptions, extractParamNames, findMatchingRoute, generateFileRoutes, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, loadRouteManifest, normalizePathname, parseSearchParams, parseUrl, rari, rariRouter, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, validateRoutes, watchFileRoutes, withRouter };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rari",
   "type": "module",
-  "version": "0.2.22",
+  "version": "0.2.23",
   "description": "Runtime Accelerated Rendering Infrastructure (Rari)",
   "author": "Ryan Skinner",
   "license": "MIT",
@@ -77,11 +77,11 @@
     "picocolors": "^1.1.1"
   },
   "optionalDependencies": {
-    "rari-darwin-arm64": "0.2.15",
-    "rari-darwin-x64": "0.2.15",
-    "rari-linux-arm64": "0.2.15",
-    "rari-linux-x64": "0.2.15",
-    "rari-win32-x64": "0.2.15"
+    "rari-darwin-arm64": "0.2.16",
+    "rari-darwin-x64": "0.2.16",
+    "rari-linux-arm64": "0.2.16",
+    "rari-linux-x64": "0.2.16",
+    "rari-win32-x64": "0.2.16"
   },
   "devDependencies": {
     "@types/node": "^24.3.1",

package/src/vite/index.ts

@@ -162,7 +162,7 @@ export function rari(options: RariOptions = {}): Plugin[] {
       )
 
       const isInFunctionsDir
-        = filePath.includes('/functions/') || filePath.includes('\\functions\\')
+        = filePath.includes('/functions/') || filePath.includes('\\\\functions\\\\')
       const hasServerFunctionSignature
         = (code.includes('export async function')
           || code.includes('export function'))
@@ -655,6 +655,11 @@ if (import.meta.hot) {
   import.meta.hot.accept();
 }
 
+if (typeof globalThis !== 'undefined') {
+  globalThis.__rari_server_components = globalThis.__rari_server_components || new Set();
+  globalThis.__rari_server_components.add(${JSON.stringify(id)});
+}
+
 ${clientTransformedCode}`
           }
 
@@ -843,11 +848,41 @@ const ${componentName} = registerClientReference(
           })
 
           const srcDir = path.join(projectRoot, 'src')
+          const serverComponentPaths: string[] = []
 
           if (fs.existsSync(srcDir)) {
+            const collectServerComponents = (dir: string) => {
+              const entries = fs.readdirSync(dir, { withFileTypes: true })
+              for (const entry of entries) {
+                const fullPath = path.join(dir, entry.name)
+                if (entry.isDirectory()) {
+                  collectServerComponents(fullPath)
+                }
+                else if (entry.isFile() && /\.(?:tsx?|jsx?)$/.test(entry.name)) {
+                  try {
+                    if (isServerComponent(fullPath)) {
+                      serverComponentPaths.push(fullPath)
+                    }
+                  }
+                  catch (error) {
+                    console.warn(`[RARI] Error checking ${fullPath}:`, error)
+                  }
+                }
+              }
+            }
+
+            collectServerComponents(srcDir)
             scanDirectory(srcDir, builder)
           }
 
+          if (serverComponentPaths.length > 0) {
+            server.ws.send({
+              type: 'custom',
+              event: 'rari:server-components-registry',
+              data: { serverComponents: serverComponentPaths },
+            })
+          }
+
           const components
             = await builder.getTransformedComponentsForDevelopment()
 
@@ -1128,6 +1163,11 @@ const ${componentName} = registerClientReference(
 
         if (/\.(?:tsx?|jsx?)$/.test(filePath) && filePath.includes(srcDir)) {
           if (isServerComponent(filePath)) {
+            server.ws.send({
+              type: 'custom',
+              event: 'rari:register-server-component',
+              data: { filePath },
+            })
             await handleServerComponentHMR(filePath)
           }
           else {
@@ -1517,7 +1557,9 @@ class RscClient {
   }
 
   async fetchServerComponent(componentId, props = {}) {
-    const cacheKey = componentId + ':' + JSON.stringify(props);
+    const hmrCounter = (typeof window !== 'undefined' && window.__rscRefreshCounters && window.__rscRefreshCounters[componentId]) || 0;
+    const cacheKey = componentId + ':' + JSON.stringify(props) + ':hmr:' + hmrCounter;
+
 
     if (this.componentCache.has(cacheKey)) {
       return this.componentCache.get(cacheKey);
@@ -1763,14 +1805,15 @@ class RscClient {
           buffered = lines[lines.length - 1];
 
           for (const line of completeLines) {
-            if (!line.trim()) continue;
+              if (!line.trim()) continue;
 
-            try {
-              const colonIndex = line.indexOf(':');
-              if (colonIndex === -1) continue;
+              try {
+                const colonIndex = line.indexOf(':');
+                if (colonIndex === -1) continue;
+
+                const rowId = line.substring(0, colonIndex);
+                const content = line.substring(colonIndex + 1);
 
-              const rowId = line.substring(0, colonIndex);
-              const content = line.substring(colonIndex + 1);
 
               if (content.includes('STREAM_COMPLETE')) {
                 isComplete = true;
@@ -2305,6 +2348,9 @@ function createServerComponentWrapper(componentName, importPath) {
       const handleRscInvalidate = (event) => {
         const detail = event.detail;
         if (detail && detail.filePath && isServerComponent(detail.filePath)) {
+
+          rscClient.clearCache();
+
           if (typeof window !== 'undefined') {
             window.__rscRefreshCounters[componentName] = (window.__rscRefreshCounters[componentName] || 0) + 1;
             setMountKey(window.__rscRefreshCounters[componentName]);
@@ -2340,17 +2386,48 @@ export const fetchServerComponent = (componentId, props) =>
 
 // Helper function to check if a file is a server component (client-side)
 function isServerComponent(filePath) {
-  // Simple client-side check based on file path patterns
-  return filePath && (
-    filePath.includes('ServerWithClient') ||
-    filePath.includes('server') ||
-    filePath.includes('Server')
-  );
+  if (!filePath) {
+    return false;
+  }
+
+  try {
+    if (typeof globalThis !== 'undefined' && globalThis.__rari_server_components) {
+      return globalThis.__rari_server_components.has(filePath);
+    }
+
+    const hasServerPattern = (
+      filePath.includes('/functions/') ||
+      filePath.includes('\\\\functions\\\\')
+    );
+
+    return hasServerPattern;
+  } catch (error) {
+    console.warn('Error checking if file is server component:', error);
+    return false;
+  }
 }
 
-// HMR support for RSC cache invalidation
 if (import.meta.hot) {
-  // Listen for Vite's beforeFullReload event for server components
+  import.meta.hot.on('rari:register-server-component', (data) => {
+    if (data?.filePath) {
+      if (typeof globalThis !== 'undefined') {
+        globalThis.__rari_server_components = globalThis.__rari_server_components || new Set();
+        globalThis.__rari_server_components.add(data.filePath);
+      }
+    }
+  });
+
+  import.meta.hot.on('rari:server-components-registry', (data) => {
+    if (data?.serverComponents && Array.isArray(data.serverComponents)) {
+      if (typeof globalThis !== 'undefined') {
+        globalThis.__rari_server_components = globalThis.__rari_server_components || new Set();
+        data.serverComponents.forEach(path => {
+          globalThis.__rari_server_components.add(path);
+        });
+      }
+    }
+  });
+
   import.meta.hot.on('vite:beforeFullReload', async (data) => {
     if (data?.path && isServerComponent(data.path)) {
       // Immediately invalidate cache and trigger re-registration before reload
@@ -2358,13 +2435,17 @@ if (import.meta.hot) {
     }
   });
 
+  import.meta.hot.on('rari:server-component-updated', async (data) => {
+    if (data?.path && isServerComponent(data.path)) {
+      await invalidateRscCache({ filePath: data.path, forceReload: false });
+    }
+  });
+
 
 
-  // Helper function to invalidate RSC cache and trigger component re-registration
   async function invalidateRscCache(data) {
     const filePath = data?.filePath || data;
 
-    // Wait for server to be ready
     const waitForServerReady = async () => {
       for (let i = 0; i < 20; i++) { // Try for up to 2 seconds
         try {
@@ -2473,9 +2554,12 @@ ${registrations.join('\n')}
     },
 
     handleHotUpdate({ file, server }) {
-      if (/\.(?:tsx?|jsx?)$/.test(file) && isServerComponent(file)) {
-        server.hot.send('vite:beforeFullReload', {
-          type: 'full-reload',
+      const isReactFile = /\.(?:tsx?|jsx?)$/.test(file)
+      const isServerComp = isServerComponent(file)
+
+      if (isReactFile && isServerComp) {
+        server.hot.send('rari:server-component-updated', {
+          type: 'rari-hmr',
           path: file,
         })
         return []

package/src/vite/server-build.ts

@@ -80,7 +80,7 @@ export class ServerComponentBuilder {
       )
 
       const isInFunctionsDir
-        = filePath.includes('/functions/') || filePath.includes('\\functions\\')
+        = filePath.includes('/functions/') || filePath.includes('\\\\functions\\\\')
       const hasServerFunctionSignature
         = (code.includes('export async function')
           || code.includes('export function'))

package/dist/server-build-DcbOtG3e.js

@@ -1,3 +0,0 @@
-import { ServerComponentBuilder, createServerBuildPlugin, scanDirectory } from "./server-build-BM8_GFF5.js";
-
-export { ServerComponentBuilder, scanDirectory };