JS-188 Directive can be used as a Statement (#4742)

SonarSource · Jun 18, 2024 · 42d6116 · 42d6116
1 parent 2febb26
commit 42d6116
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/sonar-plugin/api/src/main/java/org/sonar/plugins/javascript/api/estree/ESTree.java b/sonar-plugin/api/src/main/java/org/sonar/plugins/javascript/api/estree/ESTree.java
@@ -105,7 +105,7 @@ public record ClassExpression(Location loc, Optional<Identifier> id, Optional<Ex
   public record ConditionalExpression(Location loc, Expression test, Expression alternate, Expression consequent) implements Expression {}
   public record ContinueStatement(Location loc, Optional<Identifier> label) implements Statement {}
   public record DebuggerStatement(Location loc) implements Statement {}
-  public record Directive(Location loc, Literal expression, String directive) implements DirectiveOrModuleDeclarationOrStatement {}
+  public record Directive(Location loc, Literal expression, String directive) implements Statement {}
   public record DoWhileStatement(Location loc, Statement body, Expression test) implements Statement {}
   public record EmptyStatement(Location loc) implements Statement {}
   public record ExportAllDeclaration(Location loc, Optional<IdentifierOrLiteral> exported, Literal source) implements ModuleDeclaration {}

diff --git a/sonar-plugin/api/src/test/java/org/sonar/plugins/javascript/api/estree/ESTreeTest.java b/sonar-plugin/api/src/test/java/org/sonar/plugins/javascript/api/estree/ESTreeTest.java
@@ -39,7 +39,7 @@ void test_expression_subclasses() {
   void test_statement_subclasses() {
     Class<?> sealedClass = ESTree.Statement.class;
     Class<?>[] permittedSubclasses = sealedClass.getPermittedSubclasses();
-    assertThat(permittedSubclasses).hasSize(20);
+    assertThat(permittedSubclasses).hasSize(21);
   }
 
   @Test

diff --git a/sonar-plugin/bridge/src/test/java/org/sonar/plugins/javascript/bridge/ESTreeFactoryTest.java b/sonar-plugin/bridge/src/test/java/org/sonar/plugins/javascript/bridge/ESTreeFactoryTest.java
@@ -616,6 +616,31 @@ void should_create_export_all_declaration_type_using_a_literal() {
     });
   }
 
+  @Test
+  void directive_can_be_in_block_statement() {
+    BlockStatement blockStatement = BlockStatement.newBuilder()
+      .addBody(Node.newBuilder()
+        .setType(NodeType.ExpressionStatementType)
+        .setExpressionStatement(ExpressionStatement.newBuilder()
+          .setDirective("directiveName")
+          .setExpression(Node.newBuilder().setType(NodeType.LiteralType).build())
+          .build())
+        .build())
+      .build();
+    Node protobufNode = Node.newBuilder()
+      .setType(NodeType.BlockStatementType)
+      .setBlockStatement(blockStatement)
+      .build();
+
+    ESTree.Node estree = ESTreeFactory.from(protobufNode, ESTree.Node.class);
+    assertThat(estree).isInstanceOfSatisfying(ESTree.BlockStatement.class, block -> {
+      assertThat(block.body()).hasSize(1);
+      assertThat(block.body().get(0)).isInstanceOfSatisfying(ESTree.Directive.class, directive -> {
+        assertThat(directive.directive()).isEqualTo("directiveName");
+      });
+    });
+  }
+
   @Test
   void throw_exception_from_unrecognized_type() {
     Node protobufNode = Node.newBuilder()