[Finished] TypeScript conversion

src/Module.ts

@@ -34,6 +34,8 @@ import ImportNamespaceSpecifier from './ast/nodes/ImportNamespaceSpecifier';
 import { RollupWarning } from './rollup/index';
 import ExternalModule from './ExternalModule';
 import Import from './ast/nodes/Import';
+import TemplateLiteral from './ast/nodes/TemplateLiteral';
+import Literal from './ast/nodes/Literal';
 
 const setModuleDynamicImportsReturnBinding = wrapDynamicImportPlugin(acorn);
 
@@ -494,15 +496,15 @@ export default class Module {
 
 	processDynamicImports (resolveDynamicImport: ResolveDynamicImportHandler) {
 		return Promise.all(this.dynamicImports.map(node => {
-			const importArgument = node.parent.arguments[0];
+			const importArgument = <Node> node.parent.arguments[0];
 			let dynamicImportSpecifier: string | Node;
 			if (importArgument.type === 'TemplateLiteral') {
-				if (importArgument.expressions.length === 0 && importArgument.quasis.length === 1) {
-					dynamicImportSpecifier = importArgument.quasis[0].value.cooked;
+				if ((<TemplateLiteral> importArgument).expressions.length === 0 && (<TemplateLiteral> importArgument).quasis.length === 1) {
+					dynamicImportSpecifier = (<TemplateLiteral> importArgument).quasis[0].value.cooked;
 				}
 			} else if (importArgument.type === 'Literal') {
-				if (typeof importArgument.value === 'string') {
-					dynamicImportSpecifier = importArgument.value;
+				if (typeof (<Literal> importArgument).value === 'string') {
+					dynamicImportSpecifier = <string | Node>(<Literal> importArgument).value;
 				}
 			} else {
 				dynamicImportSpecifier = importArgument;

src/ast/ExecutionPathOptions.ts

@@ -84,7 +84,7 @@ export default class ExecutionPathOptions {
 	 * @param {Node} node
 	 * @return {ExecutionPathOptions}
 	 */
-	addAccessedNodeAtPath (path: string[], node: Node | UnknownAssignment) {
+	addAccessedNodeAtPath (path: ObjectPath, node: Node | UnknownAssignment) {
 		return this.setIn([OPTION_ACCESSED_NODES, node, ...path, RESULT_KEY], true);
 	}
 
@@ -93,7 +93,7 @@ export default class ExecutionPathOptions {
 	 * @param {CallExpression|Property} callExpression
 	 * @return {ExecutionPathOptions}
 	 */
-	addAccessedReturnExpressionAtPath (path: string[], callExpression: CallExpression | Property) {
+	addAccessedReturnExpressionAtPath (path: ObjectPath, callExpression: CallExpression | Property) {
 		return this.setIn(
 			[
 				OPTION_RETURN_EXPRESSIONS_ACCESSED_AT_PATH,
@@ -110,7 +110,7 @@ export default class ExecutionPathOptions {
 	 * @param {Node} node
 	 * @return {ExecutionPathOptions}
 	 */
-	addAssignedNodeAtPath (path: string[], node: Node | Variable) {
+	addAssignedNodeAtPath (path: ObjectPath, node: Node | Variable | UnknownAssignment) {
 		return this.setIn([OPTION_ASSIGNED_NODES, node, ...path, RESULT_KEY], true);
 	}
 
@@ -119,7 +119,7 @@ export default class ExecutionPathOptions {
 	 * @param {CallExpression|Property} callExpression
 	 * @return {ExecutionPathOptions}
 	 */
-	addAssignedReturnExpressionAtPath (path: string[], callExpression: CallExpression | Property) {
+	addAssignedReturnExpressionAtPath (path: ObjectPath, callExpression: CallExpression | Property) {
 		return this.setIn(
 			[
 				OPTION_RETURN_EXPRESSIONS_ASSIGNED_AT_PATH,
@@ -137,7 +137,7 @@ export default class ExecutionPathOptions {
 	 * @param {CallOptions} callOptions
 	 * @return {ExecutionPathOptions}
 	 */
-	addCalledNodeAtPathWithOptions (path: string[], node: Node | UnknownAssignment, callOptions: CallOptions) {
+	addCalledNodeAtPathWithOptions (path: ObjectPath, node: Node | UnknownAssignment, callOptions: CallOptions) {
 		return this.setIn(
 			[
 				OPTION_NODES_CALLED_AT_PATH_WITH_OPTIONS,
@@ -155,7 +155,7 @@ export default class ExecutionPathOptions {
 	 * @param {CallExpression|Property} callExpression
 	 * @return {ExecutionPathOptions}
 	 */
-	addCalledReturnExpressionAtPath (path: string[], callExpression: CallExpression | Property) {
+	addCalledReturnExpressionAtPath (path: ObjectPath, callExpression: CallExpression | Property) {
 		return this.setIn(
 			[
 				OPTION_RETURN_EXPRESSIONS_CALLED_AT_PATH,
@@ -196,7 +196,7 @@ export default class ExecutionPathOptions {
 	 * @param {Node} node
 	 * @return {boolean}
 	 */
-	hasNodeBeenAccessedAtPath (path: string[], node: Node | Variable | UnknownAssignment): boolean {
+	hasNodeBeenAccessedAtPath (path: ObjectPath, node: Node | Variable | UnknownAssignment): boolean {
 		return this._optionValues.getIn([
 			OPTION_ACCESSED_NODES,
 			node,

src/ast/Node.ts

@@ -11,8 +11,9 @@ import MagicString from 'magic-string';
 import CallOptions from './CallOptions';
 import Expression from './nodes/Expression';
 import Declaration from './nodes/Declaration';
+import { ObjectPath } from './variables/VariableReassignmentTracker';
 
-export type ForEachReturnExpressionCallback = (options: ExecutionPathOptions) => (node: Node) => void
+export type ForEachReturnExpressionCallback = (options: ExecutionPathOptions) => (node: Node | UnknownAssignment) => void
 
 export default class Node {
 	type: string;
@@ -51,7 +52,7 @@ export default class Node {
 	 * @param {String[]} _path
 	 * @param {ExecutionPathOptions} _options
 	 */
-	reassignPath (_path: string[], _options: ExecutionPathOptions) { }
+	reassignPath (_path: ObjectPath, _options: ExecutionPathOptions) { }
 
 	/**
 	 * Override to control on which children "bind" is called.
@@ -87,7 +88,7 @@ export default class Node {
 	 * @param {ExecutionPathOptions} _options
 	 */
 	forEachReturnExpressionWhenCalledAtPath (
-		_path: string[],
+		_path: ObjectPath,
 		_callOptions: CallOptions,
 		_callback: ForEachReturnExpressionCallback,
 		_options: ExecutionPathOptions
@@ -114,7 +115,7 @@ export default class Node {
 	 * @param {ExecutionPathOptions} _options
 	 * @return {boolean}
 	 */
-	hasEffectsWhenAccessedAtPath (path: string[], _options: ExecutionPathOptions) {
+	hasEffectsWhenAccessedAtPath (path: ObjectPath, _options: ExecutionPathOptions) {
 		return path.length > 0;
 	}
 
@@ -123,7 +124,7 @@ export default class Node {
 	 * @param {ExecutionPathOptions} _options
 	 * @return {boolean}
 	 */
-	hasEffectsWhenAssignedAtPath (_path: string[], _options: ExecutionPathOptions) {
+	hasEffectsWhenAssignedAtPath (_path: ObjectPath, _options: ExecutionPathOptions) {
 		return true;
 	}
 
@@ -133,7 +134,7 @@ export default class Node {
 	 * @param {ExecutionPathOptions} _options
 	 * @return {boolean}
 	 */
-	hasEffectsWhenCalledAtPath (_path: string[], _callOptions: CallOptions, _options: ExecutionPathOptions) {
+	hasEffectsWhenCalledAtPath (_path: ObjectPath, _callOptions: CallOptions, _options: ExecutionPathOptions) {
 		return true;
 	}
 
@@ -270,7 +271,7 @@ export default class Node {
 	 * @returns {boolean}
 	 */
 	someReturnExpressionWhenCalledAtPath (
-		_path: string[],
+		_path: ObjectPath,
 		_callOptions: CallOptions,
 		predicateFunction: (options: ExecutionPathOptions) => PredicateFunction,
 		options: ExecutionPathOptions

src/ast/nodes/ArrayExpression.ts

@@ -2,12 +2,13 @@ import Node from '../Node';
 import Expression from './Expression';
 import SpreadElement from './SpreadElement';
 import ExecutionPathOptions from '../ExecutionPathOptions';
+import { ObjectPath } from '../variables/VariableReassignmentTracker';
 
 export default class ArrayExpression extends Node {
 	type: 'ArrayExpression';
-	elements: (Expression | SpreadElement | null)[]
+	elements: (Expression | SpreadElement | null)[];
 
-	hasEffectsWhenAccessedAtPath (path: string[], _options: ExecutionPathOptions) {
+	hasEffectsWhenAccessedAtPath (path: ObjectPath, _options: ExecutionPathOptions) {
 		return path.length > 1;
 	}
 }

src/ast/nodes/ArrayPattern.ts

@@ -5,17 +5,18 @@ import ExecutionPathOptions from '../ExecutionPathOptions';
 import Pattern from './Pattern';
 import Expression from './Expression';
 import Declaration from './Declaration';
+import { ObjectPath } from '../variables/VariableReassignmentTracker';
 
 export default class ArrayPattern extends Node {
 	type: 'ArrayPattern';
 	elements: (Pattern | null)[];
 
-	reassignPath (path: string[], options: ExecutionPathOptions) {
+	reassignPath (path: ObjectPath, options: ExecutionPathOptions) {
 		path.length === 0 &&
 		this.eachChild(child => child.reassignPath([], options));
 	}
 
-	hasEffectsWhenAssignedAtPath (path: string[], options: ExecutionPathOptions) {
+	hasEffectsWhenAssignedAtPath (path: ObjectPath, options: ExecutionPathOptions) {
 		return (
 			path.length > 0 ||
 			this.someChild(child => child.hasEffectsWhenAssignedAtPath([], options))

src/ast/nodes/ArrowFunctionExpression.ts

@@ -7,6 +7,7 @@ import Expression from './Expression';
 import CallOptions from '../CallOptions';
 import ExecutionPathOptions from '../ExecutionPathOptions';
 import { PredicateFunction } from '../values';
+import { ObjectPath } from '../variables/VariableReassignmentTracker';
 
 export default class ArrowFunctionExpression extends Node {
 	type: 'ArrowFunctionExpression';
@@ -21,7 +22,7 @@ export default class ArrowFunctionExpression extends Node {
 	}
 
 	forEachReturnExpressionWhenCalledAtPath (
-		path: string[],
+		path: ObjectPath,
 		callOptions: CallOptions,
 		callback: ForEachReturnExpressionCallback,
 		options: ExecutionPathOptions
@@ -34,15 +35,15 @@ export default class ArrowFunctionExpression extends Node {
 		return false;
 	}
 
-	hasEffectsWhenAccessedAtPath (path: string[], _options: ExecutionPathOptions) {
+	hasEffectsWhenAccessedAtPath (path: ObjectPath, _options: ExecutionPathOptions) {
 		return path.length > 1;
 	}
 
-	hasEffectsWhenAssignedAtPath (path: string[], _options: ExecutionPathOptions) {
+	hasEffectsWhenAssignedAtPath (path: ObjectPath, _options: ExecutionPathOptions) {
 		return path.length > 1;
 	}
 
-	hasEffectsWhenCalledAtPath (path: string[], _callOptions: CallOptions, options: ExecutionPathOptions): boolean {
+	hasEffectsWhenCalledAtPath (path: ObjectPath, _callOptions: CallOptions, options: ExecutionPathOptions): boolean {
 		if (path.length > 0) {
 			return true;
 		}
@@ -68,7 +69,7 @@ export default class ArrowFunctionExpression extends Node {
 	}
 
 	someReturnExpressionWhenCalledAtPath (
-		path: string[],
+		path: ObjectPath,
 		callOptions: CallOptions,
 		predicateFunction: (options: ExecutionPathOptions) => PredicateFunction,
 		options: ExecutionPathOptions

src/ast/nodes/AssignmentExpression.ts

@@ -3,6 +3,7 @@ import disallowIllegalReassignment from './shared/disallowIllegalReassignment';
 import ExecutionPathOptions from '../ExecutionPathOptions';
 import Pattern from './Pattern';
 import Expression from './Expression';
+import { ObjectPath } from '../variables/VariableReassignmentTracker';
 
 export default class AssignmentExpression extends Node {
 	type: 'AssignmentExpression';
@@ -21,7 +22,7 @@ export default class AssignmentExpression extends Node {
 		);
 	}
 
-	hasEffectsWhenAccessedAtPath (path: string[], options: ExecutionPathOptions): boolean {
+	hasEffectsWhenAccessedAtPath (path: ObjectPath, options: ExecutionPathOptions): boolean {
 		return (
 			path.length > 0 && this.right.hasEffectsWhenAccessedAtPath(path, options)
 		);

src/ast/nodes/AssignmentPattern.ts

@@ -5,6 +5,7 @@ import Expression from './Expression';
 import Scope from '../Scopes/Scope';
 import { UnknownAssignment } from '../values';
 import Declaration from './Declaration';
+import { ObjectPath } from '../variables/VariableReassignmentTracker';
 
 export default class AssignmentPattern extends Node {
 	type: 'AssignmentPattern';
@@ -15,11 +16,11 @@ export default class AssignmentPattern extends Node {
 		this.left.reassignPath([], ExecutionPathOptions.create());
 	}
 
-	reassignPath (path: string[], options: ExecutionPathOptions) {
+	reassignPath (path: ObjectPath, options: ExecutionPathOptions) {
 		path.length === 0 && this.left.reassignPath(path, options);
 	}
 
-	hasEffectsWhenAssignedAtPath (path: string[], options: ExecutionPathOptions): boolean {
+	hasEffectsWhenAssignedAtPath (path: ObjectPath, options: ExecutionPathOptions): boolean {
 		return (
 			path.length > 0 || this.left.hasEffectsWhenAssignedAtPath([], options)
 		);

src/ast/nodes/BinaryExpression.ts

@@ -2,8 +2,31 @@ import Node from '../Node';
 import { UNKNOWN_VALUE } from '../values';
 import Expression from './Expression';
 import ExecutionPathOptions from '../ExecutionPathOptions';
+import { ObjectPath } from '../variables/VariableReassignmentTracker';
 
-type BinaryOperator = '==' | '!=' | '===' | '!==' | '<' | '<=' | '>' | '>=' | '<<' | '>>' | '>>>' | '+' | '-' | '*' | '/' | '%' | ' |' | '^' | '&' | '**' | 'in' | 'instanceof';
+type BinaryOperator =
+	'=='
+	| '!='
+	| '==='
+	| '!=='
+	| '<'
+	| '<='
+	| '>'
+	| '>='
+	| '<<'
+	| '>>'
+	| '>>>'
+	| '+'
+	| '-'
+	| '*'
+	| '/'
+	| '%'
+	| ' |'
+	| '^'
+	| '&'
+	| '**'
+	| 'in'
+	| 'instanceof';
 
 const operators: {
 	[operator: string]: (left: any, right: any) => any
@@ -51,7 +74,7 @@ export default class BinaryExpression extends Node {
 		return operatorFn(leftValue, rightValue);
 	}
 
-	hasEffectsWhenAccessedAtPath (path: string[], _options: ExecutionPathOptions) {
+	hasEffectsWhenAccessedAtPath (path: ObjectPath, _options: ExecutionPathOptions) {
 		return path.length > 1;
 	}
 }

src/ast/nodes/CallExpression.ts

@@ -5,6 +5,7 @@ import ExecutionPathOptions from '../ExecutionPathOptions';
 import SpreadElement from './SpreadElement';
 import { PredicateFunction } from '../values';
 import GlobalVariable from '../variables/GlobalVariable';
+import { ObjectPath } from '../variables/VariableReassignmentTracker';
 
 // TODO: 3 typing failures because AwaitExpression has no forEachReturnExpressionWhenCalledAtPath
 
@@ -15,7 +16,7 @@ export default class CallExpression extends Node {
 
 	private _callOptions: CallOptions;
 
-	reassignPath (path: string[], options: ExecutionPathOptions) {
+	reassignPath (path: ObjectPath, options: ExecutionPathOptions) {
 		!options.hasReturnExpressionBeenAssignedAtPath(path, this) &&
 		this.callee.forEachReturnExpressionWhenCalledAtPath(
 			[],
@@ -58,7 +59,7 @@ export default class CallExpression extends Node {
 	}
 
 	forEachReturnExpressionWhenCalledAtPath (
-		path: string[],
+		path: ObjectPath,
 		callOptions: CallOptions,
 		callback: ForEachReturnExpressionCallback,
 		options: ExecutionPathOptions
@@ -88,7 +89,7 @@ export default class CallExpression extends Node {
 		);
 	}
 
-	hasEffectsWhenAccessedAtPath (path: string[], options: ExecutionPathOptions): boolean {
+	hasEffectsWhenAccessedAtPath (path: ObjectPath, options: ExecutionPathOptions): boolean {
 		return (
 			path.length > 0 &&
 			!options.hasReturnExpressionBeenAccessedAtPath(path, this) &&
@@ -105,7 +106,7 @@ export default class CallExpression extends Node {
 		);
 	}
 
-	hasEffectsWhenAssignedAtPath (path: string[], options: ExecutionPathOptions): boolean {
+	hasEffectsWhenAssignedAtPath (path: ObjectPath, options: ExecutionPathOptions): boolean {
 		return (
 			!options.hasReturnExpressionBeenAssignedAtPath(path, this) &&
 			this.callee.someReturnExpressionWhenCalledAtPath(
@@ -121,7 +122,7 @@ export default class CallExpression extends Node {
 		);
 	}
 
-	hasEffectsWhenCalledAtPath (path: string[], callOptions: CallOptions, options: ExecutionPathOptions): boolean {
+	hasEffectsWhenCalledAtPath (path: ObjectPath, callOptions: CallOptions, options: ExecutionPathOptions): boolean {
 		return (
 			!options.hasReturnExpressionBeenCalledAtPath(path, this) &&
 			this.callee.someReturnExpressionWhenCalledAtPath(
@@ -147,7 +148,7 @@ export default class CallExpression extends Node {
 	}
 
 	someReturnExpressionWhenCalledAtPath (
-		path: string[],
+		path: ObjectPath,
 		callOptions: CallOptions,
 		predicateFunction: (options: ExecutionPathOptions) => PredicateFunction,
 		options: ExecutionPathOptions

src/ast/nodes/ClassBody.ts

@@ -2,13 +2,14 @@ import Node from '../Node';
 import ExecutionPathOptions from '../ExecutionPathOptions';
 import CallOptions from '../CallOptions';
 import MethodDefinition from './MethodDefinition';
+import { ObjectPath } from '../variables/VariableReassignmentTracker';
 
 export default class ClassBody extends Node {
 	type: 'ClassBody';
 	body: MethodDefinition[];
 	classConstructor: MethodDefinition | null;
 
-	hasEffectsWhenCalledAtPath (path: string[], callOptions: CallOptions, options: ExecutionPathOptions) {
+	hasEffectsWhenCalledAtPath (path: ObjectPath, callOptions: CallOptions, options: ExecutionPathOptions) {
 		if (path.length > 0) {
 			return true;
 		}