rwsdk 0.3.8 → 1.0.0-alpha.0

package/dist/runtime/lib/router.d.ts

@@ -17,6 +17,7 @@ export type RwContext = {
     databases: Map<string, Kysely<any>>;
     scriptsToBeLoaded: Set<string>;
     pageRouteResolved: PromiseWithResolvers<void> | undefined;
+    actionResult?: unknown;
 };
 export type RouteMiddleware<T extends RequestInfo = RequestInfo> = (requestInfo: T) => MaybePromise<React.JSX.Element | Response | void>;
 type RouteFunction<T extends RequestInfo = RequestInfo> = (requestInfo: T) => MaybePromise<Response>;
@@ -32,12 +33,13 @@ export type RouteDefinition<T extends RequestInfo = RequestInfo> = {
 export declare function matchPath<T extends RequestInfo = RequestInfo>(routePath: string, requestPath: string): T["params"] | null;
 export declare function defineRoutes<T extends RequestInfo = RequestInfo>(routes: Route<T>[]): {
     routes: Route<T>[];
-    handle: ({ request, renderPage, getRequestInfo, onError, runWithRequestInfoOverrides, }: {
+    handle: ({ request, renderPage, getRequestInfo, onError, runWithRequestInfoOverrides, rscActionHandler, }: {
         request: Request;
         renderPage: (requestInfo: T, Page: React.FC, onError: (error: unknown) => void) => Promise<Response>;
         getRequestInfo: () => T;
         onError: (error: unknown) => void;
         runWithRequestInfoOverrides: <Result>(overrides: Partial<T>, fn: () => Promise<Result>) => Promise<Result>;
+        rscActionHandler: (request: Request) => Promise<unknown>;
     }) => Response | Promise<Response>;
 };
 export declare function route<T extends RequestInfo = RequestInfo>(path: string, handler: RouteHandler<T>): RouteDefinition<T>;

package/dist/runtime/lib/router.js

@@ -64,49 +64,15 @@ export function defineRoutes(routes) {
     const flattenedRoutes = flattenRoutes(routes);
     return {
         routes: flattenedRoutes,
-        async handle({ request, renderPage, getRequestInfo, onError, runWithRequestInfoOverrides, }) {
+        async handle({ request, renderPage, getRequestInfo, onError, runWithRequestInfoOverrides, rscActionHandler, }) {
             const url = new URL(request.url);
             let path = url.pathname;
             // Must end with a trailing slash.
             if (path !== "/" && !path.endsWith("/")) {
                 path = path + "/";
             }
-            // Flow below; helpers are declared after the main flow for readability
-            // 1) Global middlewares: run any middleware functions encountered (Response short-circuits, element renders)
-            // 2) Route matching: skip non-matching route definitions; stop at first match
-            // 3) Route-specific middlewares: run middlewares attached to the matched route
-            // 4) Final component: render the matched route's final component (layouts apply only here)
-            for (const route of flattenedRoutes) {
-                // 1) Global middlewares (encountered before a match)
-                if (typeof route === "function") {
-                    const result = await route(getRequestInfo());
-                    const handled = await handleMiddlewareResult(result);
-                    if (handled) {
-                        return handled;
-                    }
-                    continue;
-                }
-                // 2) Route matching (skip if not matched)
-                const params = matchPath(route.path, path);
-                if (!params) {
-                    continue;
-                }
-                // Found a match: 3) route middlewares, then 4) final component, then stop
-                return await runWithRequestInfoOverrides({ params }, async () => {
-                    const { routeMiddlewares, componentHandler } = parseHandlers(route.handler);
-                    // 3) Route-specific middlewares
-                    const mwHandled = await handleRouteMiddlewares(routeMiddlewares);
-                    if (mwHandled) {
-                        return mwHandled;
-                    }
-                    // 4) Final component (always last item)
-                    return await handleRouteComponent(componentHandler, route.layouts || []);
-                });
-            }
-            // No route matched and no middleware handled the request
-            // todo(peterp, 2025-01-28): Allow the user to define their own "not found" route.
-            return new Response("Not Found", { status: 404 });
             // --- Helpers ---
+            // (Hoisted for readability)
             function parseHandlers(handler) {
                 const handlers = Array.isArray(handler) ? handler : [handler];
                 const routeMiddlewares = handlers.slice(0, Math.max(handlers.length - 1, 0));
@@ -130,38 +96,60 @@ export function defineRoutes(routes) {
                 }
                 return undefined;
             }
-            // Note: We no longer have separate global pass or match-only pass;
-            // the outer single pass above handles both behaviors correctly.
-            async function handleRouteMiddlewares(mws) {
-                for (const mw of mws) {
-                    const result = await mw(getRequestInfo());
-                    const handled = await handleMiddlewareResult(result);
-                    if (handled)
-                        return handled;
+            // --- Main flow ---
+            const globalMiddlewares = flattenedRoutes.filter((route) => typeof route === "function");
+            const routeDefinitions = flattenedRoutes.filter((route) => typeof route !== "function");
+            // 1. Run global middlewares
+            for (const middleware of globalMiddlewares) {
+                const result = await middleware(getRequestInfo());
+                const handled = await handleMiddlewareResult(result);
+                if (handled) {
+                    return handled;
                 }
-                return undefined;
             }
-            async function handleRouteComponent(component, layouts) {
-                if (isRouteComponent(component)) {
-                    const requestInfo = getRequestInfo();
-                    const WrappedComponent = wrapWithLayouts(wrapHandlerToThrowResponses(component), layouts, requestInfo);
-                    if (!isClientReference(component)) {
-                        // context(justinvdm, 31 Jul 2025): We now know we're dealing with a page route,
-                        // so we create a deferred so that we can signal when we're done determining whether
-                        // we're returning a response or a react element
-                        requestInfo.rw.pageRouteResolved = Promise.withResolvers();
-                    }
-                    return await renderPage(requestInfo, WrappedComponent, onError);
+            // 2. Handle RSC actions
+            if (url.searchParams.has("__rsc_action_id")) {
+                getRequestInfo().rw.actionResult = await rscActionHandler(request);
+            }
+            // 3. Match and handle routes
+            for (const route of routeDefinitions) {
+                const params = matchPath(route.path, path);
+                if (!params) {
+                    continue;
                 }
-                // If the last handler is not a component, handle as middleware result (no layouts)
-                const tailResult = await component(getRequestInfo());
-                const handledTail = await handleMiddlewareResult(tailResult);
-                if (handledTail)
-                    return handledTail;
-                return new Response("Response not returned from route handler", {
-                    status: 500,
+                // Found a match: run route-specific middlewares, then the final component
+                return await runWithRequestInfoOverrides({ params }, async () => {
+                    const { routeMiddlewares, componentHandler } = parseHandlers(route.handler);
+                    // 3a. Route-specific middlewares
+                    for (const mw of routeMiddlewares) {
+                        const result = await mw(getRequestInfo());
+                        const handled = await handleMiddlewareResult(result);
+                        if (handled) {
+                            return handled;
+                        }
+                    }
+                    // 3b. Final component/handler
+                    if (isRouteComponent(componentHandler)) {
+                        const requestInfo = getRequestInfo();
+                        const WrappedComponent = wrapWithLayouts(wrapHandlerToThrowResponses(componentHandler), route.layouts || [], requestInfo);
+                        if (!isClientReference(componentHandler)) {
+                            requestInfo.rw.pageRouteResolved = Promise.withResolvers();
+                        }
+                        return await renderPage(requestInfo, WrappedComponent, onError);
+                    }
+                    // Handle non-component final handler (e.g., returns new Response)
+                    const tailResult = await componentHandler(getRequestInfo());
+                    const handledTail = await handleMiddlewareResult(tailResult);
+                    if (handledTail) {
+                        return handledTail;
+                    }
+                    return new Response("Response not returned from route handler", {
+                        status: 500,
+                    });
                 });
             }
+            // No route matched
+            return new Response("Not Found", { status: 404 });
         },
     };
 }

package/dist/runtime/requestInfo/types.d.ts

@@ -12,4 +12,5 @@ export interface RequestInfo<Params = any, AppContext = DefaultAppContext> {
     response: ResponseInit & {
         headers: Headers;
     };
+    isAction: boolean;
 }

package/dist/runtime/worker.js

@@ -33,6 +33,7 @@ export const defineApp = (routes) => {
                 const url = new URL(request.url);
                 const isRSCRequest = url.searchParams.has("__rsc") ||
                     request.headers.get("accept")?.includes("text/x-component");
+                const isAction = url.searchParams.has("__rsc_action_id");
                 const userHeaders = new Headers();
                 const rw = {
                     Document: DefaultDocument,
@@ -55,6 +56,7 @@ export const defineApp = (routes) => {
                     ctx: {},
                     rw,
                     response: userResponseInit,
+                    isAction,
                 };
                 const createPageElement = (requestInfo, Page) => {
                     let pageElement;
@@ -77,11 +79,7 @@ export const defineApp = (routes) => {
                             status: 500,
                         });
                     }
-                    let actionResult = undefined;
-                    const isRSCActionHandler = url.searchParams.has("__rsc_action_id");
-                    if (isRSCActionHandler) {
-                        actionResult = await rscActionHandler(request);
-                    }
+                    const actionResult = requestInfo.rw.actionResult;
                     const pageElement = createPageElement(requestInfo, Page);
                     const { rscPayload: shouldInjectRSCPayload } = rw;
                     let rscPayloadStream = renderToRscStream({
@@ -131,6 +129,7 @@ export const defineApp = (routes) => {
                             getRequestInfo: getRequestInfo,
                             runWithRequestInfoOverrides,
                             onError: reject,
+                            rscActionHandler,
                         }));
                     }
                     catch (e) {

package/dist/vite/miniflareHMRPlugin.mjs

@@ -146,7 +146,6 @@ export const miniflareHMRPlugin = (givenOptions) => [
                 invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "/@id/virtual:use-server-lookup.js");
                 invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "virtual:use-server-lookup.js");
             }
-            // todo(justinvdm, 12 Dec 2024): Skip client references
             const modules = Array.from(ctx.server.environments[environment].moduleGraph.getModulesByFile(ctx.file) ?? []);
             const isWorkerUpdate = Boolean(modules);
             // The worker needs an update, but this is the client environment

package/package.json

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