chore: merge with main and add tests

packages/mongodb-dialects/java-driver/src/main/kotlin/com/mongodb/jbplugin/dialects/javadriver/glossary/JavaDriverDialectParser.kt

@@ -497,6 +497,7 @@ object JavaDriverDialectParser : DialectParser<PsiElement> {
                     Node(
                         stageCall,
                         listOf(
+                            Named(Name.GROUP),
                             HasFieldReference(
                                 HasFieldReference.Inferred(groupArgument, "_id", "_id")
                             ),

packages/mongodb-dialects/java-driver/src/test/kotlin/com/mongodb/jbplugin/dialects/javadriver/glossary/aggregationparser/GroupStageParserTest.kt

@@ -0,0 +1,158 @@
+package com.mongodb.jbplugin.dialects.javadriver.glossary.aggregationparser
+
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.command.WriteCommandAction
+import com.intellij.psi.JavaPsiFacade
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiFile
+import com.mongodb.jbplugin.dialects.javadriver.IntegrationTest
+import com.mongodb.jbplugin.dialects.javadriver.ParsingTest
+import com.mongodb.jbplugin.dialects.javadriver.WithFile
+import com.mongodb.jbplugin.dialects.javadriver.caret
+import com.mongodb.jbplugin.dialects.javadriver.getQueryAtMethod
+import com.mongodb.jbplugin.dialects.javadriver.glossary.JavaDriverDialect
+import com.mongodb.jbplugin.mql.components.HasAccumulatedFields
+import com.mongodb.jbplugin.mql.components.HasAggregation
+import com.mongodb.jbplugin.mql.components.HasFieldReference
+import com.mongodb.jbplugin.mql.components.HasValueReference
+import com.mongodb.jbplugin.mql.components.Name
+import com.mongodb.jbplugin.mql.components.Named
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvSource
+
+@IntegrationTest
+class GroupStageParserTest {
+    @ParsingTest(
+        fileName = "Aggregation.java",
+        value = """
+import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.Aggregates;
+import com.mongodb.client.model.Filters;
+import org.bson.Document;
+import org.bson.types.ObjectId;
+
+import java.util.List;
+
+import static com.mongodb.client.model.Filters.*;
+
+public final class Aggregation {
+    private final MongoCollection<Document> collection;
+
+    public Aggregation(MongoClient client) {
+        this.collection = client.getDatabase("simple").getCollection("books");
+    }
+
+    public AggregateIterable<Document> getAllBookTitles(ObjectId id) {
+        return this.collection.aggregate(List.of(
+            Aggregates.group("${'$'}myField")
+        ));
+    }
+}
+      """
+    )
+    fun `should be able to parse a group stage without accumulators`(psiFile: PsiFile) {
+        val aggregate = psiFile.getQueryAtMethod("Aggregation", "getAllBookTitles")
+        val parsedAggregate = JavaDriverDialect.parser.parse(aggregate)
+        val hasAggregation = parsedAggregate.component<HasAggregation<PsiElement>>()
+        assertEquals(1, hasAggregation?.children?.size)
+
+        val groupStage = hasAggregation?.children?.get(0)!!
+
+        val named = groupStage.component<Named>()!!
+        assertEquals(Name.GROUP, named.name)
+
+        val idFieldRef = groupStage.component<HasFieldReference<PsiElement>>()!!.reference as HasFieldReference.Inferred<PsiElement>
+        val computedValueRef = groupStage.component<HasValueReference<PsiElement>>()!!.reference as HasValueReference.Computed<PsiElement>
+        val accumulatedFields = groupStage.component<HasAccumulatedFields<PsiElement>>()!!
+
+        assertEquals("_id", idFieldRef.fieldName)
+        assertEquals(0, accumulatedFields.children.size)
+
+        val computedExpression = computedValueRef.expression
+        val fieldUsedForComputation = computedExpression.component<HasFieldReference<PsiElement>>()!!.reference as HasFieldReference.Computed<PsiElement>
+
+        assertEquals("myField", fieldUsedForComputation.fieldName)
+        assertEquals("${'$'}myField", fieldUsedForComputation.displayName)
+    }
+
+    @WithFile(
+        fileName = "Repository.java",
+        value = """
+import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.Aggregates;
+import com.mongodb.client.model.Accumulators;
+import com.mongodb.client.model.Filters;
+import org.bson.Document;
+import org.bson.types.ObjectId;
+
+import java.util.List;
+
+import static com.mongodb.client.model.Filters.*;
+
+public final class Aggregation {
+    private final MongoCollection<Document> collection;
+
+    public Aggregation(MongoClient client) {
+        this.collection = client.getDatabase("simple").getCollection("books");
+    }
+
+    public AggregateIterable<Document> getAllBookTitles(ObjectId id) {
+        return this.collection.aggregate(List.of(
+            Aggregates.group("${'$'}myField", Accumulators."|"("myKey", "myVal"))
+        ));
+    }
+}
+        """,
+    )
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "method;;expected",
+            "sum;;SUM",
+            "avg;;AVG",
+            "first;;FIRST",
+            "last;;LAST",
+            "max;;MAX",
+            "min;;MIN",
+            "push;;PUSH",
+            "addToSet;;ADD_TO_SET",
+        ],
+        delimiterString = ";;",
+        useHeadersInDisplayName = true
+    )
+    fun `supports all relevant key-value accumulators from the driver`(
+        method: String,
+        expected: Name,
+        psiFile: PsiFile
+    ) {
+        WriteCommandAction.runWriteCommandAction(psiFile.project) {
+            val elementAtCaret = psiFile.caret()
+            val javaFacade = JavaPsiFacade.getInstance(psiFile.project)
+            val methodToTest = javaFacade.parserFacade.createReferenceFromText(method, null)
+            elementAtCaret.replace(methodToTest)
+        }
+
+        ApplicationManager.getApplication().runReadAction {
+            val aggregate = psiFile.getQueryAtMethod("Aggregation", "getAllBookTitles")
+            val parsedAggregate = JavaDriverDialect.parser.parse(aggregate)
+            val hasAggregation = parsedAggregate.component<HasAggregation<PsiElement>>()
+            assertEquals(1, hasAggregation?.children?.size)
+
+            val groupStage = hasAggregation?.children?.get(0)!!
+            val named = groupStage.component<Named>()!!
+            assertEquals(Name.GROUP, named.name)
+
+            val accumulator = groupStage.component<HasAccumulatedFields<PsiElement>>()!!.children[0]
+            val accumulatorName = accumulator.component<Named>()!!
+            assertEquals(expected, accumulatorName.name)
+
+            val accumulatorField = accumulator.component<HasFieldReference<PsiElement>>()?.reference as HasFieldReference.Computed<PsiElement>
+            assertEquals("myKey", accumulatorField.fieldName)
+        }
+    }
+}

packages/mongodb-mql-model/src/main/kotlin/com/mongodb/jbplugin/mql/components/Named.kt

@@ -52,6 +52,7 @@ enum class Name(val canonical: String) {
     PROJECT("project"),
     INCLUDE("include"),
     EXCLUDE("exclude"),
+    GROUP("group"),
     SUM("sum"),
     AVG("avg"),
     FIRST("first"),