rwsdk 1.0.0-alpha.7 → 1.0.0-alpha.8

package/dist/runtime/lib/router.js

@@ -180,8 +180,14 @@ export function index(handler) {
 export function prefix(prefixPath, routes) {
     return routes.map((r) => {
         if (typeof r === "function") {
-            // Pass through middleware as-is
-            return r;
+            const middleware = (requestInfo) => {
+                const url = new URL(requestInfo.request.url);
+                if (url.pathname.startsWith(prefixPath)) {
+                    return r(requestInfo);
+                }
+                return;
+            };
+            return middleware;
         }
         if (Array.isArray(r)) {
             // Recursively process nested route arrays

package/dist/runtime/lib/router.test.js

@@ -1,6 +1,6 @@
 import { describe, it, expect } from "vitest";
 import React from "react";
-import { matchPath, defineRoutes, route, render, layout } from "./router";
+import { matchPath, defineRoutes, route, render, layout, prefix, } from "./router";
 describe("matchPath", () => {
     // Test case 1: Static paths
     it("should match static paths", () => {
@@ -209,6 +209,90 @@ describe("defineRoutes - Request Handling Behavior", () => {
             expect(await response.text()).toBe("Rendered: Element");
         });
     });
+    describe("Prefix Handling", () => {
+        it("should only run middleware within the specified prefix", async () => {
+            const executionOrder = [];
+            const prefixedMiddleware = () => {
+                executionOrder.push("prefixedMiddleware");
+            };
+            const PageComponent = () => {
+                executionOrder.push("PageComponent");
+                return React.createElement("div", {}, "Page");
+            };
+            const AdminPageComponent = () => {
+                executionOrder.push("AdminPageComponent");
+                return React.createElement("div", {}, "Admin Page");
+            };
+            const router = defineRoutes([
+                ...prefix("/admin", [
+                    prefixedMiddleware,
+                    route("/", AdminPageComponent),
+                ]),
+                route("/", PageComponent),
+            ]);
+            const deps = createMockDependencies();
+            // Test 1: Request to a path outside the prefix
+            deps.mockRequestInfo.request = new Request("http://localhost:3000/");
+            const request1 = new Request("http://localhost:3000/");
+            await router.handle({
+                request: request1,
+                renderPage: deps.mockRenderPage,
+                getRequestInfo: deps.getRequestInfo,
+                onError: deps.onError,
+                runWithRequestInfoOverrides: deps.mockRunWithRequestInfoOverrides,
+                rscActionHandler: deps.mockRscActionHandler,
+            });
+            expect(executionOrder).toEqual(["PageComponent"]);
+            // Reset execution order
+            executionOrder.length = 0;
+            // Test 2: Request to a path inside the prefix
+            deps.mockRequestInfo.request = new Request("http://localhost:3000/admin/");
+            const request2 = new Request("http://localhost:3000/admin/");
+            await router.handle({
+                request: request2,
+                renderPage: deps.mockRenderPage,
+                getRequestInfo: deps.getRequestInfo,
+                onError: deps.onError,
+                runWithRequestInfoOverrides: deps.mockRunWithRequestInfoOverrides,
+                rscActionHandler: deps.mockRscActionHandler,
+            });
+            expect(executionOrder).toEqual([
+                "prefixedMiddleware",
+                "AdminPageComponent",
+            ]);
+        });
+        it("should short-circuit from a prefixed middleware", async () => {
+            const executionOrder = [];
+            const prefixedMiddleware = () => {
+                executionOrder.push("prefixedMiddleware");
+                return new Response("From prefixed middleware");
+            };
+            const AdminPageComponent = () => {
+                executionOrder.push("AdminPageComponent");
+                return React.createElement("div", {}, "Admin Page");
+            };
+            const router = defineRoutes([
+                ...prefix("/admin", [
+                    prefixedMiddleware,
+                    route("/", AdminPageComponent),
+                ]),
+            ]);
+            const deps = createMockDependencies();
+            // Request to a path inside the prefix
+            deps.mockRequestInfo.request = new Request("http://localhost:3000/admin/");
+            const request = new Request("http://localhost:3000/admin/");
+            const response = await router.handle({
+                request,
+                renderPage: deps.mockRenderPage,
+                getRequestInfo: deps.getRequestInfo,
+                onError: deps.onError,
+                runWithRequestInfoOverrides: deps.mockRunWithRequestInfoOverrides,
+                rscActionHandler: deps.mockRscActionHandler,
+            });
+            expect(executionOrder).toEqual(["prefixedMiddleware"]);
+            expect(await response.text()).toBe("From prefixed middleware");
+        });
+    });
     describe("RSC Action Handling", () => {
         it("should handle RSC actions before the first route definition", async () => {
             const executionOrder = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.8",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {