Ensure that we continue recursing into TS transforms (microsoft#19650)

kriszyp · mhegazy · commit c557131cac43 · 2017-11-02T12:49:00.000-07:00
* Ensure that we continue recursing into TS transforms when avoiding export elliding for transformed nodes, fix microsoft#19649 * Use more precise fix
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
@@ -225,6 +225,13 @@ namespace ts {
             if (parsed !== node) {
                 // If the node has been transformed by a `before` transformer, perform no ellision on it
                 // As the type information we would attempt to lookup to perform ellision is potentially unavailable for the synthesized nodes
+                // We do not reuse `visitorWorker`, as the ellidable statement syntax kinds are technically unrecognized by the switch-case in `visitTypeScript`,
+                // and will trigger debug failures when debug verbosity is turned up
+                if (node.transformFlags & TransformFlags.ContainsTypeScript) {
+                    // This node contains TypeScript, so we should visit its children.
+                    return visitEachChild(node, visitor, context);
+                }
+                // Otherwise, we can just return the node
                 return node;
             }
             switch (node.kind) {
diff --git a/src/harness/unittests/transform.ts b/src/harness/unittests/transform.ts
@@ -20,6 +20,15 @@ namespace ts {
             };
             return (file: ts.SourceFile) => file;
         }
+        function replaceNumberWith2(context: ts.TransformationContext) {
+            function visitor(node: Node): Node {
+                if (isNumericLiteral(node)) {
+                    return createNumericLiteral("2");
+                }
+                return visitEachChild(node, visitor, context);
+            }
+            return (file: ts.SourceFile) => visitNode(file, visitor);
+        }
 
         function replaceIdentifiersNamedOldNameWithNewName(context: ts.TransformationContext) {
             const previousOnSubstituteNode = context.onSubstituteNode;
@@ -101,6 +110,20 @@ namespace ts {
                 }).outputText;
         });
 
+        testBaseline("transformTypesInExportDefault", () => {
+            return ts.transpileModule(`
+            export default (foo: string) => { return 1; }
+            `, {
+                    transformers: {
+                        before: [replaceNumberWith2],
+                    },
+                    compilerOptions: {
+                        target: ts.ScriptTarget.ESNext,
+                        newLine: NewLineKind.CarriageReturnLineFeed,
+                    }
+                }).outputText;
+        });
+
         testBaseline("synthesizedClassAndNamespaceCombination", () => {
             return ts.transpileModule("", {
                 transformers: {
diff --git a/tests/baselines/reference/transformApi/transformsCorrectly.transformTypesInExportDefault.js b/tests/baselines/reference/transformApi/transformsCorrectly.transformTypesInExportDefault.js
@@ -0,0 +1 @@
+export default (foo) => { return 2; };
