From 431be9a0c03033675a517a62db686e4fe81f51f6 Mon Sep 17 00:00:00 2001
From: Matt Phillips <matt@mattphillips.io>
Date: Fri, 1 Mar 2019 18:16:16 +0000
Subject: [PATCH 01/16] Extract jest-each array table logic

---
 packages/jest-each/src/bind.ts        | 58 +++------------------------
 packages/jest-each/src/table/array.ts | 50 +++++++++++++++++++++++
 2 files changed, 55 insertions(+), 53 deletions(-)
 create mode 100644 packages/jest-each/src/table/array.ts

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
index 173c26e159c1..fe7cc58d5bfa 100644
--- a/packages/jest-each/src/bind.ts
+++ b/packages/jest-each/src/bind.ts
@@ -6,23 +6,16 @@
  *
  */
 
-import util from 'util';
 import chalk from 'chalk';
 import pretty from 'pretty-format';
 import {isPrimitive} from 'jest-get-type';
 import {ErrorWithStack} from 'jest-util';
 
-type Table = Array<Array<any>>;
-type PrettyArgs = {
-  args: Array<any>;
-  title: string;
-};
+// TODO: renmae this
+import arrayTableToX from './table/array';
 
 const EXPECTED_COLOR = chalk.green;
 const RECEIVED_COLOR = chalk.red;
-const SUPPORTED_PLACEHOLDERS = /%[sdifjoOp%]/g;
-const PRETTY_PLACEHOLDER = '%p';
-const INDEX_PLACEHOLDER = '%#';
 
 export default (cb: Function, supportsDone: boolean = true) => (...args: any) =>
   function eachBind(title: string, test: Function, timeout?: number): void {
@@ -72,13 +65,10 @@ export default (cb: Function, supportsDone: boolean = true) => (...args: any) =>
           throw error;
         });
       }
-      const table: Table = tableArg.every(Array.isArray)
-        ? tableArg
-        : tableArg.map(entry => [entry]);
-      return table.forEach((row, i) =>
+      return arrayTableToX(title, tableArg).forEach(row =>
         cb(
-          arrayFormat(title, i, ...row),
-          applyRestParams(supportsDone, row, test),
+          row.title,
+          applyRestParams(supportsDone, row.arguments, test),
           timeout,
         ),
       );
@@ -126,44 +116,6 @@ const isEmptyTable = (table: Array<any>) => table.length === 0;
 const isEmptyString = (str: string) =>
   typeof str === 'string' && str.trim() === '';
 
-const getPrettyIndexes = (placeholders: RegExpMatchArray) =>
-  placeholders.reduce((indexes: Array<number>, placeholder, index) => {
-    if (placeholder === PRETTY_PLACEHOLDER) {
-      indexes.push(index);
-    }
-    return indexes;
-  }, []);
-
-const arrayFormat = (title: string, rowIndex: number, ...args: Array<any>) => {
-  const placeholders = title.match(SUPPORTED_PLACEHOLDERS) || [];
-  const prettyIndexes = getPrettyIndexes(placeholders);
-
-  const {title: prettyTitle, args: remainingArgs} = args.reduce(
-    (acc: PrettyArgs, arg, index) => {
-      if (prettyIndexes.indexOf(index) !== -1) {
-        return {
-          args: acc.args,
-          title: acc.title.replace(
-            PRETTY_PLACEHOLDER,
-            pretty(arg, {maxDepth: 1, min: true}),
-          ),
-        };
-      }
-
-      return {
-        args: acc.args.concat([arg]),
-        title: acc.title,
-      };
-    },
-    {args: [], title},
-  );
-
-  return util.format(
-    prettyTitle.replace(INDEX_PLACEHOLDER, rowIndex.toString()),
-    ...remainingArgs.slice(0, placeholders.length - prettyIndexes.length),
-  );
-};
-
 type Done = () => {};
 
 const applyRestParams = (
diff --git a/packages/jest-each/src/table/array.ts b/packages/jest-each/src/table/array.ts
new file mode 100644
index 000000000000..524ce21ef32b
--- /dev/null
+++ b/packages/jest-each/src/table/array.ts
@@ -0,0 +1,50 @@
+import util from 'util';
+import pretty from 'pretty-format';
+
+type Col = unknown;
+type Row = Array<Col>;
+type Table = Array<Row>;
+type ArrayTable = Table | Row;
+
+// TODO: rename X and maybe arguments
+type X = Array<{
+  title: string;
+  arguments: Array<unknown>;
+}>;
+
+const SUPPORTED_PLACEHOLDERS = /%[sdifjoOp%]/g;
+const PRETTY_PLACEHOLDER = '%p';
+const INDEX_PLACEHOLDER = '%#';
+
+export default (title: string, arrayTable: ArrayTable): X =>
+  normaliseTable(arrayTable).map((row, index) => ({
+    title: formatTitle(title, row, index),
+    arguments: row,
+  }));
+
+const normaliseTable = (table: ArrayTable): Table =>
+  isTable(table) ? (table as Table) : (table as Row).map(colToRow);
+
+const isTable = (table: ArrayTable): boolean => table.every(Array.isArray);
+
+const colToRow = (col: Col): Row => [col];
+
+const formatTitle = (title: string, row: Row, rowIndex: number): string =>
+  row.reduce<string>((formattedTitle, value) => {
+    const [placeholder] = getMatchingPlaceholders(formattedTitle);
+    if (!placeholder) return formattedTitle;
+
+    if (placeholder === PRETTY_PLACEHOLDER)
+      return interpolatePrettyPlaceholder(formattedTitle, value);
+
+    return util.format(formattedTitle, value);
+  }, interpolateTitleIndex(title, rowIndex));
+
+const getMatchingPlaceholders = (title: string) =>
+  title.match(SUPPORTED_PLACEHOLDERS) || [];
+
+const interpolateTitleIndex = (title: string, index: number) =>
+  title.replace(INDEX_PLACEHOLDER, index.toString());
+
+const interpolatePrettyPlaceholder = (title: string, value: unknown) =>
+  title.replace(PRETTY_PLACEHOLDER, pretty(value, {maxDepth: 1, min: true}));

From e0ef99d5a8f36957302db8176ef78ce488b0c961 Mon Sep 17 00:00:00 2001
From: Matt Phillips <matt@mattphillips.io>
Date: Fri, 1 Mar 2019 18:16:24 +0000
Subject: [PATCH 02/16] Extract jest-each template table logic

---
 packages/jest-each/src/bind.ts           | 65 ++-------------------
 packages/jest-each/src/table/template.ts | 74 ++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 60 deletions(-)
 create mode 100644 packages/jest-each/src/table/template.ts

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
index fe7cc58d5bfa..66d51b108c58 100644
--- a/packages/jest-each/src/bind.ts
+++ b/packages/jest-each/src/bind.ts
@@ -8,11 +8,11 @@
 
 import chalk from 'chalk';
 import pretty from 'pretty-format';
-import {isPrimitive} from 'jest-get-type';
 import {ErrorWithStack} from 'jest-util';
 
 // TODO: renmae this
 import arrayTableToX from './table/array';
+import templateTableToX from './table/template';
 
 const EXPECTED_COLOR = chalk.green;
 const RECEIVED_COLOR = chalk.red;
@@ -68,7 +68,7 @@ export default (cb: Function, supportsDone: boolean = true) => (...args: any) =>
       return arrayTableToX(title, tableArg).forEach(row =>
         cb(
           row.title,
-          applyRestParams(supportsDone, row.arguments, test),
+          applyArguments(supportsDone, row.arguments, test),
           timeout,
         ),
       );
@@ -78,7 +78,6 @@ export default (cb: Function, supportsDone: boolean = true) => (...args: any) =>
     const data = args.slice(1);
 
     const keys = getHeadingKeys(templateStrings[0]);
-    const table = buildTable(data, keys.length, keys);
 
     const missingData = data.length % keys.length;
 
@@ -102,12 +101,8 @@ export default (cb: Function, supportsDone: boolean = true) => (...args: any) =>
       });
     }
 
-    return table.forEach(row =>
-      cb(
-        interpolate(title, row),
-        applyObjectParams(supportsDone, row, test),
-        timeout,
-      ),
+    return templateTableToX(title, keys, data).forEach(row =>
+      cb(row.title, applyArguments(supportsDone, row.arguments, test), timeout),
     );
   };
 
@@ -118,7 +113,7 @@ const isEmptyString = (str: string) =>
 
 type Done = () => {};
 
-const applyRestParams = (
+const applyArguments = (
   supportsDone: boolean,
   params: Array<any>,
   test: Function,
@@ -130,55 +125,5 @@ const applyRestParams = (
 const getHeadingKeys = (headings: string): Array<string> =>
   headings.replace(/\s/g, '').split('|');
 
-const buildTable = (
-  data: Array<any>,
-  rowSize: number,
-  keys: Array<string>,
-): Array<any> =>
-  Array.from({length: data.length / rowSize})
-    .map((_, index) => data.slice(index * rowSize, index * rowSize + rowSize))
-    .map(row =>
-      row.reduce(
-        (acc, value, index) => Object.assign(acc, {[keys[index]]: value}),
-        {},
-      ),
-    );
-
-const getMatchingKeyPaths = (title: string) => (
-  matches: Array<string>,
-  key: string,
-) => matches.concat(title.match(new RegExp(`\\$${key}[\\.\\w]*`, 'g')) || []);
-
-const replaceKeyPathWithValue = (data: any) => (
-  title: string,
-  match: string,
-) => {
-  const keyPath = match.replace('$', '').split('.');
-  const value = getPath(data, keyPath);
-
-  if (isPrimitive(value)) {
-    return title.replace(match, String(value));
-  }
-  return title.replace(match, pretty(value, {maxDepth: 1, min: true}));
-};
-
-const interpolate = (title: string, data: any) =>
-  Object.keys(data)
-    .reduce(getMatchingKeyPaths(title), []) // aka flatMap
-    .reduce(replaceKeyPathWithValue(data), title);
-
-const applyObjectParams = (supportsDone: boolean, obj: any, test: Function) =>
-  supportsDone && test.length > 1
-    ? (done: Done) => test(obj, done)
-    : () => test(obj);
-
 const pluralize = (word: string, count: number) =>
   word + (count === 1 ? '' : 's');
-
-const getPath = (
-  o: {[key: string]: any},
-  [head, ...tail]: Array<string>,
-): any => {
-  if (!head || !o.hasOwnProperty || !o.hasOwnProperty(head)) return o;
-  return getPath(o[head], tail);
-};
diff --git a/packages/jest-each/src/table/template.ts b/packages/jest-each/src/table/template.ts
new file mode 100644
index 000000000000..394bfff7618b
--- /dev/null
+++ b/packages/jest-each/src/table/template.ts
@@ -0,0 +1,74 @@
+import pretty from 'pretty-format';
+import {isPrimitive} from 'jest-get-type';
+
+type Col = unknown;
+type Row = Array<Col>;
+type Table = Array<Row>;
+type Template = {[key: string]: unknown};
+type Templates = Array<Template>;
+type Headings = Array<string>;
+
+type X = Array<{
+  title: string;
+  arguments: Array<unknown>;
+}>;
+
+export default (title: string, headings: Headings, row: Row): X => {
+  const table = convertRowToTable(row, headings);
+  const templates = convertTableToTemplates(table, headings);
+  return templates.map(template => ({
+    title: interpolate(title, template),
+    arguments: [template],
+  }));
+};
+
+const convertRowToTable = (
+  row: Row,
+  headings: Headings,
+): Table => // TODO: update this type to include values in headings
+  Array.from({length: row.length / headings.length}).map((_, index) =>
+    row.slice(
+      index * headings.length,
+      index * headings.length + headings.length,
+    ),
+  );
+
+const convertTableToTemplates = (table: Table, headings: Headings): Templates =>
+  table.map(row =>
+    row.reduce<Template>(
+      (acc, value, index) => Object.assign(acc, {[headings[index]]: value}),
+      {},
+    ),
+  );
+
+const interpolate = (title: string, template: Template) =>
+  Object.keys(template)
+    .reduce(getMatchingKeyPaths(title), []) // aka flatMap
+    .reduce(replaceKeyPathWithValue(template), title);
+
+const getMatchingKeyPaths = (title: string) => (
+  matches: Headings,
+  key: string,
+) => matches.concat(title.match(new RegExp(`\\$${key}[\\.\\w]*`, 'g')) || []);
+
+const replaceKeyPathWithValue = (template: Template) => (
+  title: string,
+  match: string,
+) => {
+  const keyPath = match.replace('$', '').split('.');
+  const value = getPath(template, keyPath);
+
+  if (isPrimitive(value)) {
+    return title.replace(match, String(value));
+  }
+  return title.replace(match, pretty(value, {maxDepth: 1, min: true}));
+};
+
+const getPath = (
+  template: Template | any,
+  [head, ...tail]: Array<string>,
+): any => {
+  if (!head || !template.hasOwnProperty || !template.hasOwnProperty(head))
+    return template;
+  return getPath(template[head], tail);
+};

From 5a1788123e6530c16d1ee70782b8b98be027e416 Mon Sep 17 00:00:00 2001
From: Matt Phillips <matt@mattphillips.io>
Date: Fri, 1 Mar 2019 18:16:28 +0000
Subject: [PATCH 03/16] Extract each table type

---
 packages/jest-each/src/bind.ts           | 14 +++++++++-----
 packages/jest-each/src/table/array.ts    |  9 ++-------
 packages/jest-each/src/table/template.ts | 13 +++----------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
index 66d51b108c58..d892800f6ccc 100644
--- a/packages/jest-each/src/bind.ts
+++ b/packages/jest-each/src/bind.ts
@@ -10,13 +10,17 @@ import chalk from 'chalk';
 import pretty from 'pretty-format';
 import {ErrorWithStack} from 'jest-util';
 
-// TODO: renmae this
-import arrayTableToX from './table/array';
-import templateTableToX from './table/template';
+import convertArrayTable from './table/array';
+import convertTemplateTable from './table/template';
 
 const EXPECTED_COLOR = chalk.green;
 const RECEIVED_COLOR = chalk.red;
 
+export type EachTable = Array<{
+  title: string;
+  arguments: Array<unknown>;
+}>;
+
 export default (cb: Function, supportsDone: boolean = true) => (...args: any) =>
   function eachBind(title: string, test: Function, timeout?: number): void {
     if (args.length === 1) {
@@ -65,7 +69,7 @@ export default (cb: Function, supportsDone: boolean = true) => (...args: any) =>
           throw error;
         });
       }
-      return arrayTableToX(title, tableArg).forEach(row =>
+      return convertArrayTable(title, tableArg).forEach(row =>
         cb(
           row.title,
           applyArguments(supportsDone, row.arguments, test),
@@ -101,7 +105,7 @@ export default (cb: Function, supportsDone: boolean = true) => (...args: any) =>
       });
     }
 
-    return templateTableToX(title, keys, data).forEach(row =>
+    return convertTemplateTable(title, keys, data).forEach(row =>
       cb(row.title, applyArguments(supportsDone, row.arguments, test), timeout),
     );
   };
diff --git a/packages/jest-each/src/table/array.ts b/packages/jest-each/src/table/array.ts
index 524ce21ef32b..8f8583e70072 100644
--- a/packages/jest-each/src/table/array.ts
+++ b/packages/jest-each/src/table/array.ts
@@ -1,22 +1,17 @@
 import util from 'util';
 import pretty from 'pretty-format';
+import {EachTable} from '../bind';
 
 type Col = unknown;
 type Row = Array<Col>;
 type Table = Array<Row>;
 type ArrayTable = Table | Row;
 
-// TODO: rename X and maybe arguments
-type X = Array<{
-  title: string;
-  arguments: Array<unknown>;
-}>;
-
 const SUPPORTED_PLACEHOLDERS = /%[sdifjoOp%]/g;
 const PRETTY_PLACEHOLDER = '%p';
 const INDEX_PLACEHOLDER = '%#';
 
-export default (title: string, arrayTable: ArrayTable): X =>
+export default (title: string, arrayTable: ArrayTable): EachTable =>
   normaliseTable(arrayTable).map((row, index) => ({
     title: formatTitle(title, row, index),
     arguments: row,
diff --git a/packages/jest-each/src/table/template.ts b/packages/jest-each/src/table/template.ts
index 394bfff7618b..e5eb9d91d1a7 100644
--- a/packages/jest-each/src/table/template.ts
+++ b/packages/jest-each/src/table/template.ts
@@ -1,5 +1,6 @@
 import pretty from 'pretty-format';
 import {isPrimitive} from 'jest-get-type';
+import {EachTable} from '../bind';
 
 type Col = unknown;
 type Row = Array<Col>;
@@ -8,12 +9,7 @@ type Template = {[key: string]: unknown};
 type Templates = Array<Template>;
 type Headings = Array<string>;
 
-type X = Array<{
-  title: string;
-  arguments: Array<unknown>;
-}>;
-
-export default (title: string, headings: Headings, row: Row): X => {
+export default (title: string, headings: Headings, row: Row): EachTable => {
   const table = convertRowToTable(row, headings);
   const templates = convertTableToTemplates(table, headings);
   return templates.map(template => ({
@@ -22,10 +18,7 @@ export default (title: string, headings: Headings, row: Row): X => {
   }));
 };
 
-const convertRowToTable = (
-  row: Row,
-  headings: Headings,
-): Table => // TODO: update this type to include values in headings
+const convertRowToTable = (row: Row, headings: Headings): Table =>
   Array.from({length: row.length / headings.length}).map((_, index) =>
     row.slice(
       index * headings.length,

From e9a0149b161352d1e0a770bff8b19bab04759fd8 Mon Sep 17 00:00:00 2001
From: Matt Phillips <matt@mattphillips.io>
Date: Fri, 1 Mar 2019 18:16:31 +0000
Subject: [PATCH 04/16] Update function types to use Jest globals

---
 packages/jest-each/src/bind.ts  | 19 +++++++++++--------
 packages/jest-each/src/index.ts | 11 ++++++-----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
index d892800f6ccc..d69bf3ff6ef8 100644
--- a/packages/jest-each/src/bind.ts
+++ b/packages/jest-each/src/bind.ts
@@ -6,6 +6,7 @@
  *
  */
 
+import {DoneFn, ItBase} from '@jest/types/build/Global';
 import chalk from 'chalk';
 import pretty from 'pretty-format';
 import {ErrorWithStack} from 'jest-util';
@@ -16,13 +17,17 @@ import convertTemplateTable from './table/template';
 const EXPECTED_COLOR = chalk.green;
 const RECEIVED_COLOR = chalk.red;
 
+type EachTestFn = (...args: any[]) => Promise<any> | void | undefined;
+
 export type EachTable = Array<{
   title: string;
   arguments: Array<unknown>;
 }>;
 
-export default (cb: Function, supportsDone: boolean = true) => (...args: any) =>
-  function eachBind(title: string, test: Function, timeout?: number): void {
+// TODO: update cb to ItBase | DescribeBase and deprecate supportsDone
+// TODO: update args from any
+export default (cb: ItBase, supportsDone: boolean = true) => (...args: any) =>
+  function eachBind(title: string, test: EachTestFn, timeout?: number): void {
     if (args.length === 1) {
       const [tableArg] = args;
 
@@ -115,15 +120,13 @@ const isEmptyTable = (table: Array<any>) => table.length === 0;
 const isEmptyString = (str: string) =>
   typeof str === 'string' && str.trim() === '';
 
-type Done = () => {};
-
 const applyArguments = (
   supportsDone: boolean,
-  params: Array<any>,
-  test: Function,
-) =>
+  params: Array<unknown>,
+  test: EachTestFn,
+): EachTestFn =>
   supportsDone && params.length < test.length
-    ? (done: Done) => test(...params, done)
+    ? (done: DoneFn) => test(...params, done)
     : () => test(...params);
 
 const getHeadingKeys = (headings: string): Array<string> =>
diff --git a/packages/jest-each/src/index.ts b/packages/jest-each/src/index.ts
index b77335f361b5..c46fcae7b25b 100644
--- a/packages/jest-each/src/index.ts
+++ b/packages/jest-each/src/index.ts
@@ -6,17 +6,18 @@
  *
  */
 
-type Global = NodeJS.Global;
-
+import {TestFn} from '@jest/types/build/Global';
 import bind from './bind';
 
+type Global = NodeJS.Global;
+
 const install = (g: Global, ...args: Array<any>) => {
-  const test = (title: string, test: Function, timeout?: number) =>
+  const test = (title: string, test: TestFn, timeout?: number) =>
     bind(g.test)(...args)(title, test, timeout);
   test.skip = bind(g.test.skip)(...args);
   test.only = bind(g.test.only)(...args);
 
-  const it = (title: string, test: Function, timeout?: number) =>
+  const it = (title: string, test: TestFn, timeout?: number) =>
     bind(g.it)(...args)(title, test, timeout);
   it.skip = bind(g.it.skip)(...args);
   it.only = bind(g.it.only)(...args);
@@ -25,7 +26,7 @@ const install = (g: Global, ...args: Array<any>) => {
   const fit = bind(g.fit)(...args);
   const xtest = bind(g.xtest)(...args);
 
-  const describe = (title: string, suite: Function, timeout?: number) =>
+  const describe = (title: string, suite: TestFn, timeout?: number) =>
     bind(g.describe, false)(...args)(title, suite, timeout);
   describe.skip = bind(g.describe.skip, false)(...args);
   describe.only = bind(g.describe.only, false)(...args);

From 6c826a437e942b28afaffdd1f3f5f16ea98321a4 Mon Sep 17 00:00:00 2001
From: Matt Phillips <matt@mattphillips.io>
Date: Fri, 1 Mar 2019 18:16:34 +0000
Subject: [PATCH 05/16] Add jest-each public args tyeps

---
 packages/jest-each/src/bind.ts           | 50 ++++++++++++++----------
 packages/jest-each/src/index.ts          | 38 +++++++++---------
 packages/jest-each/src/table/array.ts    |  4 +-
 packages/jest-each/src/table/template.ts |  4 +-
 4 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
index d69bf3ff6ef8..24509b2e5218 100644
--- a/packages/jest-each/src/bind.ts
+++ b/packages/jest-each/src/bind.ts
@@ -19,22 +19,35 @@ const RECEIVED_COLOR = chalk.red;
 
 type EachTestFn = (...args: any[]) => Promise<any> | void | undefined;
 
-export type EachTable = Array<{
+// TODO: re-use these everywhere
+type Col = unknown;
+type Row = Array<Col>;
+type Table = Array<Row>;
+type ArrayTable = Table | Row;
+type TemplateTable = TemplateStringsArray;
+
+export type TemplateData = Array<unknown>;
+export type EachTable = ArrayTable | TemplateTable;
+// type Each = (table: EachTable, ...rest: Array<unknown>) => JestFunction;
+// type Bind = (cb: JestFunction) => Each;
+
+export type EachTests = Array<{
   title: string;
   arguments: Array<unknown>;
 }>;
 
 // TODO: update cb to ItBase | DescribeBase and deprecate supportsDone
-// TODO: update args from any
-export default (cb: ItBase, supportsDone: boolean = true) => (...args: any) =>
+export default (cb: ItBase, supportsDone: boolean = true) => (
+  table: EachTable,
+  ...taggedTemplateData: TemplateData
+) =>
   function eachBind(title: string, test: EachTestFn, timeout?: number): void {
-    if (args.length === 1) {
-      const [tableArg] = args;
-
-      if (!Array.isArray(tableArg)) {
+    if (taggedTemplateData.length === 0) {
+      if (!Array.isArray(table)) {
+        // TODO: extract validation
         const error = new ErrorWithStack(
           '`.each` must be called with an Array or Tagged Template Literal.\n\n' +
-            `Instead was called with: ${pretty(tableArg, {
+            `Instead was called with: ${pretty(table, {
               maxDepth: 1,
               min: true,
             })}\n`,
@@ -45,8 +58,8 @@ export default (cb: ItBase, supportsDone: boolean = true) => (...args: any) =>
         });
       }
 
-      if (isTaggedTemplateLiteral(tableArg)) {
-        if (isEmptyString(tableArg[0])) {
+      if (isTaggedTemplateLiteral(table)) {
+        if (isEmptyString(table[0])) {
           const error = new ErrorWithStack(
             'Error: `.each` called with an empty Tagged Template Literal of table data.\n',
             eachBind,
@@ -65,7 +78,7 @@ export default (cb: ItBase, supportsDone: boolean = true) => (...args: any) =>
         });
       }
 
-      if (isEmptyTable(tableArg)) {
+      if (isEmptyTable(table)) {
         const error = new ErrorWithStack(
           'Error: `.each` called with an empty Array of table data.\n',
           eachBind,
@@ -74,7 +87,7 @@ export default (cb: ItBase, supportsDone: boolean = true) => (...args: any) =>
           throw error;
         });
       }
-      return convertArrayTable(title, tableArg).forEach(row =>
+      return convertArrayTable(title, table).forEach(row =>
         cb(
           row.title,
           applyArguments(supportsDone, row.arguments, test),
@@ -83,12 +96,9 @@ export default (cb: ItBase, supportsDone: boolean = true) => (...args: any) =>
       );
     }
 
-    const templateStrings = args[0];
-    const data = args.slice(1);
-
-    const keys = getHeadingKeys(templateStrings[0]);
+    const keys = getHeadingKeys(table[0] as string);
 
-    const missingData = data.length % keys.length;
+    const missingData = taggedTemplateData.length % keys.length;
 
     if (missingData > 0) {
       const error = new ErrorWithStack(
@@ -96,7 +106,7 @@ export default (cb: ItBase, supportsDone: boolean = true) => (...args: any) =>
           EXPECTED_COLOR(keys.join(' | ')) +
           '\n\n' +
           'Received:\n' +
-          RECEIVED_COLOR(pretty(data)) +
+          RECEIVED_COLOR(pretty(taggedTemplateData)) +
           '\n\n' +
           `Missing ${RECEIVED_COLOR(missingData.toString())} ${pluralize(
             'argument',
@@ -110,14 +120,14 @@ export default (cb: ItBase, supportsDone: boolean = true) => (...args: any) =>
       });
     }
 
-    return convertTemplateTable(title, keys, data).forEach(row =>
+    return convertTemplateTable(title, keys, taggedTemplateData).forEach(row =>
       cb(row.title, applyArguments(supportsDone, row.arguments, test), timeout),
     );
   };
 
 const isTaggedTemplateLiteral = (array: any) => array.raw !== undefined;
 const isEmptyTable = (table: Array<any>) => table.length === 0;
-const isEmptyString = (str: string) =>
+const isEmptyString = (str: string | unknown) =>
   typeof str === 'string' && str.trim() === '';
 
 const applyArguments = (
diff --git a/packages/jest-each/src/index.ts b/packages/jest-each/src/index.ts
index c46fcae7b25b..5a6911233d86 100644
--- a/packages/jest-each/src/index.ts
+++ b/packages/jest-each/src/index.ts
@@ -7,38 +7,40 @@
  */
 
 import {TestFn} from '@jest/types/build/Global';
-import bind from './bind';
+import bind, {EachTable, TemplateData} from './bind';
 
 type Global = NodeJS.Global;
 
-const install = (g: Global, ...args: Array<any>) => {
+const install = (g: Global, table: EachTable, ...data: TemplateData) => {
   const test = (title: string, test: TestFn, timeout?: number) =>
-    bind(g.test)(...args)(title, test, timeout);
-  test.skip = bind(g.test.skip)(...args);
-  test.only = bind(g.test.only)(...args);
+    bind(g.test)(table, ...data)(title, test, timeout);
+  test.skip = bind(g.test.skip)(table, ...data);
+  test.only = bind(g.test.only)(table, ...data);
 
   const it = (title: string, test: TestFn, timeout?: number) =>
-    bind(g.it)(...args)(title, test, timeout);
-  it.skip = bind(g.it.skip)(...args);
-  it.only = bind(g.it.only)(...args);
+    bind(g.it)(table, ...data)(title, test, timeout);
+  it.skip = bind(g.it.skip)(table, ...data);
+  it.only = bind(g.it.only)(table, ...data);
 
-  const xit = bind(g.xit)(...args);
-  const fit = bind(g.fit)(...args);
-  const xtest = bind(g.xtest)(...args);
+  const xit = bind(g.xit)(table, ...data);
+  const fit = bind(g.fit)(table, ...data);
+  const xtest = bind(g.xtest)(table, ...data);
 
   const describe = (title: string, suite: TestFn, timeout?: number) =>
-    bind(g.describe, false)(...args)(title, suite, timeout);
-  describe.skip = bind(g.describe.skip, false)(...args);
-  describe.only = bind(g.describe.only, false)(...args);
-  const fdescribe = bind(g.fdescribe, false)(...args);
-  const xdescribe = bind(g.xdescribe, false)(...args);
+    bind(g.describe, false)(table, ...data)(title, suite, timeout);
+  describe.skip = bind(g.describe.skip, false)(table, ...data);
+  describe.only = bind(g.describe.only, false)(table, ...data);
+  const fdescribe = bind(g.fdescribe, false)(table, ...data);
+  const xdescribe = bind(g.xdescribe, false)(table, ...data);
 
   return {describe, fdescribe, fit, it, test, xdescribe, xit, xtest};
 };
 
-const each = (...args: Array<any>) => install(global, ...args);
+const each = (table: EachTable, ...data: TemplateData) =>
+  install(global, table, ...data);
 
-each.withGlobal = (g: Global) => (...args: Array<any>) => install(g, ...args);
+each.withGlobal = (g: Global) => (table: EachTable, ...data: TemplateData) =>
+  install(g, table, ...data);
 
 export {bind};
 
diff --git a/packages/jest-each/src/table/array.ts b/packages/jest-each/src/table/array.ts
index 8f8583e70072..e7a0204a7125 100644
--- a/packages/jest-each/src/table/array.ts
+++ b/packages/jest-each/src/table/array.ts
@@ -1,6 +1,6 @@
 import util from 'util';
 import pretty from 'pretty-format';
-import {EachTable} from '../bind';
+import {EachTests} from '../bind';
 
 type Col = unknown;
 type Row = Array<Col>;
@@ -11,7 +11,7 @@ const SUPPORTED_PLACEHOLDERS = /%[sdifjoOp%]/g;
 const PRETTY_PLACEHOLDER = '%p';
 const INDEX_PLACEHOLDER = '%#';
 
-export default (title: string, arrayTable: ArrayTable): EachTable =>
+export default (title: string, arrayTable: ArrayTable): EachTests =>
   normaliseTable(arrayTable).map((row, index) => ({
     title: formatTitle(title, row, index),
     arguments: row,
diff --git a/packages/jest-each/src/table/template.ts b/packages/jest-each/src/table/template.ts
index e5eb9d91d1a7..6310aefeabd6 100644
--- a/packages/jest-each/src/table/template.ts
+++ b/packages/jest-each/src/table/template.ts
@@ -1,6 +1,6 @@
 import pretty from 'pretty-format';
 import {isPrimitive} from 'jest-get-type';
-import {EachTable} from '../bind';
+import {EachTests} from '../bind';
 
 type Col = unknown;
 type Row = Array<Col>;
@@ -9,7 +9,7 @@ type Template = {[key: string]: unknown};
 type Templates = Array<Template>;
 type Headings = Array<string>;
 
-export default (title: string, headings: Headings, row: Row): EachTable => {
+export default (title: string, headings: Headings, row: Row): EachTests => {
   const table = convertRowToTable(row, headings);
   const templates = convertTableToTemplates(table, headings);
   return templates.map(template => ({

From ebd61145f468da01ca275532ecec06447017ff10 Mon Sep 17 00:00:00 2001
From: Matt Phillips <matt@mattphillips.io>
Date: Fri, 1 Mar 2019 18:16:38 +0000
Subject: [PATCH 06/16] Extract bind logic to remove duplied calls to global
 callback

---
 packages/jest-each/src/bind.ts | 137 +++++++++++++++------------------
 1 file changed, 61 insertions(+), 76 deletions(-)

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
index 24509b2e5218..018fd2f85a93 100644
--- a/packages/jest-each/src/bind.ts
+++ b/packages/jest-each/src/bind.ts
@@ -25,106 +25,91 @@ type Row = Array<Col>;
 type Table = Array<Row>;
 type ArrayTable = Table | Row;
 type TemplateTable = TemplateStringsArray;
-
 export type TemplateData = Array<unknown>;
 export type EachTable = ArrayTable | TemplateTable;
-// type Each = (table: EachTable, ...rest: Array<unknown>) => JestFunction;
-// type Bind = (cb: JestFunction) => Each;
 
 export type EachTests = Array<{
   title: string;
   arguments: Array<unknown>;
 }>;
 
+type Result = EachTests | string;
+
 // TODO: update cb to ItBase | DescribeBase and deprecate supportsDone
 export default (cb: ItBase, supportsDone: boolean = true) => (
   table: EachTable,
   ...taggedTemplateData: TemplateData
 ) =>
   function eachBind(title: string, test: EachTestFn, timeout?: number): void {
-    if (taggedTemplateData.length === 0) {
-      if (!Array.isArray(table)) {
-        // TODO: extract validation
-        const error = new ErrorWithStack(
-          '`.each` must be called with an Array or Tagged Template Literal.\n\n' +
-            `Instead was called with: ${pretty(table, {
-              maxDepth: 1,
-              min: true,
-            })}\n`,
-          eachBind,
-        );
-        return cb(title, () => {
-          throw error;
-        });
-      }
-
-      if (isTaggedTemplateLiteral(table)) {
-        if (isEmptyString(table[0])) {
-          const error = new ErrorWithStack(
-            'Error: `.each` called with an empty Tagged Template Literal of table data.\n',
-            eachBind,
-          );
-          return cb(title, () => {
-            throw error;
-          });
-        }
-
-        const error = new ErrorWithStack(
-          'Error: `.each` called with a Tagged Template Literal with no data, remember to interpolate with ${expression} syntax.\n',
-          eachBind,
-        );
-        return cb(title, () => {
-          throw error;
-        });
-      }
-
-      if (isEmptyTable(table)) {
-        const error = new ErrorWithStack(
-          'Error: `.each` called with an empty Array of table data.\n',
-          eachBind,
-        );
-        return cb(title, () => {
-          throw error;
-        });
-      }
-      return convertArrayTable(title, table).forEach(row =>
-        cb(
-          row.title,
-          applyArguments(supportsDone, row.arguments, test),
-          timeout,
-        ),
-      );
-    }
-
-    const keys = getHeadingKeys(table[0] as string);
-
-    const missingData = taggedTemplateData.length % keys.length;
-
-    if (missingData > 0) {
-      const error = new ErrorWithStack(
-        'Not enough arguments supplied for given headings:\n' +
-          EXPECTED_COLOR(keys.join(' | ')) +
-          '\n\n' +
-          'Received:\n' +
-          RECEIVED_COLOR(pretty(taggedTemplateData)) +
-          '\n\n' +
-          `Missing ${RECEIVED_COLOR(missingData.toString())} ${pluralize(
-            'argument',
-            missingData,
-          )}`,
-        eachBind,
-      );
+    const result = isArrayTable(taggedTemplateData)
+      ? buildArrayTests(title, table)
+      : buildTemplateTests(title, table, taggedTemplateData);
 
+    if (typeof result === 'string') {
+      const error = new ErrorWithStack(result, eachBind);
       return cb(title, () => {
         throw error;
       });
     }
 
-    return convertTemplateTable(title, keys, taggedTemplateData).forEach(row =>
+    return result.forEach(row =>
       cb(row.title, applyArguments(supportsDone, row.arguments, test), timeout),
     );
   };
 
+const isArrayTable = (data: TemplateData) => data.length === 0;
+
+const buildArrayTests = (title: string, table: EachTable): Result => {
+  if (!Array.isArray(table)) {
+    return (
+      '`.each` must be called with an Array or Tagged Template Literal.\n\n' +
+      `Instead was called with: ${pretty(table, {
+        maxDepth: 1,
+        min: true,
+      })}\n`
+    );
+  }
+
+  if (isTaggedTemplateLiteral(table)) {
+    if (isEmptyString(table[0])) {
+      return 'Error: `.each` called with an empty Tagged Template Literal of table data.\n';
+    }
+
+    return 'Error: `.each` called with a Tagged Template Literal with no data, remember to interpolate with ${expression} syntax.\n';
+  }
+
+  if (isEmptyTable(table)) {
+    return 'Error: `.each` called with an empty Array of table data.\n';
+  }
+  return convertArrayTable(title, table);
+};
+
+const buildTemplateTests = (
+  title: string,
+  table: EachTable,
+  taggedTemplateData: TemplateData,
+): Result => {
+  const keys = getHeadingKeys(table[0] as string);
+  const missingData = taggedTemplateData.length % keys.length;
+
+  if (missingData > 0) {
+    return (
+      'Not enough arguments supplied for given headings:\n' +
+      EXPECTED_COLOR(keys.join(' | ')) +
+      '\n\n' +
+      'Received:\n' +
+      RECEIVED_COLOR(pretty(taggedTemplateData)) +
+      '\n\n' +
+      `Missing ${RECEIVED_COLOR(missingData.toString())} ${pluralize(
+        'argument',
+        missingData,
+      )}`
+    );
+  }
+
+  return convertTemplateTable(title, keys, taggedTemplateData);
+};
+
 const isTaggedTemplateLiteral = (array: any) => array.raw !== undefined;
 const isEmptyTable = (table: Array<any>) => table.length === 0;
 const isEmptyString = (str: string | unknown) =>

From 880c655dcb65b869c33e93a8d719713fc257ef77 Mon Sep 17 00:00:00 2001
From: Matt Phillips <matt@mattphillips.io>
Date: Fri, 1 Mar 2019 18:16:42 +0000
Subject: [PATCH 07/16] Delete duplicate types

---
 packages/jest-each/src/bind.ts           | 9 ++++-----
 packages/jest-each/src/table/array.ts    | 6 +-----
 packages/jest-each/src/table/template.ts | 5 +----
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
index 018fd2f85a93..678440946102 100644
--- a/packages/jest-each/src/bind.ts
+++ b/packages/jest-each/src/bind.ts
@@ -19,11 +19,10 @@ const RECEIVED_COLOR = chalk.red;
 
 type EachTestFn = (...args: any[]) => Promise<any> | void | undefined;
 
-// TODO: re-use these everywhere
-type Col = unknown;
-type Row = Array<Col>;
-type Table = Array<Row>;
-type ArrayTable = Table | Row;
+export type Col = unknown;
+export type Row = Array<Col>;
+export type Table = Array<Row>;
+export type ArrayTable = Table | Row;
 type TemplateTable = TemplateStringsArray;
 export type TemplateData = Array<unknown>;
 export type EachTable = ArrayTable | TemplateTable;
diff --git a/packages/jest-each/src/table/array.ts b/packages/jest-each/src/table/array.ts
index e7a0204a7125..eaac86526e7e 100644
--- a/packages/jest-each/src/table/array.ts
+++ b/packages/jest-each/src/table/array.ts
@@ -1,11 +1,7 @@
 import util from 'util';
 import pretty from 'pretty-format';
-import {EachTests} from '../bind';
 
-type Col = unknown;
-type Row = Array<Col>;
-type Table = Array<Row>;
-type ArrayTable = Table | Row;
+import {ArrayTable, Col, EachTests, Row, Table} from '../bind';
 
 const SUPPORTED_PLACEHOLDERS = /%[sdifjoOp%]/g;
 const PRETTY_PLACEHOLDER = '%p';
diff --git a/packages/jest-each/src/table/template.ts b/packages/jest-each/src/table/template.ts
index 6310aefeabd6..dfa6e1390b31 100644
--- a/packages/jest-each/src/table/template.ts
+++ b/packages/jest-each/src/table/template.ts
@@ -1,10 +1,7 @@
 import pretty from 'pretty-format';
 import {isPrimitive} from 'jest-get-type';
-import {EachTests} from '../bind';
+import {EachTests, Row, Table} from '../bind';
 
-type Col = unknown;
-type Row = Array<Col>;
-type Table = Array<Row>;
 type Template = {[key: string]: unknown};
 type Templates = Array<Template>;
 type Headings = Array<string>;

From e35fee656b8971773f66f11043a83523fe9e7cba Mon Sep 17 00:00:00 2001
From: Matt Phillips <matt@mattphillips.io>
Date: Fri, 1 Mar 2019 18:16:46 +0000
Subject: [PATCH 08/16] Extract validation

---
 packages/jest-each/src/bind.ts       | 95 +++++++---------------------
 packages/jest-each/src/validation.ts | 56 ++++++++++++++++
 2 files changed, 80 insertions(+), 71 deletions(-)
 create mode 100644 packages/jest-each/src/validation.ts

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
index 678440946102..fa3447996aec 100644
--- a/packages/jest-each/src/bind.ts
+++ b/packages/jest-each/src/bind.ts
@@ -7,15 +7,11 @@
  */
 
 import {DoneFn, ItBase} from '@jest/types/build/Global';
-import chalk from 'chalk';
-import pretty from 'pretty-format';
 import {ErrorWithStack} from 'jest-util';
 
 import convertArrayTable from './table/array';
 import convertTemplateTable from './table/template';
-
-const EXPECTED_COLOR = chalk.green;
-const RECEIVED_COLOR = chalk.red;
+import {validateArrayTable, validateTemplateTableHeadings} from './validation';
 
 type EachTestFn = (...args: any[]) => Promise<any> | void | undefined;
 
@@ -32,87 +28,50 @@ export type EachTests = Array<{
   arguments: Array<unknown>;
 }>;
 
-type Result = EachTests | string;
-
-// TODO: update cb to ItBase | DescribeBase and deprecate supportsDone
 export default (cb: ItBase, supportsDone: boolean = true) => (
   table: EachTable,
   ...taggedTemplateData: TemplateData
 ) =>
   function eachBind(title: string, test: EachTestFn, timeout?: number): void {
-    const result = isArrayTable(taggedTemplateData)
-      ? buildArrayTests(title, table)
-      : buildTemplateTests(title, table, taggedTemplateData);
-
-    if (typeof result === 'string') {
-      const error = new ErrorWithStack(result, eachBind);
+    try {
+      const tests = isArrayTable(taggedTemplateData)
+        ? buildArrayTests(title, table)
+        : buildTemplateTests(title, table, taggedTemplateData);
+
+      return tests.forEach(row =>
+        cb(
+          row.title,
+          applyArguments(supportsDone, row.arguments, test),
+          timeout,
+        ),
+      );
+    } catch (e) {
+      const error = new ErrorWithStack(e, eachBind);
       return cb(title, () => {
         throw error;
       });
     }
-
-    return result.forEach(row =>
-      cb(row.title, applyArguments(supportsDone, row.arguments, test), timeout),
-    );
   };
 
 const isArrayTable = (data: TemplateData) => data.length === 0;
 
-const buildArrayTests = (title: string, table: EachTable): Result => {
-  if (!Array.isArray(table)) {
-    return (
-      '`.each` must be called with an Array or Tagged Template Literal.\n\n' +
-      `Instead was called with: ${pretty(table, {
-        maxDepth: 1,
-        min: true,
-      })}\n`
-    );
-  }
-
-  if (isTaggedTemplateLiteral(table)) {
-    if (isEmptyString(table[0])) {
-      return 'Error: `.each` called with an empty Tagged Template Literal of table data.\n';
-    }
-
-    return 'Error: `.each` called with a Tagged Template Literal with no data, remember to interpolate with ${expression} syntax.\n';
-  }
-
-  if (isEmptyTable(table)) {
-    return 'Error: `.each` called with an empty Array of table data.\n';
-  }
-  return convertArrayTable(title, table);
+const buildArrayTests = (title: string, table: EachTable): EachTests => {
+  validateArrayTable(table);
+  return convertArrayTable(title, table as ArrayTable);
 };
 
 const buildTemplateTests = (
   title: string,
   table: EachTable,
   taggedTemplateData: TemplateData,
-): Result => {
-  const keys = getHeadingKeys(table[0] as string);
-  const missingData = taggedTemplateData.length % keys.length;
-
-  if (missingData > 0) {
-    return (
-      'Not enough arguments supplied for given headings:\n' +
-      EXPECTED_COLOR(keys.join(' | ')) +
-      '\n\n' +
-      'Received:\n' +
-      RECEIVED_COLOR(pretty(taggedTemplateData)) +
-      '\n\n' +
-      `Missing ${RECEIVED_COLOR(missingData.toString())} ${pluralize(
-        'argument',
-        missingData,
-      )}`
-    );
-  }
-
-  return convertTemplateTable(title, keys, taggedTemplateData);
+): EachTests => {
+  const headings = getHeadingKeys(table[0] as string);
+  validateTemplateTableHeadings(headings, taggedTemplateData);
+  return convertTemplateTable(title, headings, taggedTemplateData);
 };
 
-const isTaggedTemplateLiteral = (array: any) => array.raw !== undefined;
-const isEmptyTable = (table: Array<any>) => table.length === 0;
-const isEmptyString = (str: string | unknown) =>
-  typeof str === 'string' && str.trim() === '';
+const getHeadingKeys = (headings: string): Array<string> =>
+  headings.replace(/\s/g, '').split('|');
 
 const applyArguments = (
   supportsDone: boolean,
@@ -122,9 +81,3 @@ const applyArguments = (
   supportsDone && params.length < test.length
     ? (done: DoneFn) => test(...params, done)
     : () => test(...params);
-
-const getHeadingKeys = (headings: string): Array<string> =>
-  headings.replace(/\s/g, '').split('|');
-
-const pluralize = (word: string, count: number) =>
-  word + (count === 1 ? '' : 's');
diff --git a/packages/jest-each/src/validation.ts b/packages/jest-each/src/validation.ts
new file mode 100644
index 000000000000..7e00c2b5aa71
--- /dev/null
+++ b/packages/jest-each/src/validation.ts
@@ -0,0 +1,56 @@
+import chalk from 'chalk';
+import pretty from 'pretty-format';
+import {TemplateData} from './bind';
+
+const EXPECTED_COLOR = chalk.green;
+const RECEIVED_COLOR = chalk.red;
+
+export const validateArrayTable = (table: any) => {
+  if (!Array.isArray(table)) {
+    throw '`.each` must be called with an Array or Tagged Template Literal.\n\n' +
+      `Instead was called with: ${pretty(table, {
+        maxDepth: 1,
+        min: true,
+      })}\n`;
+  }
+
+  if (isTaggedTemplateLiteral(table)) {
+    if (isEmptyString(table[0])) {
+      throw 'Error: `.each` called with an empty Tagged Template Literal of table data.\n';
+    }
+
+    throw 'Error: `.each` called with a Tagged Template Literal with no data, remember to interpolate with ${expression} syntax.\n';
+  }
+
+  if (isEmptyTable(table)) {
+    throw 'Error: `.each` called with an empty Array of table data.\n';
+  }
+};
+
+const isTaggedTemplateLiteral = (array: any) => array.raw !== undefined;
+const isEmptyTable = (table: Array<any>) => table.length === 0;
+const isEmptyString = (str: string | unknown) =>
+  typeof str === 'string' && str.trim() === '';
+
+export const validateTemplateTableHeadings = (
+  headings: Array<string>,
+  data: TemplateData,
+) => {
+  const missingData = data.length % headings.length;
+
+  if (missingData > 0) {
+    throw 'Not enough arguments supplied for given headings:\n' +
+      EXPECTED_COLOR(headings.join(' | ')) +
+      '\n\n' +
+      'Received:\n' +
+      RECEIVED_COLOR(pretty(data)) +
+      '\n\n' +
+      `Missing ${RECEIVED_COLOR(missingData.toString())} ${pluralize(
+        'argument',
+        missingData,
+      )}`;
+  }
+};
+
+const pluralize = (word: string, count: number) =>
+  word + (count === 1 ? '' : 's');

From 2d882fc5a0dcc7740c94ce37d45311999314625b Mon Sep 17 00:00:00 2001
From: Matt Phillips <matt@mattphillips.io>
Date: Fri, 1 Mar 2019 18:49:52 +0000
Subject: [PATCH 09/16] Add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18b0b770a7bc..dba97dcdc03a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 
 ### Chore & Maintenance
 
+- `[jest-each]`: Refactor into multiple files with better types ([#8018](https://github.com/facebook/jest/pull/8018))
 - `[jest-each]`: Migrate to Typescript ([#8007](https://github.com/facebook/jest/pull/8007))
 - `[jest-environment-jsdom]`: Migrate to TypeScript ([#7985](https://github.com/facebook/jest/pull/8003))
 - `[jest-environment-node]`: Migrate to TypeScript ([#7985](https://github.com/facebook/jest/pull/7985))

From 1bdd67c506cd556376e9d5db4c383d0912b76933 Mon Sep 17 00:00:00 2001
From: Matt Phillips <matt@mattphillips.io>
Date: Fri, 1 Mar 2019 19:12:51 +0000
Subject: [PATCH 10/16] Extract jest-each type defs to global

---
 packages/jest-each/src/bind.ts           | 23 +++++++++++------------
 packages/jest-each/src/index.ts          |  4 ++--
 packages/jest-each/src/table/array.ts    |  3 ++-
 packages/jest-each/src/table/template.ts |  3 ++-
 packages/jest-each/src/validation.ts     |  2 +-
 packages/jest-types/src/Global.ts        | 15 +++++++++++++--
 6 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
index fa3447996aec..a026a023384f 100644
--- a/packages/jest-each/src/bind.ts
+++ b/packages/jest-each/src/bind.ts
@@ -6,29 +6,28 @@
  *
  */
 
-import {DoneFn, ItBase} from '@jest/types/build/Global';
+import {
+  DoneFn,
+  EachTable,
+  TemplateData,
+  EachTestFn,
+  ArrayTable,
+} from '@jest/types/build/Global';
 import {ErrorWithStack} from 'jest-util';
 
 import convertArrayTable from './table/array';
 import convertTemplateTable from './table/template';
 import {validateArrayTable, validateTemplateTableHeadings} from './validation';
 
-type EachTestFn = (...args: any[]) => Promise<any> | void | undefined;
-
-export type Col = unknown;
-export type Row = Array<Col>;
-export type Table = Array<Row>;
-export type ArrayTable = Table | Row;
-type TemplateTable = TemplateStringsArray;
-export type TemplateData = Array<unknown>;
-export type EachTable = ArrayTable | TemplateTable;
-
 export type EachTests = Array<{
   title: string;
   arguments: Array<unknown>;
 }>;
 
-export default (cb: ItBase, supportsDone: boolean = true) => (
+type TestFn = (done?: DoneFn) => Promise<any> | void | undefined;
+type GlobalCallback = (testName: string, fn: TestFn, timeout?: number) => void;
+
+export default (cb: GlobalCallback, supportsDone: boolean = true) => (
   table: EachTable,
   ...taggedTemplateData: TemplateData
 ) =>
diff --git a/packages/jest-each/src/index.ts b/packages/jest-each/src/index.ts
index 5a6911233d86..910ba8322189 100644
--- a/packages/jest-each/src/index.ts
+++ b/packages/jest-each/src/index.ts
@@ -6,8 +6,8 @@
  *
  */
 
-import {TestFn} from '@jest/types/build/Global';
-import bind, {EachTable, TemplateData} from './bind';
+import {TestFn, EachTable, TemplateData} from '@jest/types/build/Global';
+import bind from './bind';
 
 type Global = NodeJS.Global;
 
diff --git a/packages/jest-each/src/table/array.ts b/packages/jest-each/src/table/array.ts
index eaac86526e7e..4729c8a62d17 100644
--- a/packages/jest-each/src/table/array.ts
+++ b/packages/jest-each/src/table/array.ts
@@ -1,7 +1,8 @@
 import util from 'util';
 import pretty from 'pretty-format';
 
-import {ArrayTable, Col, EachTests, Row, Table} from '../bind';
+import {ArrayTable, Table, Row, Col} from '@jest/types/build/Global';
+import {EachTests} from '../bind';
 
 const SUPPORTED_PLACEHOLDERS = /%[sdifjoOp%]/g;
 const PRETTY_PLACEHOLDER = '%p';
diff --git a/packages/jest-each/src/table/template.ts b/packages/jest-each/src/table/template.ts
index dfa6e1390b31..65e2d6e39cd5 100644
--- a/packages/jest-each/src/table/template.ts
+++ b/packages/jest-each/src/table/template.ts
@@ -1,6 +1,7 @@
 import pretty from 'pretty-format';
 import {isPrimitive} from 'jest-get-type';
-import {EachTests, Row, Table} from '../bind';
+import {Row, Table} from '@jest/types/build/Global';
+import {EachTests} from '../bind';
 
 type Template = {[key: string]: unknown};
 type Templates = Array<Template>;
diff --git a/packages/jest-each/src/validation.ts b/packages/jest-each/src/validation.ts
index 7e00c2b5aa71..d8019752836b 100644
--- a/packages/jest-each/src/validation.ts
+++ b/packages/jest-each/src/validation.ts
@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import pretty from 'pretty-format';
-import {TemplateData} from './bind';
+import {TemplateData} from '@jest/types/build/Global';
 
 const EXPECTED_COLOR = chalk.green;
 const RECEIVED_COLOR = chalk.red;
diff --git a/packages/jest-types/src/Global.ts b/packages/jest-types/src/Global.ts
index de0d500ca9cd..3790dc9561d2 100644
--- a/packages/jest-types/src/Global.ts
+++ b/packages/jest-types/src/Global.ts
@@ -16,8 +16,19 @@ export type BlockName = string;
 // TODO: Get rid of this at some point
 type JasmineType = {_DEFAULT_TIMEOUT_INTERVAL?: number; addMatchers: Function};
 
-// TODO Replace with actual type when `jest-each` is ready
-type Each = () => void;
+export type Col = unknown;
+export type Row = Array<Col>;
+export type Table = Array<Row>;
+export type ArrayTable = Table | Row;
+export type TemplateTable = TemplateStringsArray;
+export type TemplateData = Array<unknown>;
+export type EachTable = ArrayTable | TemplateTable;
+export type EachTestFn = (...args: any[]) => Promise<any> | void | undefined;
+
+type Each = (
+  table: EachTable,
+  ...taggedTemplateData: Array<unknown>
+) => (title: string, test: EachTestFn, timeout?: number) => void;
 
 export interface ItBase {
   (testName: TestName, fn: TestFn, timeout?: number): void;

From deac6c25e7e42641f21d67dd711ec8c6138aa842 Mon Sep 17 00:00:00 2001
From: Matt Phillips <matt@mattphillips.io>
Date: Fri, 1 Mar 2019 19:37:16 +0000
Subject: [PATCH 11/16] Fix validation errors

---
 packages/jest-each/src/bind.ts       |  2 +-
 packages/jest-each/src/validation.ts | 46 +++++++++++++++++-----------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
index a026a023384f..0e84f6a42e0e 100644
--- a/packages/jest-each/src/bind.ts
+++ b/packages/jest-each/src/bind.ts
@@ -45,7 +45,7 @@ export default (cb: GlobalCallback, supportsDone: boolean = true) => (
         ),
       );
     } catch (e) {
-      const error = new ErrorWithStack(e, eachBind);
+      const error = new ErrorWithStack(e.message, eachBind);
       return cb(title, () => {
         throw error;
       });
diff --git a/packages/jest-each/src/validation.ts b/packages/jest-each/src/validation.ts
index d8019752836b..0607ca885dc4 100644
--- a/packages/jest-each/src/validation.ts
+++ b/packages/jest-each/src/validation.ts
@@ -7,23 +7,31 @@ const RECEIVED_COLOR = chalk.red;
 
 export const validateArrayTable = (table: any) => {
   if (!Array.isArray(table)) {
-    throw '`.each` must be called with an Array or Tagged Template Literal.\n\n' +
-      `Instead was called with: ${pretty(table, {
-        maxDepth: 1,
-        min: true,
-      })}\n`;
+    throw new Error(
+      '`.each` must be called with an Array or Tagged Template Literal.\n\n' +
+        `Instead was called with: ${pretty(table, {
+          maxDepth: 1,
+          min: true,
+        })}\n`,
+    );
   }
 
   if (isTaggedTemplateLiteral(table)) {
     if (isEmptyString(table[0])) {
-      throw 'Error: `.each` called with an empty Tagged Template Literal of table data.\n';
+      throw new Error(
+        'Error: `.each` called with an empty Tagged Template Literal of table data.\n',
+      );
     }
 
-    throw 'Error: `.each` called with a Tagged Template Literal with no data, remember to interpolate with ${expression} syntax.\n';
+    throw new Error(
+      'Error: `.each` called with a Tagged Template Literal with no data, remember to interpolate with ${expression} syntax.\n',
+    );
   }
 
   if (isEmptyTable(table)) {
-    throw 'Error: `.each` called with an empty Array of table data.\n';
+    throw new Error(
+      'Error: `.each` called with an empty Array of table data.\n',
+    );
   }
 };
 
@@ -39,16 +47,18 @@ export const validateTemplateTableHeadings = (
   const missingData = data.length % headings.length;
 
   if (missingData > 0) {
-    throw 'Not enough arguments supplied for given headings:\n' +
-      EXPECTED_COLOR(headings.join(' | ')) +
-      '\n\n' +
-      'Received:\n' +
-      RECEIVED_COLOR(pretty(data)) +
-      '\n\n' +
-      `Missing ${RECEIVED_COLOR(missingData.toString())} ${pluralize(
-        'argument',
-        missingData,
-      )}`;
+    throw new Error(
+      'Not enough arguments supplied for given headings:\n' +
+        EXPECTED_COLOR(headings.join(' | ')) +
+        '\n\n' +
+        'Received:\n' +
+        RECEIVED_COLOR(pretty(data)) +
+        '\n\n' +
+        `Missing ${RECEIVED_COLOR(missingData.toString())} ${pluralize(
+          'argument',
+          missingData,
+        )}`,
+    );
   }
 };
 

From cff2dfa16ed9dfdcb304cdd516ffd5f4d4229b15 Mon Sep 17 00:00:00 2001
From: Matt Phillips <matt@mattphillips.io>
Date: Fri, 1 Mar 2019 19:37:24 +0000
Subject: [PATCH 12/16] Fix global imports

---
 packages/jest-each/src/bind.ts           | 36 +++++++++++-------------
 packages/jest-each/src/index.ts          | 22 +++++++++------
 packages/jest-each/src/table/array.ts    | 21 +++++++++-----
 packages/jest-each/src/table/template.ts | 15 +++++++---
 packages/jest-types/src/Global.ts        |  4 ++-
 5 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
index 0e84f6a42e0e..25581c241b16 100644
--- a/packages/jest-each/src/bind.ts
+++ b/packages/jest-each/src/bind.ts
@@ -6,13 +6,7 @@
  *
  */
 
-import {
-  DoneFn,
-  EachTable,
-  TemplateData,
-  EachTestFn,
-  ArrayTable,
-} from '@jest/types/build/Global';
+import {Global} from '@jest/types/';
 import {ErrorWithStack} from 'jest-util';
 
 import convertArrayTable from './table/array';
@@ -24,14 +18,18 @@ export type EachTests = Array<{
   arguments: Array<unknown>;
 }>;
 
-type TestFn = (done?: DoneFn) => Promise<any> | void | undefined;
+type TestFn = (done?: Global.DoneFn) => Promise<any> | void | undefined;
 type GlobalCallback = (testName: string, fn: TestFn, timeout?: number) => void;
 
 export default (cb: GlobalCallback, supportsDone: boolean = true) => (
-  table: EachTable,
-  ...taggedTemplateData: TemplateData
+  table: Global.EachTable,
+  ...taggedTemplateData: Global.TemplateData
 ) =>
-  function eachBind(title: string, test: EachTestFn, timeout?: number): void {
+  function eachBind(
+    title: string,
+    test: Global.EachTestFn,
+    timeout?: number,
+  ): void {
     try {
       const tests = isArrayTable(taggedTemplateData)
         ? buildArrayTests(title, table)
@@ -52,17 +50,17 @@ export default (cb: GlobalCallback, supportsDone: boolean = true) => (
     }
   };
 
-const isArrayTable = (data: TemplateData) => data.length === 0;
+const isArrayTable = (data: Global.TemplateData) => data.length === 0;
 
-const buildArrayTests = (title: string, table: EachTable): EachTests => {
+const buildArrayTests = (title: string, table: Global.EachTable): EachTests => {
   validateArrayTable(table);
-  return convertArrayTable(title, table as ArrayTable);
+  return convertArrayTable(title, table as Global.ArrayTable);
 };
 
 const buildTemplateTests = (
   title: string,
-  table: EachTable,
-  taggedTemplateData: TemplateData,
+  table: Global.EachTable,
+  taggedTemplateData: Global.TemplateData,
 ): EachTests => {
   const headings = getHeadingKeys(table[0] as string);
   validateTemplateTableHeadings(headings, taggedTemplateData);
@@ -75,8 +73,8 @@ const getHeadingKeys = (headings: string): Array<string> =>
 const applyArguments = (
   supportsDone: boolean,
   params: Array<unknown>,
-  test: EachTestFn,
-): EachTestFn =>
+  test: Global.EachTestFn,
+): Global.EachTestFn =>
   supportsDone && params.length < test.length
-    ? (done: DoneFn) => test(...params, done)
+    ? (done: Global.DoneFn) => test(...params, done)
     : () => test(...params);
diff --git a/packages/jest-each/src/index.ts b/packages/jest-each/src/index.ts
index 910ba8322189..82b04f4a5737 100644
--- a/packages/jest-each/src/index.ts
+++ b/packages/jest-each/src/index.ts
@@ -6,18 +6,22 @@
  *
  */
 
-import {TestFn, EachTable, TemplateData} from '@jest/types/build/Global';
+import {Global} from '@jest/types';
 import bind from './bind';
 
 type Global = NodeJS.Global;
 
-const install = (g: Global, table: EachTable, ...data: TemplateData) => {
-  const test = (title: string, test: TestFn, timeout?: number) =>
+const install = (
+  g: Global,
+  table: Global.EachTable,
+  ...data: Global.TemplateData
+) => {
+  const test = (title: string, test: Global.TestFn, timeout?: number) =>
     bind(g.test)(table, ...data)(title, test, timeout);
   test.skip = bind(g.test.skip)(table, ...data);
   test.only = bind(g.test.only)(table, ...data);
 
-  const it = (title: string, test: TestFn, timeout?: number) =>
+  const it = (title: string, test: Global.TestFn, timeout?: number) =>
     bind(g.it)(table, ...data)(title, test, timeout);
   it.skip = bind(g.it.skip)(table, ...data);
   it.only = bind(g.it.only)(table, ...data);
@@ -26,7 +30,7 @@ const install = (g: Global, table: EachTable, ...data: TemplateData) => {
   const fit = bind(g.fit)(table, ...data);
   const xtest = bind(g.xtest)(table, ...data);
 
-  const describe = (title: string, suite: TestFn, timeout?: number) =>
+  const describe = (title: string, suite: Global.TestFn, timeout?: number) =>
     bind(g.describe, false)(table, ...data)(title, suite, timeout);
   describe.skip = bind(g.describe.skip, false)(table, ...data);
   describe.only = bind(g.describe.only, false)(table, ...data);
@@ -36,11 +40,13 @@ const install = (g: Global, table: EachTable, ...data: TemplateData) => {
   return {describe, fdescribe, fit, it, test, xdescribe, xit, xtest};
 };
 
-const each = (table: EachTable, ...data: TemplateData) =>
+const each = (table: Global.EachTable, ...data: Global.TemplateData) =>
   install(global, table, ...data);
 
-each.withGlobal = (g: Global) => (table: EachTable, ...data: TemplateData) =>
-  install(g, table, ...data);
+each.withGlobal = (g: Global) => (
+  table: Global.EachTable,
+  ...data: Global.TemplateData
+) => install(g, table, ...data);
 
 export {bind};
 
diff --git a/packages/jest-each/src/table/array.ts b/packages/jest-each/src/table/array.ts
index 4729c8a62d17..c8cf7817543d 100644
--- a/packages/jest-each/src/table/array.ts
+++ b/packages/jest-each/src/table/array.ts
@@ -1,27 +1,34 @@
 import util from 'util';
 import pretty from 'pretty-format';
 
-import {ArrayTable, Table, Row, Col} from '@jest/types/build/Global';
+import {Global} from '@jest/types';
 import {EachTests} from '../bind';
 
 const SUPPORTED_PLACEHOLDERS = /%[sdifjoOp%]/g;
 const PRETTY_PLACEHOLDER = '%p';
 const INDEX_PLACEHOLDER = '%#';
 
-export default (title: string, arrayTable: ArrayTable): EachTests =>
+export default (title: string, arrayTable: Global.ArrayTable): EachTests =>
   normaliseTable(arrayTable).map((row, index) => ({
     title: formatTitle(title, row, index),
     arguments: row,
   }));
 
-const normaliseTable = (table: ArrayTable): Table =>
-  isTable(table) ? (table as Table) : (table as Row).map(colToRow);
+const normaliseTable = (table: Global.ArrayTable): Global.Table =>
+  isTable(table)
+    ? (table as Global.Table)
+    : (table as Global.Row).map(colToRow);
 
-const isTable = (table: ArrayTable): boolean => table.every(Array.isArray);
+const isTable = (table: Global.ArrayTable): boolean =>
+  table.every(Array.isArray);
 
-const colToRow = (col: Col): Row => [col];
+const colToRow = (col: Global.Col): Global.Row => [col];
 
-const formatTitle = (title: string, row: Row, rowIndex: number): string =>
+const formatTitle = (
+  title: string,
+  row: Global.Row,
+  rowIndex: number,
+): string =>
   row.reduce<string>((formattedTitle, value) => {
     const [placeholder] = getMatchingPlaceholders(formattedTitle);
     if (!placeholder) return formattedTitle;
diff --git a/packages/jest-each/src/table/template.ts b/packages/jest-each/src/table/template.ts
index 65e2d6e39cd5..f7a8ea3d96f6 100644
--- a/packages/jest-each/src/table/template.ts
+++ b/packages/jest-each/src/table/template.ts
@@ -1,13 +1,17 @@
 import pretty from 'pretty-format';
 import {isPrimitive} from 'jest-get-type';
-import {Row, Table} from '@jest/types/build/Global';
+import {Global} from '@jest/types';
 import {EachTests} from '../bind';
 
 type Template = {[key: string]: unknown};
 type Templates = Array<Template>;
 type Headings = Array<string>;
 
-export default (title: string, headings: Headings, row: Row): EachTests => {
+export default (
+  title: string,
+  headings: Headings,
+  row: Global.Row,
+): EachTests => {
   const table = convertRowToTable(row, headings);
   const templates = convertTableToTemplates(table, headings);
   return templates.map(template => ({
@@ -16,7 +20,7 @@ export default (title: string, headings: Headings, row: Row): EachTests => {
   }));
 };
 
-const convertRowToTable = (row: Row, headings: Headings): Table =>
+const convertRowToTable = (row: Global.Row, headings: Headings): Global.Table =>
   Array.from({length: row.length / headings.length}).map((_, index) =>
     row.slice(
       index * headings.length,
@@ -24,7 +28,10 @@ const convertRowToTable = (row: Row, headings: Headings): Table =>
     ),
   );
 
-const convertTableToTemplates = (table: Table, headings: Headings): Templates =>
+const convertTableToTemplates = (
+  table: Global.Table,
+  headings: Headings,
+): Templates =>
   table.map(row =>
     row.reduce<Template>(
       (acc, value, index) => Object.assign(acc, {[headings[index]]: value}),
diff --git a/packages/jest-types/src/Global.ts b/packages/jest-types/src/Global.ts
index 3790dc9561d2..cbd99274247a 100644
--- a/packages/jest-types/src/Global.ts
+++ b/packages/jest-types/src/Global.ts
@@ -23,7 +23,9 @@ export type ArrayTable = Table | Row;
 export type TemplateTable = TemplateStringsArray;
 export type TemplateData = Array<unknown>;
 export type EachTable = ArrayTable | TemplateTable;
-export type EachTestFn = (...args: any[]) => Promise<any> | void | undefined;
+export type EachTestFn = (
+  ...args: Array<any>
+) => Promise<any> | void | undefined;
 
 type Each = (
   table: EachTable,

From ca3ca230fd3c6a488f890a95172a40a2d438decb Mon Sep 17 00:00:00 2001
From: Matt Phillips <matt@mattphillips.io>
Date: Fri, 1 Mar 2019 19:45:19 +0000
Subject: [PATCH 13/16] Fix more linting

---
 packages/jest-each/src/table/array.ts    | 10 +++++++++-
 packages/jest-each/src/table/template.ts | 10 +++++++++-
 packages/jest-each/src/validation.ts     |  8 ++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/packages/jest-each/src/table/array.ts b/packages/jest-each/src/table/array.ts
index c8cf7817543d..f2d58927294e 100644
--- a/packages/jest-each/src/table/array.ts
+++ b/packages/jest-each/src/table/array.ts
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
 import util from 'util';
 import pretty from 'pretty-format';
 
@@ -10,8 +18,8 @@ const INDEX_PLACEHOLDER = '%#';
 
 export default (title: string, arrayTable: Global.ArrayTable): EachTests =>
   normaliseTable(arrayTable).map((row, index) => ({
-    title: formatTitle(title, row, index),
     arguments: row,
+    title: formatTitle(title, row, index),
   }));
 
 const normaliseTable = (table: Global.ArrayTable): Global.Table =>
diff --git a/packages/jest-each/src/table/template.ts b/packages/jest-each/src/table/template.ts
index f7a8ea3d96f6..a618f163bd43 100644
--- a/packages/jest-each/src/table/template.ts
+++ b/packages/jest-each/src/table/template.ts
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
 import pretty from 'pretty-format';
 import {isPrimitive} from 'jest-get-type';
 import {Global} from '@jest/types';
@@ -15,8 +23,8 @@ export default (
   const table = convertRowToTable(row, headings);
   const templates = convertTableToTemplates(table, headings);
   return templates.map(template => ({
-    title: interpolate(title, template),
     arguments: [template],
+    title: interpolate(title, template),
   }));
 };
 
diff --git a/packages/jest-each/src/validation.ts b/packages/jest-each/src/validation.ts
index 0607ca885dc4..abc865db7d44 100644
--- a/packages/jest-each/src/validation.ts
+++ b/packages/jest-each/src/validation.ts
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
 import chalk from 'chalk';
 import pretty from 'pretty-format';
 import {TemplateData} from '@jest/types/build/Global';

From 92c5791a70a087a6e6e59a6f93ff3b1c33fe4999 Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Fri, 1 Mar 2019 23:30:41 +0000
Subject: [PATCH 14/16] Fix TemplateData import

Co-Authored-By: mattphillips <matt@mattphillips.io>
---
 packages/jest-each/src/validation.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/jest-each/src/validation.ts b/packages/jest-each/src/validation.ts
index abc865db7d44..d56133e34526 100644
--- a/packages/jest-each/src/validation.ts
+++ b/packages/jest-each/src/validation.ts
@@ -8,7 +8,9 @@
 
 import chalk from 'chalk';
 import pretty from 'pretty-format';
-import {TemplateData} from '@jest/types/build/Global';
+import {Global} from '@jest/types';
+
+type TemplateData = Global.TemplateData;
 
 const EXPECTED_COLOR = chalk.green;
 const RECEIVED_COLOR = chalk.red;

From b971088af2597e750355bf1c783f464790f05a16 Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Fri, 1 Mar 2019 23:30:56 +0000
Subject: [PATCH 15/16] Fix Global import

Co-Authored-By: mattphillips <matt@mattphillips.io>
---
 packages/jest-each/src/bind.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
index 25581c241b16..c32542e9ea41 100644
--- a/packages/jest-each/src/bind.ts
+++ b/packages/jest-each/src/bind.ts
@@ -6,7 +6,7 @@
  *
  */
 
-import {Global} from '@jest/types/';
+import {Global} from '@jest/types';
 import {ErrorWithStack} from 'jest-util';
 
 import convertArrayTable from './table/array';

From 9621918c9649d22bbef3d27f3cd4260710dd4d9b Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Sat, 2 Mar 2019 01:47:31 +0100
Subject: [PATCH 16/16] remove type cast, prefer type guard

---
 packages/jest-each/src/table/array.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/jest-each/src/table/array.ts b/packages/jest-each/src/table/array.ts
index f2d58927294e..de9be8c0c57b 100644
--- a/packages/jest-each/src/table/array.ts
+++ b/packages/jest-each/src/table/array.ts
@@ -23,11 +23,9 @@ export default (title: string, arrayTable: Global.ArrayTable): EachTests =>
   }));
 
 const normaliseTable = (table: Global.ArrayTable): Global.Table =>
-  isTable(table)
-    ? (table as Global.Table)
-    : (table as Global.Row).map(colToRow);
+  isTable(table) ? table : table.map(colToRow);
 
-const isTable = (table: Global.ArrayTable): boolean =>
+const isTable = (table: Global.ArrayTable): table is Global.Table =>
   table.every(Array.isArray);
 
 const colToRow = (col: Global.Col): Global.Row => [col];