cleaned up assertions and removed flattenNodes.

microsoft · rbuckton · Mar 18, 2016 · Feb 4, 2016 · Feb 4, 2016 · Feb 4, 2016
commit 94018a13e6900981ece892727e35f20a9f19d88d
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -1035,7 +1035,12 @@ namespace ts {
     }
 
     export namespace Debug {
-        const currentAssertionLevel = AssertionLevel.None;
+        declare var process: any;
+        declare var require: any;
+
+        const currentAssertionLevel = getDevelopmentMode() === "development"
+            ? AssertionLevel.Normal
+            : AssertionLevel.None;
 
         export function shouldAssert(level: AssertionLevel): boolean {
             return currentAssertionLevel >= level;
@@ -1055,6 +1060,17 @@ namespace ts {
         export function fail(message?: string): void {
             Debug.assert(/*expression*/ false, message);
         }
+
+        function getDevelopmentMode() {
+            return typeof require !== "undefined"
+                && typeof process !== "undefined"
+                && !process.browser
+                && process.nextTick
+                && process.env
+                && process.env.NODE_ENV
+                    ? String(process.env.NODE_ENV).toLowerCase()
+                    : undefined;
+        }
     }
 
     export function copyListRemovingItem<T>(item: T, list: T[]) {

diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
@@ -16,7 +16,7 @@ namespace ts {
         node: BinaryExpression,
         needsValue: boolean,
         recordTempVariable: (node: Identifier) => void,
-        visitor?: (node: Node) => OneOrMany<Node>) {
+        visitor?: (node: Node) => VisitResult<Node>) {
 
         if (isEmptyObjectLiteralOrArrayLiteral(node.left)) {
             return node.right;
@@ -79,7 +79,7 @@ namespace ts {
      * @param value The rhs value for the binding pattern.
      * @param visitor An optional visitor to use to visit expressions.
      */
-    export function flattenParameterDestructuring(node: ParameterDeclaration, value: Expression, visitor?: (node: Node) => OneOrMany<Node>) {
+    export function flattenParameterDestructuring(node: ParameterDeclaration, value: Expression, visitor?: (node: Node) => VisitResult<Node>) {
         const declarations: VariableDeclaration[] = [];
 
         flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
@@ -110,7 +110,7 @@ namespace ts {
      * @param value An optional rhs value for the binding pattern.
      * @param visitor An optional visitor to use to visit expressions.
      */
-    export function flattenVariableDestructuring(node: VariableDeclaration, value?: Expression, visitor?: (node: Node) => OneOrMany<Node>) {
+    export function flattenVariableDestructuring(node: VariableDeclaration, value?: Expression, visitor?: (node: Node) => VisitResult<Node>) {
         const declarations: VariableDeclaration[] = [];
 
         flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
@@ -151,7 +151,7 @@ namespace ts {
         node: VariableDeclaration,
         recordTempVariable: (name: Identifier) => void,
         nameSubstitution?: (name: Identifier) => Expression,
-        visitor?: (node: Node) => OneOrMany<Node>) {
+        visitor?: (node: Node) => VisitResult<Node>) {
 
         const pendingAssignments: Expression[] = [];
 
@@ -191,7 +191,7 @@ namespace ts {
         location: TextRange,
         emitAssignment: (name: Identifier, value: Expression, location: TextRange, original: Node) => void,
         emitTempVariableAssignment: (value: Expression, location: TextRange) => Identifier,
-        visitor?: (node: Node) => OneOrMany<Node>) {
+        visitor?: (node: Node) => VisitResult<Node>) {
         if (value && visitor) {
             value = visitNode(value, visitor, isExpression);
         }

diff --git a/src/compiler/transformers/es6.ts b/src/compiler/transformers/es6.ts
@@ -55,7 +55,7 @@ namespace ts {
             return visitEachChild(node, visitor, context);
         }
 
-        function visitor(node: Node): OneOrMany<Node> {
+        function visitor(node: Node): VisitResult<Node> {
             const savedContainingNonArrowFunction = containingNonArrowFunction;
             const savedCurrentParent = currentParent;
             const savedCurrentNode = currentNode;
@@ -74,7 +74,7 @@ namespace ts {
             return visited;
         }
 
-        function visitorWorker(node: Node): OneOrMany<Node> {
+        function visitorWorker(node: Node): VisitResult<Node> {
             if (node.transformFlags & TransformFlags.ES6) {
                 return visitJavaScript(node);
             }
@@ -86,7 +86,7 @@ namespace ts {
             }
         }
 
-        function visitJavaScript(node: Node): OneOrMany<Node> {
+        function visitJavaScript(node: Node): VisitResult<Node> {
             switch (node.kind) {
                 case SyntaxKind.ClassDeclaration:
                     return visitClassDeclaration(<ClassDeclaration>node);
@@ -174,9 +174,12 @@ namespace ts {
 
                 case SyntaxKind.SourceFile:
                     return visitSourceFileNode(<SourceFile>node);
+
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return visitEachChild(node, visitor, context);
             }
 
-            Debug.fail(`Unexpected node kind: ${formatSyntaxKind(node.kind)}.`);
         }
 
         function onBeforeVisitNode(node: Node) {
@@ -695,7 +698,7 @@ namespace ts {
                         break;
 
                     default:
-                        Debug.fail(`Unexpected node kind: ${formatSyntaxKind(node.kind)}.`);
+                        Debug.failBadSyntaxKind(node);
                         break;
                 }
             }
@@ -936,7 +939,7 @@ namespace ts {
             enableSubstitutionsForBlockScopedBindings();
             return setOriginalNode(
                 createVariableDeclarationList(
-                    flattenNodes(map(node.declarations, visitVariableDeclarationInLetDeclarationList)),
+                    flatten(map(node.declarations, visitVariableDeclarationInLetDeclarationList)),
                     /*location*/ node
                 ),
                 node
@@ -1043,7 +1046,7 @@ namespace ts {
          *
          * @param node A VariableDeclaration node.
          */
-        function visitVariableDeclaration(node: VariableDeclaration): OneOrMany<VariableDeclaration> {
+        function visitVariableDeclaration(node: VariableDeclaration): VisitResult<VariableDeclaration> {
             // If we are here it is because the name contains a binding pattern.
             Debug.assert(isBindingPattern(node.name));
 
@@ -1293,7 +1296,7 @@ namespace ts {
                         break;
 
                     default:
-                        Debug.fail(`Unexpected node kind: ${formatSyntaxKind(node.kind)}.`);
+                        Debug.failBadSyntaxKind(node);
                         break;
                 }
             }

diff --git a/src/compiler/transformers/es7.ts b/src/compiler/transformers/es7.ts
@@ -12,7 +12,7 @@ namespace ts {
             return visitEachChild(node, visitor, context);
         }
 
-        function visitor(node: Node): OneOrMany<Node> {
+        function visitor(node: Node): VisitResult<Node> {
             if (node.transformFlags & TransformFlags.ES7) {
                 return visitorWorker(node);
             }
@@ -24,13 +24,15 @@ namespace ts {
             }
         }
 
-        function visitorWorker(node: Node): OneOrMany<Node> {
+        function visitorWorker(node: Node): VisitResult<Node> {
             switch (node.kind) {
                 case SyntaxKind.BinaryExpression:
                     return visitBinaryExpression(<BinaryExpression>node);
-            }
 
-            Debug.fail(`Unexpected node kind: ${formatSyntaxKind(node.kind)}.`);
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return visitEachChild(node, visitor, context);
+            }
         }
 
         function visitBinaryExpression(node: BinaryExpression): Expression {
@@ -90,7 +92,8 @@ namespace ts {
                 return createMathPow(left, right, /*location*/ node);
             }
             else {
-                Debug.fail(`Unexpected operator kind: ${formatSyntaxKind(node.operatorToken.kind)}.`);
+                Debug.failBadSyntaxKind(node);
+                return visitEachChild(node, visitor, context);
             }
         }
     }

diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts
@@ -18,7 +18,7 @@ namespace ts {
             return visitEachChild(node, visitor, context);
         }
 
-        function visitor(node: Node): OneOrMany<Node> {
+        function visitor(node: Node): VisitResult<Node> {
             if (node.transformFlags & TransformFlags.Jsx) {
                 return visitorWorker(node);
             }
@@ -30,16 +30,18 @@ namespace ts {
             }
         }
 
-        function visitorWorker(node: Node): OneOrMany<Node> {
+        function visitorWorker(node: Node): VisitResult<Node> {
             switch (node.kind) {
                 case SyntaxKind.JsxElement:
                     return visitJsxElement(<JsxElement>node);
 
                 case SyntaxKind.JsxSelfClosingElement:
                     return visitJsxSelfClosingElement(<JsxSelfClosingElement>node);
-            }
 
-            Debug.fail(`Unexpected node kind: ${formatSyntaxKind(node.kind)}.`);
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return undefined;
+            }
         }
 
         function transformJsxChildToExpression(node: JsxChild): Expression {
@@ -55,9 +57,11 @@ namespace ts {
 
                 case SyntaxKind.JsxSelfClosingElement:
                     return visitJsxSelfClosingElement(<JsxSelfClosingElement>node);
-            }
 
-            Debug.fail(`Unexpected node kind: ${formatSyntaxKind(node.kind)}.`);
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return undefined;
+            }
         }
 
         function visitJsxElement(node: JsxElement) {

diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
@@ -123,7 +123,7 @@ namespace ts {
                 createStatement(
                     createCall(
                         define,
-                        flattenNodes([
+                        flatten([
                             // Add the module name (if provided).
                             moduleName,
 
@@ -142,7 +142,7 @@ namespace ts {
                                 setNodeEmitFlags(
                                     setMultiLine(
                                         createBlock(
-                                            flattenNodes([
+                                            flatten([
                                                 // Visit each statement of the module body.
                                                 ...visitNodes(node.statements, visitor, isStatement),
 
@@ -173,7 +173,7 @@ namespace ts {
          *
          * @param node The node.
          */
-        function visitor(node: Node): OneOrMany<Node> {
+        function visitor(node: Node): VisitResult<Node> {
             switch (node.kind) {
                 case SyntaxKind.ImportDeclaration:
                     return visitImportDeclaration(<ImportDeclaration>node);
@@ -208,7 +208,7 @@ namespace ts {
          *
          * @param node The ImportDeclaration node.
          */
-        function visitImportDeclaration(node: ImportDeclaration): OneOrMany<Statement> {
+        function visitImportDeclaration(node: ImportDeclaration): VisitResult<Statement> {
             if (contains(externalImports, node)) {
                 const statements: Statement[] = [];
                 const namespaceDeclaration = getNamespaceDeclarationNode(node);
@@ -287,7 +287,7 @@ namespace ts {
             return undefined;
         }
 
-        function visitImportEqualsDeclaration(node: ImportEqualsDeclaration): OneOrMany<Statement> {
+        function visitImportEqualsDeclaration(node: ImportEqualsDeclaration): VisitResult<Statement> {
             if (contains(externalImports, node)) {
                 const statements: Statement[] = [];
                 if (moduleKind !== ModuleKind.AMD) {
@@ -335,7 +335,7 @@ namespace ts {
             return undefined;
         }
 
-        function visitExportDeclaration(node: ExportDeclaration): OneOrMany<Statement> {
+        function visitExportDeclaration(node: ExportDeclaration): VisitResult<Statement> {
             if (contains(externalImports, node)) {
                 const generatedName = getGeneratedNameForNode(node);
                 if (node.exportClause) {
@@ -391,7 +391,7 @@ namespace ts {
             return undefined;
         }
 
-        function visitExportAssignment(node: ExportAssignment): OneOrMany<Statement> {
+        function visitExportAssignment(node: ExportAssignment): VisitResult<Statement> {
             if (!node.isExportEquals && resolver.isValueAliasDeclaration(node)) {
                 const statements: Statement[] = [];
                 addExportDefault(statements, node.expression, /*location*/ node);
@@ -470,7 +470,7 @@ namespace ts {
             }
         }
 
-        function visitVariableStatement(node: VariableStatement): OneOrMany<Statement> {
+        function visitVariableStatement(node: VariableStatement): VisitResult<Statement> {
             const variables = getInitializedVariables(node.declarationList);
             if (variables.length === 0) {
                 // elide statement if there are no initialized variables
@@ -502,7 +502,7 @@ namespace ts {
             }
         }
 
-        function visitFunctionDeclaration(node: FunctionDeclaration): OneOrMany<Statement> {
+        function visitFunctionDeclaration(node: FunctionDeclaration): VisitResult<Statement> {
             const statements: Statement[] = [];
             if (node.name) {
                 if (hasModifier(node, ModifierFlags.Export)) {
@@ -543,7 +543,7 @@ namespace ts {
             return statements;
         }
 
-        function visitClassDeclaration(node: ClassDeclaration): OneOrMany<Statement> {
+        function visitClassDeclaration(node: ClassDeclaration): VisitResult<Statement> {
             const statements: Statement[] = [];
             if (node.name) {
                 if (hasModifier(node, ModifierFlags.Export)) {

diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
@@ -408,7 +408,7 @@ namespace ts {
             return createArrayLiteral(setters);
         }
 
-        function visitSourceElement(node: Node): OneOrMany<Node> {
+        function visitSourceElement(node: Node): VisitResult<Node> {
             switch (node.kind) {
                 case SyntaxKind.ImportDeclaration:
                     return visitImportDeclaration(<ImportDeclaration>node);
@@ -427,7 +427,7 @@ namespace ts {
             }
         }
 
-        function visitNestedNode(node: Node): OneOrMany<Node> {
+        function visitNestedNode(node: Node): VisitResult<Node> {
             switch (node.kind) {
                 case SyntaxKind.VariableStatement:
                     return visitVariableStatement(<VariableStatement>node);
@@ -502,7 +502,7 @@ namespace ts {
             return undefined;
         }
 
-        function visitExportDeclaration(node: ExportDeclaration): OneOrMany<Statement> {
+        function visitExportDeclaration(node: ExportDeclaration): VisitResult<Statement> {
             if (!node.moduleSpecifier) {
                 const statements: Statement[] = [];
                 addNodes(statements, map(node.exportClause.elements, visitExportSpecifier));
@@ -541,7 +541,7 @@ namespace ts {
          *
          * @param node The variable statement to visit.
          */
-        function visitVariableStatement(node: VariableStatement): OneOrMany<Statement> {
+        function visitVariableStatement(node: VariableStatement): VisitResult<Statement> {
             const isExported = hasModifier(node, ModifierFlags.Export);
             const expressions: Expression[] = [];
             for (const variable of node.declarationList.declarations) {
@@ -616,7 +616,7 @@ namespace ts {
          *
          * @param node The class declaration to visit.
          */
-        function visitClassDeclaration(node: ClassDeclaration): OneOrMany<Statement> {
+        function visitClassDeclaration(node: ClassDeclaration): VisitResult<Statement> {
             // Hoist the name of the class declaration to the outer module body function.
             const name = getDeclarationName(node);
             hoistVariableDeclaration(name);