feat(validators): improved code style and types

uploadcare · May 29, 2024 · 8412b19 · 8412b19
1 parent 2741c59
commit 8412b19
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/blocks/Config/normalizeConfigValue.js b/blocks/Config/normalizeConfigValue.js
@@ -75,7 +75,7 @@ const asFunction = (value) => {
 };
 
 /**
- * @template  {Array<T>}T
+ * @template {Function[]} T
  * @param {unknown} value
  * @returns {T}
  */
@@ -153,8 +153,8 @@ const mapping = {
   secureDeliveryProxyUrlResolver:
     /** @type {typeof asFunction<import('../../types').SecureDeliveryProxyUrlResolver>} */ (asFunction),
   iconHrefResolver: /** @type {typeof asFunction<import('../../types').IconHrefResolver>} */ (asFunction),
-  fileValidators: /** @type {typeof asValidators<import('../../types').FileValidator[]>} */ (asValidators),
-  collectionValidators: /** @type {typeof asValidators<import('../../types').CollectionValidator[]>} */ (asValidators),
+  fileValidators: /** @type {typeof asValidators<import('../../types').FileValidator>} */ (asValidators),
+  collectionValidators: /** @type {typeof asValidators<import('../../types').CollectionValidator>} */ (asValidators),
 };
 
 /**

diff --git a/types/exported.d.ts b/types/exported.d.ts
@@ -1,6 +1,6 @@
-import { LocaleDefinition } from '../abstract/localeRegistry';
-import { complexConfigKeys } from '../blocks/Config/Config';
-import { FuncFileValidator, FuncCollectionValidator } from '../abstract/ValidationManager';
+import type { LocaleDefinition } from '../abstract/localeRegistry';
+import type { complexConfigKeys } from '../blocks/Config/Config';
+import type { FuncFileValidator, FuncCollectionValidator } from '../abstract/ValidationManager';
 
 export type UploadError = import('@uploadcare/upload-client').UploadError;
 export type UploadcareFile = import('@uploadcare/upload-client').UploadcareFile;
@@ -16,8 +16,8 @@ export type SecureDeliveryProxyUrlResolver = (
 export type SecureUploadsSignatureAndExpire = { secureSignature: string; secureExpire: string };
 export type SecureUploadsSignatureResolver = () => Promise<SecureUploadsSignatureAndExpire | null>;
 export type IconHrefResolver = (iconName: string) => string;
-export type FileValidator = FuncFileValidator | any;
-export type CollectionValidator = FuncCollectionValidator | any;
+export type FileValidator = FuncFileValidator[];
+export type CollectionValidator = FuncCollectionValidator[];
 
 export type ConfigType = {
   pubkey: string;
@@ -72,8 +72,8 @@ export type ConfigType = {
   secureDeliveryProxyUrlResolver: SecureDeliveryProxyUrlResolver | null;
   iconHrefResolver: IconHrefResolver | null;
 
-  fileValidators: FileValidator[] | null;
-  collectionValidators: CollectionValidator[] | null;
+  fileValidators: FileValidator | null;
+  collectionValidators: CollectionValidator | null;
 };
 export type ConfigComplexType = Pick<ConfigType, (typeof complexConfigKeys)[number]>;
 export type ConfigPlainType = Omit<ConfigType, keyof ConfigComplexType>;

diff --git a/utils/validators/file/validateUploadError.js b/utils/validators/file/validateUploadError.js
@@ -17,20 +17,22 @@ export const validateUploadError = (outputEntry, internalEntry, block) => {
       entry: outputEntry,
       error: cause,
     });
-  } else if (cause instanceof NetworkError) {
+  }
+
+  if (cause instanceof NetworkError) {
     return buildOutputFileError({
       type: 'NETWORK_ERROR',
       message: cause.message,
       entry: outputEntry,
       error: cause,
     });
-  } else {
-    const error = cause instanceof Error ? cause : new Error('Unknown error', { cause });
-    return buildOutputFileError({
-      type: 'UNKNOWN_ERROR',
-      message: error.message,
-      entry: outputEntry,
-      error,
-    });
   }
+
+  const error = cause instanceof Error ? cause : new Error('Unknown error', { cause });
+  return buildOutputFileError({
+    type: 'UNKNOWN_ERROR',
+    message: error.message,
+    entry: outputEntry,
+    error,
+  });
 };