From 47bb5d6c61aaf6e63eedafaa2e42c643df7b22ae Mon Sep 17 00:00:00 2001
From: Elliot DeNolf <denolfe@gmail.com>
Date: Tue, 17 Jan 2023 14:50:41 -0500
Subject: [PATCH] chore: ts improvements on delete operation

---
 src/collections/graphql/resolvers/delete.ts  |  9 ++++++---
 src/collections/operations/delete.ts         |  5 ++++-
 src/collections/operations/local/delete.ts   | 13 ++++++++-----
 src/collections/operations/local/findByID.ts |  5 ++++-
 src/payload.ts                               |  2 +-
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/collections/graphql/resolvers/delete.ts b/src/collections/graphql/resolvers/delete.ts
index 774b132e1f..09709ca912 100644
--- a/src/collections/graphql/resolvers/delete.ts
+++ b/src/collections/graphql/resolvers/delete.ts
@@ -1,10 +1,11 @@
 /* eslint-disable no-param-reassign */
+import { Config as GeneratedTypes } from 'payload/generated-types';
 import { Response } from 'express';
 import { PayloadRequest } from '../../../express/types';
 import { Collection } from '../../config/types';
 import deleteOperation from '../../operations/delete';
 
-export type Resolver = (
+export type Resolver<TSlug extends keyof GeneratedTypes['collections']> = (
   _: unknown,
   args: {
     locale?: string
@@ -14,9 +15,11 @@ export type Resolver = (
     req: PayloadRequest,
     res: Response
   }
-) => Promise<Document>
+) => Promise<GeneratedTypes['collections'][TSlug]>
 
-export default function getDeleteResolver(collection: Collection): Resolver {
+export default function getDeleteResolver<TSlug extends keyof GeneratedTypes['collections']>(
+  collection: Collection,
+): Resolver<TSlug> {
   async function resolver(_, args, context) {
     if (args.locale) context.req.locale = args.locale;
     if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale;
diff --git a/src/collections/operations/delete.ts b/src/collections/operations/delete.ts
index e0454ec1dc..f364506e76 100644
--- a/src/collections/operations/delete.ts
+++ b/src/collections/operations/delete.ts
@@ -1,6 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 
+import { Config as GeneratedTypes } from 'payload/generated-types';
 import { PayloadRequest } from '../../express/types';
 import sanitizeInternalFields from '../../utilities/sanitizeInternalFields';
 import { NotFound, Forbidden, ErrorDeletingFile } from '../../errors';
@@ -21,7 +22,9 @@ export type Arguments = {
   showHiddenFields?: boolean
 }
 
-async function deleteOperation(incomingArgs: Arguments): Promise<Document> {
+async function deleteOperation<TSlug extends keyof GeneratedTypes['collections']>(
+  incomingArgs: Arguments,
+): Promise<GeneratedTypes['collections'][TSlug]> {
   let args = incomingArgs;
 
   // /////////////////////////////////////
diff --git a/src/collections/operations/local/delete.ts b/src/collections/operations/local/delete.ts
index 562810de5b..3e3666e46d 100644
--- a/src/collections/operations/local/delete.ts
+++ b/src/collections/operations/local/delete.ts
@@ -1,4 +1,4 @@
-import { TypeWithID } from '../../config/types';
+import { Config as GeneratedTypes } from 'payload/generated-types';
 import { Document } from '../../../types';
 import { PayloadRequest } from '../../../express/types';
 import { Payload } from '../../../payload';
@@ -6,8 +6,8 @@ import deleteOperation from '../delete';
 import { getDataLoader } from '../../dataloader';
 import i18n from '../../../translations/init';
 
-export type Options = {
-  collection: string
+export type Options<T extends keyof GeneratedTypes['collections']> = {
+  collection: T
   id: string
   depth?: number
   locale?: string
@@ -17,7 +17,10 @@ export type Options = {
   showHiddenFields?: boolean
 }
 
-export default async function deleteLocal<T extends TypeWithID = any>(payload: Payload, options: Options): Promise<T> {
+export default async function deleteLocal<TSlug extends keyof GeneratedTypes['collections']>(
+  payload: Payload,
+  options: Options<TSlug>,
+): Promise<GeneratedTypes['collections'][TSlug]> {
   const {
     collection: collectionSlug,
     depth,
@@ -44,7 +47,7 @@ export default async function deleteLocal<T extends TypeWithID = any>(payload: P
   if (!req.t) req.t = req.i18n.t;
   if (!req.payloadDataLoader) req.payloadDataLoader = getDataLoader(req);
 
-  return deleteOperation({
+  return deleteOperation<TSlug>({
     depth,
     id,
     collection,
diff --git a/src/collections/operations/local/findByID.ts b/src/collections/operations/local/findByID.ts
index 4848dad432..a9f859c099 100644
--- a/src/collections/operations/local/findByID.ts
+++ b/src/collections/operations/local/findByID.ts
@@ -21,7 +21,10 @@ export type Options<T extends keyof GeneratedTypes['collections']> = {
   draft?: boolean
 }
 
-export default async function findByIDLocal<T extends keyof GeneratedTypes['collections']>(payload: Payload, options: Options<T>): Promise<GeneratedTypes['collections'][T]> {
+export default async function findByIDLocal<T extends keyof GeneratedTypes['collections']>(
+  payload: Payload,
+  options: Options<T>,
+): Promise<GeneratedTypes['collections'][T]> {
   const {
     collection: collectionSlug,
     depth,
diff --git a/src/payload.ts b/src/payload.ts
index 0d4b97946f..345466f8c1 100644
--- a/src/payload.ts
+++ b/src/payload.ts
@@ -287,7 +287,7 @@ export class BasePayload<TGeneratedTypes extends GeneratedTypes> {
     return update<T>(this, options);
   }
 
-  delete = async <T extends TypeWithID = any>(options: DeleteOptions): Promise<T> => {
+  delete = async <T extends keyof TGeneratedTypes['collections']>(options: DeleteOptions<T>): Promise<TGeneratedTypes['collections'][T]> => {
     const { localDelete } = localOperations;
     return localDelete<T>(this, options);
   }