Add type 'Macros', Move tests with macros below standard tests

Author: ChristianMurphy

types/base.d.ts

@@ -124,8 +124,9 @@ export interface Macro<I, E, T> {
 	(t: T, input: I, expected: E): void;
 	title? (providedTitle: string, input: I, expected: E): string;
 }
+export type Macros<I, E, T> = Macro<I, E, T> | Macro<I, E, T>[];
 
 export function test(name: string, run: ContextualTest): void;
 export function test(run: ContextualTest): void;
-export function test<I, E> (run: Macro<I, E, ContextualTestContext> | Macro<I, E, ContextualTestContext>[], input: I, expected: E): void;
-export function test<I, E> (name: string, run: Macro<I, E, ContextualTestContext> | Macro<I, E, ContextualTestContext>[], input: I, expected: E): void;
+export function test<I, E> (name: string, run: Macros<I, E, ContextualTestContext>, input: I, expected: E): void;
+export function test<I, E> (run: Macros<I, E, ContextualTestContext>, input: I, expected: E): void;

types/make.js

@@ -51,10 +51,10 @@ function generatePrefixed(prefix) {
 				output += '\t' + writeFunction(part, 'name: string', 'void');
 			} else {
 				const type = testType(parts);
-				output += '\t' + writeFunction(part + '<I, E>', 'implementation: Macro<I, E, ' + type + 'Context>, input: I, expected: E');
-				output += '\t' + writeFunction(part + '<I, E>', 'name: string, implementation: Macro<I, E, ' + type + 'Context>, input: I, expected: E');
 				output += '\t' + writeFunction(part, 'name: string, implementation: ' + type);
 				output += '\t' + writeFunction(part, 'implementation: ' + type);
+				output += '\t' + writeFunction(part + '<I, E>', 'name: string, implementation: Macros<I, E, ' + type + 'Context>, input: I, expected: E');
+				output += '\t' + writeFunction(part + '<I, E>', 'implementation: Macros<I, E, ' + type + 'Context>, input: I, expected: E');
 			}
 		}