@opensaas/stack-core 0.12.0 → 0.13.0

package/src/hooks/index.ts

@@ -46,13 +46,17 @@ export async function executeResolveInput<
   hooks: Hooks<TOutput, TCreateInput, TUpdateInput> | undefined,
   args:
     | {
+        listKey: string
         operation: 'create'
+        inputData: TCreateInput
         resolvedData: TCreateInput
         item: undefined
         context: AccessContext
       }
     | {
+        listKey: string
         operation: 'update'
+        inputData: TUpdateInput
         resolvedData: TUpdateInput
         item: TOutput
         context: AccessContext
@@ -67,10 +71,10 @@ export async function executeResolveInput<
 }
 
 /**
- * Execute validateInput hook
+ * Execute validate hook (supports both 'validate' and deprecated 'validateInput')
  * Allows custom validation logic
  */
-export async function executeValidateInput<
+export async function executeValidate<
   TOutput = Record<string, unknown>,
   TCreateInput = Record<string, unknown>,
   TUpdateInput = Record<string, unknown>,
@@ -78,19 +82,31 @@ export async function executeValidateInput<
   hooks: Hooks<TOutput, TCreateInput, TUpdateInput> | undefined,
   args:
     | {
+        listKey: string
         operation: 'create'
+        inputData: TCreateInput
         resolvedData: TCreateInput
         item: undefined
         context: AccessContext
       }
     | {
+        listKey: string
         operation: 'update'
+        inputData: TUpdateInput
         resolvedData: TUpdateInput
         item: TOutput
         context: AccessContext
+      }
+    | {
+        listKey: string
+        operation: 'delete'
+        item: TOutput
+        context: AccessContext
       },
 ): Promise<void> {
-  if (!hooks?.validateInput) {
+  // Support both 'validate' (new) and 'validateInput' (deprecated) for backwards compatibility
+  const validateHook = hooks?.validate || hooks?.validateInput
+  if (!validateHook) {
     return
   }
 
@@ -100,29 +116,50 @@ export async function executeValidateInput<
     errors.push(msg)
   }
 
-  await hooks.validateInput({
+  await validateHook({
     ...args,
     addValidationError,
-  })
+  } as Parameters<typeof validateHook>[0])
 
   if (errors.length > 0) {
     throw new ValidationError(errors)
   }
 }
 
+/**
+ * @deprecated Use executeValidate instead. This alias is provided for backwards compatibility.
+ */
+export const executeValidateInput = executeValidate
+
 /**
  * Execute beforeOperation hook
  * Runs before database operation (cannot modify data)
  */
-export async function executeBeforeOperation<TOutput = Record<string, unknown>>(
-  hooks: Hooks<TOutput> | undefined,
+export async function executeBeforeOperation<
+  TOutput = Record<string, unknown>,
+  TCreateInput = Record<string, unknown>,
+  TUpdateInput = Record<string, unknown>,
+>(
+  hooks: Hooks<TOutput, TCreateInput, TUpdateInput> | undefined,
   args:
     | {
+        listKey: string
         operation: 'create'
+        inputData: TCreateInput
+        resolvedData: TCreateInput
         context: AccessContext
       }
     | {
-        operation: 'update' | 'delete'
+        listKey: string
+        operation: 'update'
+        inputData: TUpdateInput
+        item: TOutput
+        resolvedData: TUpdateInput
+        context: AccessContext
+      }
+    | {
+        listKey: string
+        operation: 'delete'
         item: TOutput
         context: AccessContext
       },
@@ -131,25 +168,40 @@ export async function executeBeforeOperation<TOutput = Record<string, unknown>>(
     return
   }
 
-  await hooks.beforeOperation(args)
+  await hooks.beforeOperation(args as Parameters<typeof hooks.beforeOperation>[0])
 }
 
 /**
  * Execute afterOperation hook
  * Runs after database operation
  */
-export async function executeAfterOperation<TOutput = Record<string, unknown>>(
-  hooks: Hooks<TOutput> | undefined,
+export async function executeAfterOperation<
+  TOutput = Record<string, unknown>,
+  TCreateInput = Record<string, unknown>,
+  TUpdateInput = Record<string, unknown>,
+>(
+  hooks: Hooks<TOutput, TCreateInput, TUpdateInput> | undefined,
   args:
     | {
+        listKey: string
         operation: 'create'
+        inputData: TCreateInput
         item: TOutput
-        originalItem: undefined
+        resolvedData: TCreateInput
         context: AccessContext
       }
     | {
-        operation: 'update' | 'delete'
+        listKey: string
+        operation: 'update'
+        inputData: TUpdateInput
+        originalItem: TOutput
         item: TOutput
+        resolvedData: TUpdateInput
+        context: AccessContext
+      }
+    | {
+        listKey: string
+        operation: 'delete'
         originalItem: TOutput
         context: AccessContext
       },
@@ -158,7 +210,7 @@ export async function executeAfterOperation<TOutput = Record<string, unknown>>(
     return
   }
 
-  await hooks.afterOperation(args)
+  await hooks.afterOperation(args as Parameters<typeof hooks.afterOperation>[0])
 }
 
 /**

package/tests/nested-access-and-hooks.test.ts

@@ -50,7 +50,10 @@ describe('Nested Operations - Access Control and Hooks', () => {
 
   describe('Nested Create Operations', () => {
     it('should run hooks and access control for nested create', async () => {
-      const userResolveInputHook = vi.fn(async ({ inputValue }) => inputValue?.toUpperCase())
+      const userResolveInputHook = vi.fn(async ({ resolvedData, fieldKey }) => {
+        const value = resolvedData[fieldKey]
+        return typeof value === 'string' ? value.toUpperCase() : value
+      })
       const userListResolveInputHook = vi.fn(async ({ resolvedData }) => resolvedData)
       const userValidateInputHook = vi.fn(async () => {})
       const postResolveInputHook = vi.fn(async ({ resolvedData }) => resolvedData)
@@ -140,9 +143,11 @@ describe('Nested Operations - Access Control and Hooks', () => {
 
       expect(userResolveInputHook).toHaveBeenCalledWith(
         expect.objectContaining({
-          inputValue: 'john',
+          fieldKey: 'name',
           operation: 'create',
-          fieldName: 'name',
+          resolvedData: expect.objectContaining({
+            name: 'john',
+          }),
         }),
       )
 

package/tests/sudo.test.ts

@@ -31,9 +31,9 @@ describe('Sudo Context', () => {
           title: text({
             validation: { isRequired: true },
             hooks: {
-              resolveInput: async ({ inputValue }) => {
+              resolveInput: async ({ resolvedData, fieldKey }) => {
                 hookExecutions.push('field-resolveInput')
-                return inputValue
+                return resolvedData[fieldKey]
               },
               beforeOperation: async () => {
                 hookExecutions.push('field-beforeOperation')
@@ -116,17 +116,6 @@ describe('Sudo Context', () => {
       const sudoResult = await sudoContext.db.post.findUnique({ where: { id: '1' } })
       expect(sudoResult?.secretField).toBe('secret-value')
     })
-
-    it('should execute field afterOperation hooks with sudo()', async () => {
-      const context = getContext(testConfig, mockPrisma, null)
-      const sudoContext = context.sudo()
-
-      mockPrisma.post.findMany.mockResolvedValue([{ id: '1', title: 'Test Post' }])
-
-      await sudoContext.db.post.findMany()
-
-      expect(hookExecutions).toContain('field-afterOperation')
-    })
   })
 
   describe('Create Operations', () => {