shermes: add --dump-transpiled-ast

Summary: I noticed that `--dump-ast` was outputting AST after TS-to-Flow transpilation, and also after IIFE wrapping. I found that to be confusing, since I expect "--dump-ast" to literally print what was parsed, before any transformations have been performed on it. Move the dumping of the parsed AST earlier in the code and add a new dumping stage `--dump-transpiled-ast`, which prints the AST after the optional early transpilation to Flow and IIFE wrapping. Reviewed By: avp Differential Revision: D52149761 fbshipit-source-id: 56a83e9c42e0286faa164f0bdefe94883eaf11da
facebook · Dec 15, 2023 · 40748fa · 40748fa
1 parent 5b803e4
commit 40748fa
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 7 deletions.
diff --git a/test/AST/script-mode.js b/test/AST/script-mode.js
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// RUN: %shermes -dump-ast -typed -script %s | %FileCheck --match-full-lines -check-prefix SM %s
-// RUN: %shermes -dump-ast -typed %s | %FileCheck --match-full-lines -check-prefix MM %s
+// RUN: %shermes -dump-transpiled-ast -typed -script %s | %FileCheck --match-full-lines -check-prefix SM %s
+// RUN: %shermes -dump-transpiled-ast -typed %s | %FileCheck --match-full-lines -check-prefix MM %s
 
 print("hi");
 

diff --git a/test/AST/ts2flow/function-types.ts b/test/AST/ts2flow/function-types.ts
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// RUN: %shermes -typed -parse-ts -dump-ast -pretty -script %s | %FileCheck %s --match-full-lines
+// RUN: %shermes -typed -parse-ts -dump-transpiled-ast -pretty -script %s | %FileCheck %s --match-full-lines
 
 // CHECK-LABEL: {
 // CHECK-NEXT:   "type": "Program",

diff --git a/test/AST/ts2flow/literal-types.ts b/test/AST/ts2flow/literal-types.ts
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// RUN: %shermes -typed -parse-ts -dump-ast -pretty -script %s | %FileCheck %s --match-full-lines
+// RUN: %shermes -typed -parse-ts -dump-transpiled-ast -pretty -script %s | %FileCheck %s --match-full-lines
 
 // CHECK-LABEL: {
 // CHECK-NEXT:   "type": "Program",

diff --git a/test/AST/ts2flow/nbody.ts b/test/AST/ts2flow/nbody.ts
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// RUN: %shermes -typed -parse-ts -dump-ast -pretty -script %s | %FileCheck --match-full-lines %s
+// RUN: %shermes -typed -parse-ts -dump-transpiled-ast -pretty -script %s | %FileCheck --match-full-lines %s
 
 "use strict";
 (function main() {

diff --git a/test/AST/ts2flow/primitive-types.ts b/test/AST/ts2flow/primitive-types.ts
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// RUN: %shermes -typed -parse-ts -dump-ast -pretty -script %s | %FileCheck %s --match-full-lines
+// RUN: %shermes -typed -parse-ts -dump-transpiled-ast -pretty -script %s | %FileCheck %s --match-full-lines
 
 // CHECK-LABEL: {
 // CHECK-NEXT:   "type": "Program",

diff --git a/tools/shermes/compile.h b/tools/shermes/compile.h
@@ -15,6 +15,7 @@
 enum class OutputLevelKind {
   None,
   AST,
+  TranspiledAST,
   TransformedAST,
   Sema,
   CFG,

diff --git a/tools/shermes/shermes.cpp b/tools/shermes/shermes.cpp
@@ -41,6 +41,7 @@ OutputFormatKind toOutputFormatKind(OutputLevelKind level) {
     case OutputLevelKind::AST:
       return OutputFormatKind::DumpAST;
     case OutputLevelKind::Sema:
+    case OutputLevelKind::TranspiledAST:
     case OutputLevelKind::TransformedAST:
       return OutputFormatKind::DumpTransformedAST;
     case OutputLevelKind::CFG:
@@ -210,6 +211,10 @@ cl::opt<OutputLevelKind> OutputLevel(
     cl::Optional,
     cl::values(
         clEnumValN(OutputLevelKind::AST, "dump-ast", "AST as text in JSON"),
+        clEnumValN(
+            OutputLevelKind::TranspiledAST,
+            "dump-transpiled-ast",
+            "Transformed AST as text after optional early transpilation"),
         clEnumValN(
             OutputLevelKind::TransformedAST,
             "dump-transformed-ast",
@@ -758,6 +763,20 @@ ESTree::NodePtr parseJS(
     }
   }
 
+  if (cli::OutputLevel == OutputLevelKind::AST) {
+    hermes::dumpESTreeJSON(
+        llvh::outs(),
+        parsedAST,
+        cli::Pretty /* pretty */,
+        cli::IncludeEmptyASTNodes ? ESTreeDumpMode::DumpAll
+                                  : ESTreeDumpMode::HideEmpty,
+        context->getSourceErrorManager(),
+        cli::DumpSourceLocation,
+        cli::IncludeRawASTProp ? ESTreeRawProp::Include
+                               : ESTreeRawProp::Exclude);
+    return parsedAST;
+  }
+
   // Convert TS AST to Flow AST as an intermediate step until we have a
   // separate TS type checker.
   if (flowContext && context->getParseTS()) {
@@ -777,7 +796,7 @@ ESTree::NodePtr parseJS(
     }
   }
 
-  if (cli::OutputLevel == OutputLevelKind::AST) {
+  if (cli::OutputLevel == OutputLevelKind::TranspiledAST) {
     hermes::dumpESTreeJSON(
         llvh::outs(),
         parsedAST,