Fix type-only summary generation for export const

The export keyword was being incorrectly dropped for all `export const` statements. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=186046130
google · Feb 20, 2018 · 0936f7c · 0936f7c
1 parent 892f5aa
commit 0936f7c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/src/com/google/javascript/jscomp/ijs/ConvertToTypedInterface.java b/src/com/google/javascript/jscomp/ijs/ConvertToTypedInterface.java
@@ -271,6 +271,8 @@ public void visit(NodeTraversal t, Node n, Node parent) {
     static void splitNameDeclarationsAndRemoveDestructuring(Node n, NodeTraversal t) {
       checkArgument(NodeUtil.isNameDeclaration(n));
       JSDocInfo sharedJsdoc = n.getJSDocInfo();
+      boolean isExport = n.getParent().isExport();
+      Node statement = isExport ? n.getParent() : n;
       while (n.hasChildren()) {
         Node lhsToSplit = n.getLastChild();
         if (lhsToSplit.isDestructuringLhs()
@@ -293,7 +295,10 @@ static void splitNameDeclarationsAndRemoveDestructuring(Node n, NodeTraversal t)
         Node newDeclaration =
             NodeUtil.newDeclaration(lhsToSplit.detach(), rhs, n.getToken()).srcref(n);
         newDeclaration.setJSDocInfo(mergedJsdoc);
-        n.getParent().addChildAfter(newDeclaration, n);
+        if (isExport) {
+          newDeclaration = IR.export(newDeclaration).srcref(statement);
+        }
+        statement.getParent().addChildAfter(newDeclaration, statement);
         t.reportCodeChange();
       }
     }

diff --git a/src/com/google/javascript/jscomp/ijs/PotentialDeclaration.java b/src/com/google/javascript/jscomp/ijs/PotentialDeclaration.java
@@ -217,7 +217,11 @@ void simplify(AbstractCompiler compiler) {
       newStatement.useSourceInfoIfMissingFromForTree(nameNode);
       Node oldStatement = getRemovableNode();
       NodeUtil.deleteChildren(oldStatement, compiler);
-      oldStatement.replaceWith(newStatement);
+      if (oldStatement.isExport()) {
+        oldStatement.addChildToBack(newStatement);
+      } else {
+        oldStatement.replaceWith(newStatement);
+      }
       compiler.reportChangeToEnclosingScope(newStatement);
     }
 

diff --git a/src/com/google/javascript/rhino/IR.java b/src/com/google/javascript/rhino/IR.java
@@ -56,6 +56,10 @@ public static Node empty() {
     return new Node(Token.EMPTY);
   }
 
+  public static Node export(Node declaration) {
+    return new Node(Token.EXPORT, declaration);
+  }
+
   public static Node importNode(Node name, Node importSpecs, Node moduleIdentifier) {
     checkState(name.isName() || name.isEmpty(), name);
     checkState(

diff --git a/test/com/google/javascript/jscomp/ijs/ConvertToTypedInterfaceTest.java b/test/com/google/javascript/jscomp/ijs/ConvertToTypedInterfaceTest.java
@@ -645,6 +645,20 @@ public void testEs6Modules() {
             "export {BLAH};"));
   }
 
+  public void testEs6ModulesExportedNameDeclarations() {
+    testSame("/** @type {number} */ export let x;");
+    testSame("/** @type {number} */ export var x;");
+
+    test("/** @type {number} */ export var x = 5;", "/** @type {number} */ export var x;");
+    test("/** @type {number} */ export const X = 5;", "/** @const {number} */ export var X;");
+    //TODO(blickly): Ideally, we would leave let declarations alone
+    test("/** @type {number} */ export let x = 5;", "/** @type {number} */ export var x;");
+
+    test(
+        "/** @type {number} */ export const X = 5, Y = z;",
+        "/** @const {number} */ export var X; /** @const {number} */ export var Y;");
+  }
+
   public void testGoogModules() {
     testSame(
         lines(