simplify validation code

keystonejs · Apr 16, 2021 · 445b080 · 445b080
1 parent d70d58a
commit 445b080
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 28 deletions.
diff --git a/packages-next/fields/src/types/image/views/Field.tsx b/packages-next/fields/src/types/image/views/Field.tsx
@@ -3,7 +3,7 @@
 import { jsx, Stack, useTheme, Text } from '@keystone-ui/core';
 import { useToasts } from '@keystone-ui/toast';
 import { TextInput } from '@keystone-ui/fields';
-import { isValidImageRef } from '@keystone-next/utils-legacy';
+import { parseImageRef } from '@keystone-next/utils-legacy';
 import copy from 'copy-to-clipboard';
 import bytes from 'bytes';
 import { ReactNode, useEffect, useMemo, useRef, useState } from 'react';
@@ -336,7 +336,7 @@ export function Field({
 }
 
 export function validateRef({ ref }: { ref: string }) {
-  if (!isValidImageRef(ref)) {
+  if (!parseImageRef(ref)) {
     return 'Invalid ref';
   }
 }

diff --git a/packages-next/keystone/src/lib/createImagesContext.ts b/packages-next/keystone/src/lib/createImagesContext.ts
@@ -68,7 +68,16 @@ export function createImagesContext(config?: KeystoneImagesConfig): ImagesContex
       throw new Error('Image not found');
     },
     getDataFromRef: async ref => {
-      const { mode, id, extension } = parseImageRef(ref);
+      const throwInvalidRefError = () => {
+        throw new Error('Invalid image reference');
+      };
+      if (!parseImageRef(ref)) throwInvalidRefError();
+
+      const { mode, id, extension } = parseImageRef(ref) as {
+        mode: ImageMode;
+        id: string;
+        extension: ImageExtension;
+      };
 
       if (isLocal(mode)) {
         const buffer = await fs.readFile(path.join(storagePath, `${id}.${extension}`));

diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -273,32 +273,16 @@ export const isValidImageRef = (ref: string): boolean => {
 
 export const SUPPORTED_IMAGE_EXTENSIONS = ['jpg', 'png', 'webp', 'gif'];
 
-const isValidImageExtension = (extension: string): boolean =>
-  SUPPORTED_IMAGE_EXTENSIONS.includes(extension);
-
 export const parseImageRef = (
   ref: string
-): { mode: ImageMode; id: string; extension: ImageExtension } => {
-  const throwInvalidRefError = () => {
-    throw new Error('Invalid image reference');
-  };
-
-  if (!isValidImageRef(ref)) {
-    throwInvalidRefError();
-  }
-
-  const [__, mode, id, ext] = ref.match(REFREGEX) as RegExpMatchArray;
-
-  // const [mode, idAndExt] = ref.split(':');
-  // const [id, ext] = idAndExt.split('.');
-
-  if (!isValidImageExtension(ext)) {
-    throwInvalidRefError();
+): { mode: ImageMode; id: string; extension: ImageExtension } | undefined => {
+  if (ref.match(REFREGEX)) {
+    const [__, mode, id, ext] = ref.match(REFREGEX) as RegExpMatchArray;
+    return {
+      mode: mode as ImageMode,
+      id,
+      extension: ext as ImageExtension,
+    };
   }
-
-  return {
-    mode: mode as ImageMode,
-    id,
-    extension: ext as ImageExtension,
-  };
+  return undefined;
 };