@tanstack/start-client-core 1.132.41 → 1.132.45

package/dist/esm/client/hydrateStart.js

@@ -18,6 +18,9 @@ async function hydrateStart() {
     };
   }
   serializationAdapters.push(ServerFunctionSerializationAdapter);
+  if (router.options.serializationAdapters) {
+    serializationAdapters.push(...router.options.serializationAdapters);
+  }
   router.update({
     basepath: process.env.TSS_ROUTER_BASEPATH,
     ...{ serializationAdapters }

package/dist/esm/client/hydrateStart.js.map

@@ -1 +1 @@
-{"version":3,"file":"hydrateStart.js","sources":["../../../src/client/hydrateStart.ts"],"sourcesContent":["import { hydrate } from '@tanstack/router-core/ssr/client'\n\nimport { ServerFunctionSerializationAdapter } from './ServerFunctionSerializationAdapter'\nimport type { AnyStartInstanceOptions } from '../createStart'\nimport type { AnyRouter, AnySerializationAdapter } from '@tanstack/router-core'\nimport { startInstance } from '#tanstack-start-entry'\nimport { getRouter } from '#tanstack-router-entry'\n\nexport async function hydrateStart(): Promise<AnyRouter> {\n  const router = await getRouter()\n\n  let serializationAdapters: Array<AnySerializationAdapter>\n  if (startInstance) {\n    const startOptions = await startInstance.getOptions()\n    startOptions.serializationAdapters =\n      startOptions.serializationAdapters ?? []\n    window.__TSS_START_OPTIONS__ = startOptions as AnyStartInstanceOptions\n    serializationAdapters = startOptions.serializationAdapters\n    router.options.defaultSsr = startOptions.defaultSsr\n  } else {\n    serializationAdapters = []\n    window.__TSS_START_OPTIONS__ = {\n      serializationAdapters,\n    } as AnyStartInstanceOptions\n  }\n\n  serializationAdapters.push(ServerFunctionSerializationAdapter)\n\n  router.update({\n    basepath: process.env.TSS_ROUTER_BASEPATH,\n    ...{ serializationAdapters },\n  })\n  if (!router.state.matches.length) {\n    await hydrate(router)\n  }\n\n  return router\n}\n"],"names":[],"mappings":";;;;AAQA,eAAsB,eAAmC;AACvD,QAAM,SAAS,MAAM,UAAA;AAErB,MAAI;AACJ,MAAI,eAAe;AACjB,UAAM,eAAe,MAAM,cAAc,WAAA;AACzC,iBAAa,wBACX,aAAa,yBAAyB,CAAA;AACxC,WAAO,wBAAwB;AAC/B,4BAAwB,aAAa;AACrC,WAAO,QAAQ,aAAa,aAAa;AAAA,EAC3C,OAAO;AACL,4BAAwB,CAAA;AACxB,WAAO,wBAAwB;AAAA,MAC7B;AAAA,IAAA;AAAA,EAEJ;AAEA,wBAAsB,KAAK,kCAAkC;AAE7D,SAAO,OAAO;AAAA,IACZ,UAAU,QAAQ,IAAI;AAAA,IACtB,GAAG,EAAE,sBAAA;AAAA,EAAsB,CAC5B;AACD,MAAI,CAAC,OAAO,MAAM,QAAQ,QAAQ;AAChC,UAAM,QAAQ,MAAM;AAAA,EACtB;AAEA,SAAO;AACT;"}
+{"version":3,"file":"hydrateStart.js","sources":["../../../src/client/hydrateStart.ts"],"sourcesContent":["import { hydrate } from '@tanstack/router-core/ssr/client'\n\nimport { ServerFunctionSerializationAdapter } from './ServerFunctionSerializationAdapter'\nimport type { AnyStartInstanceOptions } from '../createStart'\nimport type { AnyRouter, AnySerializationAdapter } from '@tanstack/router-core'\nimport { startInstance } from '#tanstack-start-entry'\nimport { getRouter } from '#tanstack-router-entry'\n\nexport async function hydrateStart(): Promise<AnyRouter> {\n  const router = await getRouter()\n\n  let serializationAdapters: Array<AnySerializationAdapter>\n  if (startInstance) {\n    const startOptions = await startInstance.getOptions()\n    startOptions.serializationAdapters =\n      startOptions.serializationAdapters ?? []\n    window.__TSS_START_OPTIONS__ = startOptions as AnyStartInstanceOptions\n    serializationAdapters = startOptions.serializationAdapters\n    router.options.defaultSsr = startOptions.defaultSsr\n  } else {\n    serializationAdapters = []\n    window.__TSS_START_OPTIONS__ = {\n      serializationAdapters,\n    } as AnyStartInstanceOptions\n  }\n\n  serializationAdapters.push(ServerFunctionSerializationAdapter)\n  if (router.options.serializationAdapters) {\n    serializationAdapters.push(...router.options.serializationAdapters)\n  }\n\n  router.update({\n    basepath: process.env.TSS_ROUTER_BASEPATH,\n    ...{ serializationAdapters },\n  })\n  if (!router.state.matches.length) {\n    await hydrate(router)\n  }\n\n  return router\n}\n"],"names":[],"mappings":";;;;AAQA,eAAsB,eAAmC;AACvD,QAAM,SAAS,MAAM,UAAA;AAErB,MAAI;AACJ,MAAI,eAAe;AACjB,UAAM,eAAe,MAAM,cAAc,WAAA;AACzC,iBAAa,wBACX,aAAa,yBAAyB,CAAA;AACxC,WAAO,wBAAwB;AAC/B,4BAAwB,aAAa;AACrC,WAAO,QAAQ,aAAa,aAAa;AAAA,EAC3C,OAAO;AACL,4BAAwB,CAAA;AACxB,WAAO,wBAAwB;AAAA,MAC7B;AAAA,IAAA;AAAA,EAEJ;AAEA,wBAAsB,KAAK,kCAAkC;AAC7D,MAAI,OAAO,QAAQ,uBAAuB;AACxC,0BAAsB,KAAK,GAAG,OAAO,QAAQ,qBAAqB;AAAA,EACpE;AAEA,SAAO,OAAO;AAAA,IACZ,UAAU,QAAQ,IAAI;AAAA,IACtB,GAAG,EAAE,sBAAA;AAAA,EAAsB,CAC5B;AACD,MAAI,CAAC,OAAO,MAAM,QAAQ,QAAQ;AAChC,UAAM,QAAQ,MAAM;AAAA,EACtB;AAEA,SAAO;AACT;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-client-core",
-  "version": "1.132.41",
+  "version": "1.132.45",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -66,8 +66,8 @@
     "seroval": "^1.3.2",
     "tiny-invariant": "^1.3.3",
     "tiny-warning": "^1.0.3",
-    "@tanstack/router-core": "1.132.41",
-    "@tanstack/start-storage-context": "1.132.41"
+    "@tanstack/router-core": "1.132.45",
+    "@tanstack/start-storage-context": "1.132.45"
   },
   "scripts": {}
 }

package/src/client/hydrateStart.ts

@@ -25,6 +25,9 @@ export async function hydrateStart(): Promise<AnyRouter> {
   }
 
   serializationAdapters.push(ServerFunctionSerializationAdapter)
+  if (router.options.serializationAdapters) {
+    serializationAdapters.push(...router.options.serializationAdapters)
+  }
 
   router.update({
     basepath: process.env.TSS_ROUTER_BASEPATH,

package/src/tests/createServerFn.test-d.ts

@@ -2,7 +2,12 @@ import { describe, expectTypeOf, test } from 'vitest'
 import { createMiddleware } from '../createMiddleware'
 import { createServerFn } from '../createServerFn'
 import { TSS_SERVER_FUNCTION } from '../constants'
-import type { Constrain, Register, Validator } from '@tanstack/router-core'
+import type {
+  Constrain,
+  Register,
+  TsrSerializable,
+  Validator,
+} from '@tanstack/router-core'
 import type { ConstrainValidator } from '../createServerFn'
 
 test('createServerFn method with autocomplete', () => {
@@ -638,3 +643,15 @@ test('createServerFn returns sync array', () => {
 
   expectTypeOf(serverFn()).toEqualTypeOf<Promise<Array<{ a: number }>>>()
 })
+
+test('createServerFn respects TsrSerializable', () => {
+  type MyCustomType = { f: () => void; value: string }
+  type MyCustomTypeSerializable = MyCustomType & TsrSerializable
+  const fn1 = createServerFn().handler(() => {
+    const custom: MyCustomType = { f: () => {}, value: 'test' }
+    return { nested: { custom: custom as MyCustomTypeSerializable } }
+  })
+  expectTypeOf(fn1()).toEqualTypeOf<
+    Promise<{ nested: { custom: MyCustomTypeSerializable } }>
+  >()
+})