Merge branch 'ts-final' of github.com:keen-studio/payload into admin-types

src/collections/config/types.ts

@@ -119,8 +119,8 @@ export type PayloadCollectionConfig = {
 };
 
 export interface CollectionConfig extends Omit<DeepRequired<PayloadCollectionConfig>, 'auth' | 'upload'> {
-  auth: Auth | boolean
-  upload: Upload | boolean
+  auth: Auth;
+  upload: Upload;
 }
 
 export type Collection = {

src/collections/requestHandlers/create.ts

@@ -9,7 +9,7 @@ export type CreateRequestHandler = (req: PayloadRequest, res: Response, next: Ne
 export type CreateResult = {
   message: string
   doc: Document
-}
+};
 
 export default async function create(req: PayloadRequest, res: Response, next: NextFunction): Promise<Response<CreateResult> | void> {
   try {

src/collections/requestHandlers/delete.ts

@@ -1,7 +1,17 @@
+import { Response, NextFunction } from 'express';
 import httpStatus from 'http-status';
+import { PayloadRequest } from '../../express/types/payloadRequest';
 import { NotFound } from '../../errors';
+import { Document } from '../../types';
 
-export default async function deleteHandler(req, res, next) {
+export type DeleteRequestHandler = (req: PayloadRequest, res: Response, next: NextFunction) => unknown;
+
+export type DeleteResult = {
+  message: string;
+  doc: Document;
+}
+
+export default async function deleteHandler(req: PayloadRequest, res: Response, next: NextFunction): Promise<Response<DeleteResult> | void> {
   try {
     const doc = await this.operations.collections.delete({
       req,

src/collections/requestHandlers/find.ts

@@ -1,6 +1,13 @@
+import { Response, NextFunction } from 'express';
 import httpStatus from 'http-status';
+import { FindResponse } from '../../types';
+import { PayloadRequest } from '../../express/types/payloadRequest';
 
-export default async function find(req, res, next) {
+export type FindRequestHandler = (req: PayloadRequest, res: Response, next: NextFunction) => unknown;
+
+export type FindResult = FindResponse;
+
+export default async function find(req: PayloadRequest, res: Response, next: NextFunction): Promise<Response<FindResult> | void> {
   try {
     const options = {
       req,

src/collections/requestHandlers/findByID.ts

@@ -1,4 +1,15 @@
-export default async function findByID(req, res, next) {
+import { Response, NextFunction } from 'express';
+import { PayloadRequest } from '../../express/types/payloadRequest';
+import { Document } from '../../types';
+
+export type FindByIDRequestHandler = (req: PayloadRequest, res: Response, next: NextFunction) => unknown;
+
+export type FindByIDResult = {
+  message: string;
+  doc: Document;
+};
+
+export default async function findByID(req: PayloadRequest, res: Response, next: NextFunction): Promise<Response<FindByIDResult> | void> {
   const options = {
     req,
     collection: req.collection,

src/collections/requestHandlers/update.ts

@@ -1,7 +1,16 @@
+import { Response, NextFunction } from 'express';
 import httpStatus from 'http-status';
+import { PayloadRequest } from '../../express/types/payloadRequest';
 import formatSuccessResponse from '../../express/responses/formatSuccess';
 
-export default async function update(req, res, next) {
+export type UpdateRequestHandler = (req: PayloadRequest, res: Response, next: NextFunction) => unknown;
+
+export type UpdateResult = {
+  message: string
+  doc: Document
+};
+
+export default async function update(req: PayloadRequest, res: Response, next: NextFunction): Promise<Response<UpdateResult> | void> {
   try {
     const doc = await this.operations.collections.update({
       req,

src/init/bindRequestHandlers.ts

@@ -11,10 +11,10 @@ import verifyEmail from '../auth/requestHandlers/verifyEmail';
 import unlock from '../auth/requestHandlers/unlock';
 
 import create, { CreateRequestHandler } from '../collections/requestHandlers/create';
-import find from '../collections/requestHandlers/find';
-import findByID from '../collections/requestHandlers/findByID';
-import update from '../collections/requestHandlers/update';
-import deleteHandler from '../collections/requestHandlers/delete';
+import find, { FindRequestHandler } from '../collections/requestHandlers/find';
+import findByID, { FindByIDRequestHandler } from '../collections/requestHandlers/findByID';
+import update, { UpdateRequestHandler } from '../collections/requestHandlers/update';
+import deleteHandler, { DeleteRequestHandler } from '../collections/requestHandlers/delete';
 
 import findOne from '../globals/requestHandlers/findOne';
 import globalUpdate from '../globals/requestHandlers/update';
@@ -22,9 +22,13 @@ import { Payload } from '../index';
 
 export type RequestHandlers = {
   collections: {
-    create: CreateRequestHandler
+    create: CreateRequestHandler,
+    find: FindRequestHandler,
+    findByID: FindByIDRequestHandler,
+    update: UpdateRequestHandler,
+    delete: DeleteRequestHandler,
     auth: {
-      access: AccessRequestHandler
+      access: AccessRequestHandler,
     }
   }
 }