From 9588d751fe8d8c0e8bfd908143638468e3340277 Mon Sep 17 00:00:00 2001 From: unnoq Date: Sat, 28 Dec 2024 10:18:01 +0700 Subject: [PATCH] feat!: rename `execute` to `interceptor` hook --- packages/next/src/client/action-hooks.ts | 2 +- packages/server/src/procedure-client.test-d.ts | 2 +- packages/server/src/procedure-client.test.ts | 2 +- packages/server/src/router-client.test.ts | 6 +++--- packages/shared/src/hook.ts | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/next/src/client/action-hooks.ts b/packages/next/src/client/action-hooks.ts index b20f9c35..a6fac320 100644 --- a/packages/next/src/client/action-hooks.ts +++ b/packages/next/src/client/action-hooks.ts @@ -49,7 +49,7 @@ export function useAction( const output = await executeWithHooks({ context: undefined, hooks: { - execute: [...convertToArray(hooks?.execute), ...convertToArray(executeHooks?.execute)], + interceptor: [...convertToArray(hooks?.interceptor), ...convertToArray(executeHooks?.interceptor)], onStart: [...convertToArray(hooks?.onStart), ...convertToArray(executeHooks?.onStart)], onSuccess: [...convertToArray(hooks?.onSuccess), ...convertToArray(executeHooks?.onSuccess)], onError: [...convertToArray(hooks?.onError), ...convertToArray(executeHooks?.onError)], diff --git a/packages/server/src/procedure-client.test-d.ts b/packages/server/src/procedure-client.test-d.ts index befc42a5..272a9a71 100644 --- a/packages/server/src/procedure-client.test-d.ts +++ b/packages/server/src/procedure-client.test-d.ts @@ -127,7 +127,7 @@ describe('createProcedureClient', () => { createProcedureClient({ procedure, - async execute(input, context, meta) { + async interceptor(input, context, meta) { expectTypeOf(input).toEqualTypeOf() expectTypeOf(context).toEqualTypeOf() expectTypeOf(meta).toEqualTypeOf Promise<{ val: number }> }>() diff --git a/packages/server/src/procedure-client.test.ts b/packages/server/src/procedure-client.test.ts index cb592fb6..d9049656 100644 --- a/packages/server/src/procedure-client.test.ts +++ b/packages/server/src/procedure-client.test.ts @@ -205,7 +205,7 @@ describe.each(procedureCases)('createProcedureClient - case %s', async (_, proce procedure, context, path: ['users'], - execute, + interceptor: execute, onStart, onSuccess, onError, diff --git a/packages/server/src/router-client.test.ts b/packages/server/src/router-client.test.ts index 5eab7437..0730edd5 100644 --- a/packages/server/src/router-client.test.ts +++ b/packages/server/src/router-client.test.ts @@ -117,7 +117,7 @@ describe('createRouterClient', () => { const onSuccess = vi.fn() const onError = vi.fn() const onFinish = vi.fn() - const execute = vi.fn() + const interceptor = vi.fn() const client = createRouterClient({ router, @@ -126,7 +126,7 @@ describe('createRouterClient', () => { onSuccess, onError, onFinish, - execute, + interceptor, }) expect(client.pong({ val: '123' })).toEqual('__mocked__') @@ -140,7 +140,7 @@ describe('createRouterClient', () => { onSuccess, onError, onFinish, - execute, + interceptor, })) }) diff --git a/packages/shared/src/hook.ts b/packages/shared/src/hook.ts index 906db8d1..cab9c295 100644 --- a/packages/shared/src/hook.ts +++ b/packages/shared/src/hook.ts @@ -10,7 +10,7 @@ export interface BaseHookMeta { } export interface Hooks & { next?: never }) | undefined> { - execute?: Arrayable<(input: TInput, context: TContext, meta: (TMeta extends undefined ? unknown : TMeta) & BaseHookMeta) => Promise> + interceptor?: Arrayable<(input: TInput, context: TContext, meta: (TMeta extends undefined ? unknown : TMeta) & BaseHookMeta) => Promise> onStart?: Arrayable<(state: OnStartState, context: TContext, meta: TMeta) => Promisable> onSuccess?: Arrayable<(state: OnSuccessState, context: TContext, meta: TMeta) => Promisable> onError?: Arrayable<(state: OnErrorState, context: TContext, meta: TMeta) => Promisable> @@ -26,7 +26,7 @@ export async function executeWithHooks['next'] }, ): Promise { - const executes = convertToArray(options.hooks?.execute) + const interceptors = convertToArray(options.hooks?.interceptor) const onStarts = convertToArray(options.hooks?.onStart) const onSuccesses = convertToArray(options.hooks?.onSuccess) const onErrors = convertToArray(options.hooks?.onError) @@ -35,7 +35,7 @@ export async function executeWithHooks => { - const execute = executes[currentExecuteIndex] + const execute = interceptors[currentExecuteIndex] if (execute) { currentExecuteIndex++