From 6b150e01d306fde5686156a2fa6a8fa00aeffe0e Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Thu, 25 Nov 2021 09:54:12 -0500
Subject: [PATCH] feat: further types field based functions

---
 src/collections/config/types.ts |  4 ++--
 src/fields/config/types.ts      | 20 +++++++++-----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/collections/config/types.ts b/src/collections/config/types.ts
index a8c12f6a6e..6fbf067a09 100644
--- a/src/collections/config/types.ts
+++ b/src/collections/config/types.ts
@@ -36,7 +36,7 @@ export type BeforeOperationHook = (args: {
 }) => any;
 
 export type BeforeValidateHook<T extends TypeWithID = any> = (args: {
-  data?: any;
+  data?: Partial<T>;
   req?: PayloadRequest;
   /**
    * Hook operation being performed
@@ -51,7 +51,7 @@ export type BeforeValidateHook<T extends TypeWithID = any> = (args: {
 }) => any;
 
 export type BeforeChangeHook<T extends TypeWithID = any> = (args: {
-  data: T;
+  data: Partial<T>;
   req: PayloadRequest;
   /**
    * Hook operation being performed
diff --git a/src/fields/config/types.ts b/src/fields/config/types.ts
index f73826945a..539ecb79da 100644
--- a/src/fields/config/types.ts
+++ b/src/fields/config/types.ts
@@ -6,28 +6,26 @@ import { PayloadRequest } from '../../express/types';
 import { ConditionalDateProps } from '../../admin/components/elements/DatePicker/types';
 import { Description } from '../../admin/components/forms/FieldDescription/types';
 
-export type FieldHookArgs<T extends TypeWithID = any, P extends keyof T = any> = {
-  value?: T[P],
+export type FieldHookArgs<T extends TypeWithID = any, P = any> = {
+  value?: P,
   originalDoc?: T,
-  data?: {
-    [key: string]: unknown
-  },
+  data?: Partial<T>,
   operation?: 'create' | 'read' | 'update' | 'delete',
   req: PayloadRequest
 }
 
 export type FieldHookReturnType = Promise<unknown> | unknown;
 
-export type FieldHook<T extends TypeWithID = any, P extends keyof T = any> = (args: FieldHookArgs<T, P>) => FieldHookReturnType;
+export type FieldHook<T extends TypeWithID = any, P = any> = (args: FieldHookArgs<T, P>) => FieldHookReturnType;
 
-export type FieldAccess = (args: {
+export type FieldAccess<T extends TypeWithID = any, P = any> = (args: {
   req: PayloadRequest
   id?: string
-  data: Record<string, unknown>
-  siblingData: Record<string, unknown>
+  data: Partial<T>
+  siblingData: Partial<P>
 }) => Promise<boolean> | boolean;
 
-export type Condition = (data: Record<string, unknown>, siblingData: Record<string, unknown>) => boolean;
+export type Condition<T extends TypeWithID = any, P = any> = (data: Partial<T>, siblingData: Partial<P>) => boolean;
 
 type Admin = {
   position?: 'sidebar';
@@ -50,7 +48,7 @@ export type Labels = {
   plural: string;
 };
 
-export type Validate = (value: unknown, options?: any) => string | true | Promise<string | true>;
+export type Validate<T = any> = (value?: T, options?: any) => string | true | Promise<string | true>;
 
 export type OptionObject = {
   label: string