JS: avoid repeated export of the same declaration

js/js.serializer/src/js-ast.proto

@@ -270,6 +270,7 @@ message Debugger {
 
 message ExpressionStatement {
     required Expression expression = 1;
+    optional int32 exported_tag_id = 2;
 }
 
 message Vars {

js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt

@@ -142,7 +142,11 @@ class JsAstDeserializer(private val program: JsProgram) {
 
         StatementCase.EXPRESSION -> {
             val expressionProto = proto.expression
-            JsExpressionStatement(deserialize(expressionProto.expression))
+            JsExpressionStatement(deserialize(expressionProto.expression)).also {
+                if (expressionProto.hasExportedTagId()) {
+                    it.exportedTag = deserializeString(expressionProto.exportedTagId)
+                }
+            }
         }
 
         StatementCase.VARS -> {

js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstProtoBuf.java

@@ -19331,6 +19331,15 @@ public final class JsAstProtoBuf {
      * <code>required .org.jetbrains.kotlin.serialization.js.ast.Expression expression = 1;</code>
      */
     org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Expression getExpression();
+
+    /**
+     * <code>optional int32 exported_tag_id = 2;</code>
+     */
+    boolean hasExportedTagId();
+    /**
+     * <code>optional int32 exported_tag_id = 2;</code>
+     */
+    int getExportedTagId();
   }
   /**
    * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.ExpressionStatement}
@@ -19395,6 +19404,11 @@ public final class JsAstProtoBuf {
               bitField0_ |= 0x00000001;
               break;
             }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              exportedTagId_ = input.readInt32();
+              break;
+            }
           }
         }
       } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
@@ -19444,8 +19458,24 @@ public final class JsAstProtoBuf {
       return expression_;
     }
 
+    public static final int EXPORTED_TAG_ID_FIELD_NUMBER = 2;
+    private int exportedTagId_;
+    /**
+     * <code>optional int32 exported_tag_id = 2;</code>
+     */
+    public boolean hasExportedTagId() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional int32 exported_tag_id = 2;</code>
+     */
+    public int getExportedTagId() {
+      return exportedTagId_;
+    }
+
     private void initFields() {
       expression_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Expression.getDefaultInstance();
+      exportedTagId_ = 0;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -19471,6 +19501,9 @@ public final class JsAstProtoBuf {
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeMessage(1, expression_);
       }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeInt32(2, exportedTagId_);
+      }
       output.writeRawBytes(unknownFields);
     }
 
@@ -19484,6 +19517,10 @@ public final class JsAstProtoBuf {
         size += org.jetbrains.kotlin.protobuf.CodedOutputStream
           .computeMessageSize(1, expression_);
       }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += org.jetbrains.kotlin.protobuf.CodedOutputStream
+          .computeInt32Size(2, exportedTagId_);
+      }
       size += unknownFields.size();
       memoizedSerializedSize = size;
       return size;
@@ -19580,6 +19617,8 @@ public final class JsAstProtoBuf {
         super.clear();
         expression_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Expression.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000001);
+        exportedTagId_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -19607,6 +19646,10 @@ public final class JsAstProtoBuf {
           to_bitField0_ |= 0x00000001;
         }
         result.expression_ = expression_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.exportedTagId_ = exportedTagId_;
         result.bitField0_ = to_bitField0_;
         return result;
       }
@@ -19616,6 +19659,9 @@ public final class JsAstProtoBuf {
         if (other.hasExpression()) {
           mergeExpression(other.getExpression());
         }
+        if (other.hasExportedTagId()) {
+          setExportedTagId(other.getExportedTagId());
+        }
         setUnknownFields(
             getUnknownFields().concat(other.unknownFields));
         return this;
@@ -19712,6 +19758,38 @@ public final class JsAstProtoBuf {
         return this;
       }
 
+      private int exportedTagId_ ;
+      /**
+       * <code>optional int32 exported_tag_id = 2;</code>
+       */
+      public boolean hasExportedTagId() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional int32 exported_tag_id = 2;</code>
+       */
+      public int getExportedTagId() {
+        return exportedTagId_;
+      }
+      /**
+       * <code>optional int32 exported_tag_id = 2;</code>
+       */
+      public Builder setExportedTagId(int value) {
+        bitField0_ |= 0x00000002;
+        exportedTagId_ = value;
+        
+        return this;
+      }
+      /**
+       * <code>optional int32 exported_tag_id = 2;</code>
+       */
+      public Builder clearExportedTagId() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        exportedTagId_ = 0;
+        
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.ExpressionStatement)
     }
 

js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializer.kt

@@ -144,6 +144,11 @@ class JsAstSerializer {
             override fun visitExpressionStatement(x: JsExpressionStatement) {
                 val statementBuilder = ExpressionStatement.newBuilder()
                 statementBuilder.expression = serialize(x.expression)
+                val tag = x.exportedTag
+                if (tag != null) {
+                    statementBuilder.exportedTagId = serialize(tag)
+                }
+
                 builder.expression = statementBuilder.build()
             }