chore: multipleValidOptions types (#8435)

jestjs · May 7, 2019 · b3f54e7 · b3f54e7
1 parent 2297194
commit b3f54e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/packages/jest-config/src/ValidConfig.ts b/packages/jest-config/src/ValidConfig.ts
@@ -14,7 +14,6 @@ const NODE_MODULES_REGEXP = replacePathSepForRegex(NODE_MODULES);
 
 const initialOptions: Config.InitialOptions = {
   automock: false,
-  // @ts-ignore TODO: type this properly
   bail: multipleValidOptions(false, 0),
   browser: false,
   cache: true,
@@ -39,9 +38,8 @@ const initialOptions: Config.InitialOptions = {
     },
   },
   dependencyExtractor: '<rootDir>/dependencyExtractor.js',
-  // @ts-ignore TODO: type this properly
   displayName: multipleValidOptions('test-config', {
-    color: 'blue',
+    color: 'blue' as 'blue',
     name: 'test-config',
   }),
   errorOnDeprecated: false,

diff --git a/packages/jest-validate/src/condition.ts b/packages/jest-validate/src/condition.ts
@@ -33,10 +33,10 @@ export function validationCondition(option: any, validOption: any): boolean {
   return getValues(validOption).some(e => validationConditionSingle(option, e));
 }
 
-// TODO: This should infer the types of its arguments, and return a union type of the types
-// See https://github.com/Microsoft/TypeScript/issues/5453
-export function multipleValidOptions(...args: Array<any>) {
-  const options = [...args];
+export function multipleValidOptions<T extends Array<any>>(
+  ...args: T
+): T[number] {
+  const options = <T>[...args];
   // @ts-ignore
   options[MULTIPLE_VALID_OPTIONS_SYMBOL] = true;
   return options;