feat!: rename execute to interceptor hook

unnoq · Dec 28, 2024 · 9588d75 · 9588d75
1 parent 11a25ed
commit 9588d75
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/packages/next/src/client/action-hooks.ts b/packages/next/src/client/action-hooks.ts
@@ -49,7 +49,7 @@ export function useAction<TInput, TOutput>(
       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
@@ -127,7 +127,7 @@ describe('createProcedureClient', () => {
     createProcedureClient({
       procedure,
 
-      async execute(input, context, meta) {
+      async interceptor(input, context, meta) {
         expectTypeOf(input).toEqualTypeOf<unknown>()
         expectTypeOf(context).toEqualTypeOf<WELL_CONTEXT>()
         expectTypeOf(meta).toEqualTypeOf<Meta & { next: () => Promise<{ val: number }> }>()

diff --git 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
@@ -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
@@ -10,7 +10,7 @@ export interface BaseHookMeta<TOutput> {
 }
 
 export interface Hooks<TInput, TOutput, TContext, TMeta extends (Record<string, any> & { next?: never }) | undefined> {
-  execute?: Arrayable<(input: TInput, context: TContext, meta: (TMeta extends undefined ? unknown : TMeta) & BaseHookMeta<TOutput>) => Promise<TOutput>>
+  interceptor?: Arrayable<(input: TInput, context: TContext, meta: (TMeta extends undefined ? unknown : TMeta) & BaseHookMeta<TOutput>) => Promise<TOutput>>
   onStart?: Arrayable<(state: OnStartState<TInput>, context: TContext, meta: TMeta) => Promisable<void>>
   onSuccess?: Arrayable<(state: OnSuccessState<TInput, TOutput>, context: TContext, meta: TMeta) => Promisable<void>>
   onError?: Arrayable<(state: OnErrorState<TInput>, context: TContext, meta: TMeta) => Promisable<void>>
@@ -26,7 +26,7 @@ export async function executeWithHooks<TInput, TOutput, TContext, TMeta extends
     execute: BaseHookMeta<TOutput>['next']
   },
 ): Promise<TOutput> {
-  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<TInput, TOutput, TContext, TMeta extends
   let currentExecuteIndex = 0
 
   const next = async (): Promise<TOutput> => {
-    const execute = executes[currentExecuteIndex]
+    const execute = interceptors[currentExecuteIndex]
 
     if (execute) {
       currentExecuteIndex++