From d65b7b4bddb45bd47610eab08e3011d4e6cf4c98 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Thu, 18 Dec 2025 00:36:19 +0100 Subject: [PATCH] chore: rename `_types` to `'~types'` --- .../start-client-core/src/createMiddleware.ts | 22 +++++++++---------- .../start-client-core/src/createServerFn.ts | 4 ++-- .../tests/createServerMiddleware.test-d.ts | 20 ++++++++--------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/start-client-core/src/createMiddleware.ts b/packages/start-client-core/src/createMiddleware.ts index a637c2dbb2..c47c3aa1b4 100644 --- a/packages/start-client-core/src/createMiddleware.ts +++ b/packages/start-client-core/src/createMiddleware.ts @@ -108,7 +108,7 @@ export interface FunctionMiddlewareWithTypes< TClientContext, TClientSendContext, > { - _types: FunctionMiddlewareTypes< + '~types': FunctionMiddlewareTypes< TRegister, TMiddlewares, TInputValidator, @@ -187,9 +187,9 @@ export type IntersectAllValidatorInputs = export type IntersectAllMiddleware< TMiddlewares, TType extends - | keyof AnyFunctionMiddleware['_types'] - | keyof AnyRequestMiddleware['_types'] - | keyof AnyServerFn['_types'], + | keyof AnyFunctionMiddleware['~types'] + | keyof AnyRequestMiddleware['~types'] + | keyof AnyServerFn['~types'], TAcc = undefined, > = TMiddlewares extends readonly [infer TMiddleware, ...infer TRest] ? TMiddleware extends @@ -201,7 +201,7 @@ export type IntersectAllMiddleware< TType, IntersectAssign< TAcc, - TMiddleware['_types'][TType & keyof TMiddleware['_types']] + TMiddleware['~types'][TType & keyof TMiddleware['~types']] > > : TAcc @@ -246,9 +246,9 @@ export type AssignAllClientContextBeforeNext< export type AssignAllMiddleware< TMiddlewares, TType extends - | keyof AnyFunctionMiddleware['_types'] - | keyof AnyRequestMiddleware['_types'] - | keyof AnyServerFn['_types'], + | keyof AnyFunctionMiddleware['~types'] + | keyof AnyRequestMiddleware['~types'] + | keyof AnyServerFn['~types'], TAcc = undefined, > = TMiddlewares extends readonly [infer TMiddleware, ...infer TRest] ? TMiddleware extends @@ -258,7 +258,7 @@ export type AssignAllMiddleware< ? AssignAllMiddleware< TRest, TType, - Assign + Assign > : TAcc : TAcc @@ -480,7 +480,7 @@ export type FunctionServerResultWithContext< in out TSendContext, > = { 'use functions must return the result of next()': true - _types: { + '~types': { context: TServerContext sendContext: TSendContext } @@ -703,7 +703,7 @@ export interface RequestMiddlewareWithTypes< TMiddlewares, TServerContext, > { - _types: RequestMiddlewareTypes + '~types': RequestMiddlewareTypes options: RequestMiddlewareOptions } diff --git a/packages/start-client-core/src/createServerFn.ts b/packages/start-client-core/src/createServerFn.ts index ceeab4678b..3307d4b7ce 100644 --- a/packages/start-client-core/src/createServerFn.ts +++ b/packages/start-client-core/src/createServerFn.ts @@ -536,7 +536,7 @@ export interface ServerFnWithTypes< in out TInputValidator, in out TResponse, > { - _types: ServerFnTypes< + '~types': ServerFnTypes< TRegister, TMethod, TMiddlewares, @@ -690,7 +690,7 @@ function serverFnBaseToMiddleware( options: ServerFnBaseOptions, ): AnyFunctionMiddleware { return { - _types: undefined!, + '~types': undefined!, options: { inputValidator: options.inputValidator, client: async ({ next, sendContext, ...ctx }) => { diff --git a/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts b/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts index 9759e39d06..11bfb6598c 100644 --- a/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts +++ b/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts @@ -56,7 +56,7 @@ test('createMiddleware merges server context', () => { expectTypeOf(result).toEqualTypeOf<{ 'use functions must return the result of next()': true - _types: { + '~types': { context: { a: boolean } @@ -80,7 +80,7 @@ test('createMiddleware merges server context', () => { expectTypeOf(result).toEqualTypeOf<{ 'use functions must return the result of next()': true - _types: { + '~types': { context: { b: string } @@ -103,7 +103,7 @@ test('createMiddleware merges server context', () => { expectTypeOf(result).toEqualTypeOf<{ 'use functions must return the result of next()': true - _types: { + '~types': { context: { c: number } @@ -129,7 +129,7 @@ test('createMiddleware merges server context', () => { expectTypeOf(result).toEqualTypeOf<{ 'use functions must return the result of next()': true - _types: { + '~types': { context: { d: number } @@ -236,7 +236,7 @@ test('createMiddleware merges client context and sends to the server', () => { expectTypeOf(result).toEqualTypeOf<{ 'use functions must return the result of next()': true - _types: { + '~types': { context: { e: string } @@ -314,7 +314,7 @@ test('createMiddleware merges server context and client context, sends server co expectTypeOf(result).toEqualTypeOf<{ 'use functions must return the result of next()': true - _types: { + '~types': { context: { fromServer1: string } @@ -353,7 +353,7 @@ test('createMiddleware merges server context and client context, sends server co expectTypeOf(result).toEqualTypeOf<{ 'use functions must return the result of next()': true - _types: { + '~types': { context: { fromServer2: string } @@ -403,7 +403,7 @@ test('createMiddleware merges server context and client context, sends server co expectTypeOf(result).toEqualTypeOf<{ 'use functions must return the result of next()': true - _types: { + '~types': { context: { fromServer3: string } @@ -463,7 +463,7 @@ test('createMiddleware merges server context and client context, sends server co expectTypeOf(result).toEqualTypeOf<{ 'use functions must return the result of next()': true - _types: { + '~types': { context: { fromServer4: string } @@ -532,7 +532,7 @@ test('createMiddleware merges server context and client context, sends server co expectTypeOf(result).toEqualTypeOf<{ 'use functions must return the result of next()': true - _types: { + '~types': { context: { fromServer5: string }