Single-fetch typesafety

integration/single-fetch-test.ts

@@ -71,13 +71,19 @@ const files = {
       };
     }
 
+    class MyClass {}
+
     export function loader({ request }) {
       if (new URL(request.url).searchParams.has("error")) {
         throw new Error("Loader Error");
       }
       return {
         message: "DATA",
         date: new Date("${ISO_DATE}"),
+        unserializable: {
+          function: () => {},
+          class: new MyClass(),
+        },
       };
     }
 
@@ -113,13 +119,19 @@ const files = {
       }, { status: 201, headers: { 'X-Action': 'yes' }});
     }
 
+    class MyClass {}
+
     export function loader({ request }) {
       if (new URL(request.url).searchParams.has("error")) {
         throw new Error("Loader Error");
       }
       return data({
         message: "DATA",
         date: new Date("${ISO_DATE}"),
+        unserializable: {
+          function: () => {},
+          class: new MyClass(),
+        },
       }, { status: 206, headers: { 'X-Loader': 'yes' }});
     }
 
@@ -175,7 +187,7 @@ test.describe("single-fetch", () => {
     expect(res.headers.get("Content-Type")).toBe("text/x-script");
 
     res = await fixture.requestSingleFetchData("/data.data");
-    expect(res.data).toEqual({
+    expect(res.data).toStrictEqual({
       root: {
         data: {
           message: "ROOT",
@@ -185,6 +197,10 @@ test.describe("single-fetch", () => {
         data: {
           message: "DATA",
           date: new Date(ISO_DATE),
+          unserializable: {
+            function: undefined,
+            class: undefined,
+          },
         },
       },
     });
@@ -255,7 +271,7 @@ test.describe("single-fetch", () => {
     let res = await fixture.requestSingleFetchData("/data-with-response.data");
     expect(res.status).toEqual(206);
     expect(res.headers.get("X-Loader")).toEqual("yes");
-    expect(res.data).toEqual({
+    expect(res.data).toStrictEqual({
       root: {
         data: {
           message: "ROOT",
@@ -265,6 +281,10 @@ test.describe("single-fetch", () => {
         data: {
           message: "DATA",
           date: new Date(ISO_DATE),
+          unserializable: {
+            function: undefined,
+            class: undefined,
+          },
         },
       },
     });

packages/remix-cloudflare/index.ts

@@ -13,8 +13,6 @@ export {
   createRequestHandler,
   createSession,
   unstable_data,
-  unstable_defineLoader,
-  unstable_defineAction,
   defer,
   broadcastDevReady,
   logDevReady,
@@ -42,6 +40,7 @@ export type {
   DataFunctionArgs,
   EntryContext,
   ErrorResponse,
+  Future,
   HandleDataRequestFunction,
   HandleDocumentRequestFunction,
   HeadersArgs,

packages/remix-deno/index.ts

@@ -28,8 +28,6 @@ export {
   unstable_composeUploadHandlers,
   unstable_createMemoryUploadHandler,
   unstable_data,
-  unstable_defineAction,
-  unstable_defineLoader,
   unstable_parseMultipartFormData,
 } from "@remix-run/server-runtime";
 
@@ -45,6 +43,7 @@ export type {
   DataFunctionArgs,
   EntryContext,
   ErrorResponse,
+  Future,
   HandleDataRequestFunction,
   HandleDocumentRequestFunction,
   HandleErrorFunction,

packages/remix-node/index.ts

@@ -25,8 +25,6 @@ export {
   createRequestHandler,
   createSession,
   unstable_data,
-  unstable_defineLoader,
-  unstable_defineAction,
   defer,
   broadcastDevReady,
   logDevReady,
@@ -54,6 +52,7 @@ export type {
   DataFunctionArgs,
   EntryContext,
   ErrorResponse,
+  Future,
   HandleDataRequestFunction,
   HandleDocumentRequestFunction,
   HeadersArgs,

packages/remix-react/index.tsx

@@ -113,14 +113,6 @@ export { ScrollRestoration } from "./scroll-restoration";
 
 export type { RemixServerProps } from "./server";
 export { RemixServer } from "./server";
-export type {
-  ClientAction as unstable_ClientAction,
-  ClientLoader as unstable_ClientLoader,
-} from "./single-fetch";
-export {
-  defineClientAction as unstable_defineClientAction,
-  defineClientLoader as unstable_defineClientLoader,
-} from "./single-fetch";
 
 export type {
   FutureConfig as UNSAFE_FutureConfig,

packages/remix-react/package.json

@@ -23,7 +23,7 @@
     "@remix-run/server-runtime": "workspace:*",
     "react-router": "0.0.0-experimental-7d87ffb8c",
     "react-router-dom": "0.0.0-experimental-7d87ffb8c",
-    "turbo-stream": "2.3.0"
+    "turbo-stream": "2.4.0"
   },
   "devDependencies": {
     "@remix-run/node": "workspace:*",

packages/remix-react/rollup.config.js

@@ -51,7 +51,6 @@ module.exports = function rollup() {
           { src: "LICENSE.md", dest: [outputDir, sourceDir] },
           { src: `${sourceDir}/package.json`, dest: outputDir },
           { src: `${sourceDir}/README.md`, dest: outputDir },
-          { src: `${sourceDir}/future`, dest: outputDir },
         ],
       }),
       copyToPlaygrounds(),

packages/remix-react/single-fetch.tsx

@@ -1,7 +1,5 @@
 import * as React from "react";
 import type {
-  ActionFunctionArgs as RRActionArgs,
-  LoaderFunctionArgs as RRLoaderArgs,
   unstable_DataStrategyFunction as DataStrategyFunction,
   unstable_HandlerResult as HandlerResult,
 } from "@remix-run/router";
@@ -14,9 +12,6 @@ import {
 import type {
   UNSAFE_SingleFetchResult as SingleFetchResult,
   UNSAFE_SingleFetchResults as SingleFetchResults,
-  unstable_Action,
-  unstable_Loader,
-  unstable_Serialize,
 } from "@remix-run/server-runtime";
 import { UNSAFE_SingleFetchRedirectSymbol as SingleFetchRedirectSymbol } from "@remix-run/server-runtime";
 import type {
@@ -31,23 +26,6 @@ import { escapeHtml } from "./markup";
 import type { RouteModules } from "./routeModules";
 import invariant from "./invariant";
 
-// clientLoader
-type ClientLoaderArgs = RRLoaderArgs<undefined> & {
-  serverLoader: <T extends unstable_Loader>() => Promise<unstable_Serialize<T>>;
-};
-export type ClientLoader = (args: ClientLoaderArgs) => unknown;
-export let defineClientLoader = <T extends ClientLoader>(
-  clientLoader: T
-): T & { hydrate?: boolean } => clientLoader;
-
-// clientAction
-type ClientActionArgs = RRActionArgs<undefined> & {
-  serverAction: <T extends unstable_Action>() => Promise<unstable_Serialize<T>>;
-};
-export type ClientAction = (args: ClientActionArgs) => unknown;
-export let defineClientAction = <T extends ClientAction>(clientAction: T): T =>
-  clientAction;
-
 interface StreamTransferProps {
   context: EntryContext;
   identifier: number;
@@ -380,6 +358,14 @@ export function decodeViaTurboStream(
           return { value: { [SingleFetchRedirectSymbol]: rest[0] } };
         }
       },
+      (type, value) => {
+        if (type === "SingleFetchFallback") {
+          return { value: undefined };
+        }
+        if (type === "SingleFetchClassInstance") {
+          return { value };
+        }
+      },
     ],
   });
 }

packages/remix-server-runtime/future.ts

@@ -0,0 +1 @@
+export interface Future {}

packages/remix-server-runtime/index.ts

@@ -9,13 +9,8 @@ export { defer, json, redirect, redirectDocument, replace } from "./responses";
 export {
   SingleFetchRedirectSymbol as UNSAFE_SingleFetchRedirectSymbol,
   data as unstable_data,
-  defineLoader as unstable_defineLoader,
-  defineAction as unstable_defineAction,
 } from "./single-fetch";
 export type {
-  Loader as unstable_Loader,
-  Action as unstable_Action,
-  Serialize as unstable_Serialize,
   SingleFetchResult as UNSAFE_SingleFetchResult,
   SingleFetchResults as UNSAFE_SingleFetchResults,
 } from "./single-fetch";
@@ -64,6 +59,7 @@ export type {
   EntryContext,
   ErrorResponse,
   FlashSessionData,
+  Future,
   HandleDataRequestFunction,
   HandleDocumentRequestFunction,
   HeadersArgs,

packages/remix-server-runtime/package.json

@@ -25,7 +25,7 @@
     "cookie": "^0.6.0",
     "set-cookie-parser": "^2.4.8",
     "source-map": "^0.7.3",
-    "turbo-stream": "2.3.0"
+    "turbo-stream": "2.4.0"
   },
   "devDependencies": {
     "@types/set-cookie-parser": "^2.4.1",

packages/remix-server-runtime/reexport.ts

@@ -28,6 +28,8 @@ export type { AppLoadContext } from "./data";
 
 export type { EntryContext } from "./entry";
 
+export type { Future } from "./future";
+
 export type {
   HtmlLinkDescriptor,
   LinkDescriptor,

packages/remix-server-runtime/serialize.ts

@@ -6,6 +6,12 @@ import type {
 } from "./routeModules";
 import { expectType } from "./typecheck";
 import { type Expect, type Equal } from "./typecheck";
+import { type SerializeFrom as SingleFetch_SerializeFrom } from "./single-fetch";
+import type { Future } from "./future";
+
+// prettier-ignore
+type SingleFetchEnabled =
+  Future extends { singleFetch: infer T extends boolean } ? T : false
 
 // prettier-ignore
 /**
@@ -17,6 +23,11 @@ import { type Expect, type Equal } from "./typecheck";
  * `type LoaderData = SerializeFrom<typeof loader>`
  */
 export type SerializeFrom<T> =
+  SingleFetchEnabled extends true ?
+    T extends (...args: []) => unknown ?
+      SingleFetch_SerializeFrom<T> :
+      never
+  :
   T extends (...args: any[]) => infer Output ?
     Parameters<T> extends [ClientLoaderFunctionArgs | ClientActionFunctionArgs] ?
       // Client data functions may not serialize
@@ -27,7 +38,6 @@ export type SerializeFrom<T> =
   :
   // Back compat: manually defined data type, not inferred from loader nor action
   Jsonify<Awaited<T>>
-;
 
 // note: cannot be inlined as logic requires union distribution
 // prettier-ignore