From 4d6871abc854385121c761eea4e4705f45c35832 Mon Sep 17 00:00:00 2001
From: Elliot DeNolf <denolfe@gmail.com>
Date: Wed, 6 Jan 2021 00:03:40 -0500
Subject: [PATCH] fix: use FileSize and ImageSize types

---
 src/collections/operations/delete.ts |  3 ++-
 src/uploads/imageResizer.ts          |  4 ++--
 src/uploads/types.ts                 | 20 +++++++++++---------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/collections/operations/delete.ts b/src/collections/operations/delete.ts
index db8b38932b..a6ddb581c8 100644
--- a/src/collections/operations/delete.ts
+++ b/src/collections/operations/delete.ts
@@ -9,6 +9,7 @@ import fileExists from '../../uploads/fileExists';
 import { BeforeOperationHook, Collection } from '../config/types';
 import { Document, Where } from '../../types';
 import { hasWhereAccessResult } from '../../auth/types';
+import { FileSize } from '../../uploads/types';
 
 export type Arguments = {
   depth?: number
@@ -118,7 +119,7 @@ async function deleteQuery(incomingArgs: Arguments): Promise<Document> {
     }
 
     if (resultToDelete.sizes) {
-      Object.values(resultToDelete.sizes).forEach(async (size) => {
+      Object.values(resultToDelete.sizes).forEach(async (size: FileSize) => {
         if (await fileExists(`${staticPath}/${size.filename}`)) {
           fs.unlink(`${staticPath}/${size.filename}`, (err) => {
             if (err) {
diff --git a/src/uploads/imageResizer.ts b/src/uploads/imageResizer.ts
index 9acff31eb0..c68ff1b8be 100644
--- a/src/uploads/imageResizer.ts
+++ b/src/uploads/imageResizer.ts
@@ -4,9 +4,9 @@ import sanitize from 'sanitize-filename';
 import getImageSize from './getImageSize';
 import fileExists from './fileExists';
 import { CollectionConfig } from '../collections/config/types';
-import { FileSizes } from './types';
+import { FileSizes, ImageSize } from './types';
 
-function getOutputImage(sourceImage, size) {
+function getOutputImage(sourceImage: string, size: ImageSize) {
   const extension = sourceImage.split('.').pop();
   const name = sanitize(sourceImage.substr(0, sourceImage.lastIndexOf('.')) || sourceImage);
 
diff --git a/src/uploads/types.ts b/src/uploads/types.ts
index 97be10b6b7..a8f90031b4 100644
--- a/src/uploads/types.ts
+++ b/src/uploads/types.ts
@@ -1,13 +1,15 @@
+export type FileSize = {
+  filename: string;
+  filesize: number;
+  mimeType: string;
+  name: string;
+  width: number;
+  height: number;
+  crop: string;
+}
+
 export type FileSizes = {
-  [size: string]: {
-    filename: string;
-    filesize: number;
-    mimeType: string;
-    name: string;
-    width: number;
-    height: number;
-    crop: string;
-  }
+  [size: string]: FileSize
 }
 
 export type FileData = {