@byline/host-tanstack-start 6.7.1 → 6.8.0

package/src/server-fns/auth/sign-in.ts

@@ -29,10 +29,9 @@ import {
 import { getServerConfig } from '@byline/core'
 import { passwordSignInSchema } from '@byline/core/validation'
 
-import { readAdminLocaleCookie } from '../../i18n/locale-cookie.js'
-import { bylineCore } from '../../integrations/byline-core.js'
 import { normalizeClientIp } from '../../integrations/client-ip.js'
 import { wasSignInBodyChecked } from '../../integrations/sign-in-body.js'
+import { reconcileLocaleAfterSignIn } from './reconcile-locale.js'
 
 export interface SignInInput {
   email: string
@@ -137,33 +136,3 @@ export const adminSignIn = createServerFn({ method: 'POST' })
 
     return { userId: result.actor.id, sessionId: result.sessionId }
   })
-
-/**
- * Apply the `byline_admin_lng` cookie to `admin_users.preferred_locale`
- * when the two diverge after sign-in. No-op when:
- *
- *   - The cookie is unset (the cascade falls through to the existing
- *     column / Accept-Language / default anyway).
- *   - The cookie carries a locale outside `i18n.admin.locales`
- *     (stale value pointing at a removed locale — let the resolver
- *     fall through cleanly).
- *   - No admin store is configured (headless tooling paths).
- *   - The stored value already matches the cookie.
- */
-async function reconcileLocaleAfterSignIn(adminUserId: string): Promise<void> {
-  const cookieLocale = readAdminLocaleCookie()
-  if (cookieLocale == null) return
-
-  const core = bylineCore()
-  const locales = core.config.i18n.admin.locales
-  if (!locales.includes(cookieLocale)) return
-
-  const adminStore = core.adminStore
-  if (adminStore == null) return
-
-  const row = await adminStore.adminUsers.getById(adminUserId)
-  if (!row) return
-  if (row.preferred_locale === cookieLocale) return
-
-  await adminStore.adminUsers.setPreferredLocale(adminUserId, cookieLocale)
-}

package/src/server-fns/document-mutation-transport.test.node.ts

@@ -27,12 +27,19 @@ const startRequire = createRequire(require.resolve('@tanstack/react-start/packag
 const serverPackage = startRequire.resolve('@tanstack/start-server-core/package.json')
 const esm = join(dirname(serverPackage), 'src')
 const serverRequire = createRequire(serverPackage)
-let handler: (input: { request: Request; context: object; serverFnId: string }) => Promise<Response>
+// Start finalizes a completed serialization in its request pipeline: the handler
+// returns a deferred value whose createResponse(event) builds the Response.
+type DeferredResponse = { createResponse(event: { request: Request; requestUrl: URL }): Response }
+let handler: (input: {
+  request: Request
+  context: object
+  serverFnId: string
+}) => Promise<Response | DeferredResponse>
 let seroval: {
   toJSONAsync(value: unknown): Promise<unknown>
   fromCrossJSON(value: unknown, options: object): unknown
 }
-let runWithStartContext: (context: object, fn: () => Promise<Response>) => Promise<Response>
+let runWithStartContext: <T>(context: object, fn: () => Promise<T>) => Promise<T>
 let action: (input: { data: unknown }) => Promise<unknown>
 
 beforeAll(async () => {
@@ -66,7 +73,7 @@ async function roundTrip(data: unknown, operation: (data: unknown) => Promise<un
     headers: { 'content-type': 'application/json', 'x-tsr-serverFn': 'true' },
     body: JSON.stringify(await seroval.toJSONAsync({ data })),
   })
-  const response = await runWithStartContext(
+  const result = await runWithStartContext(
     {
       request,
       startOptions: {},
@@ -79,6 +86,10 @@ async function roundTrip(data: unknown, operation: (data: unknown) => Promise<un
     },
     () => handler({ request, context: {}, serverFnId: 'document-mutation' })
   )
+  const response =
+    result instanceof Response
+      ? result
+      : result.createResponse({ request, requestUrl: new URL(request.url) })
   const wire = await response.text()
   const decoded = seroval.fromCrossJSON(JSON.parse(wire), {})
   if (typeof decoded !== 'object' || decoded === null) throw new Error('Expected wire envelope')