fix(dart): address code review feedback and improve test coverage

Fixes based on CodeRabbit review:
- Fix build.gradle.kts: use srcDir() instead of srcDirs() to append
  generated sources without replacing src/main/java
- Fix grammar typo: "gramamr" -> "grammar"
- Remove duplicate FUNCTION_ and DYNAMIC_ in identifier rule
- Remove unused WHEN_ keyword from lexer
- Add BASE_ and SEALED_ to identifier and typeIdentifier rules
- Implement addFieldToCurrentClass in DartFullIdentListener
- Fix enterLibraryExport to actually add exports to TopLevel
- Make currentNode and hasEnterClass protected for subclass access
- Fix function body scope tracking (isInFunction in enterFunctionBody)

Test improvements (36 tests now):
- Add test for exports parsing
- Add test for class fields
- Add test for method parameters
- Add test for typedef
- Add test for operator overloading
- Add test for mixin constraints
- Add test for class with mixins
- Add test for import hide
- Add test for static methods
- Add test for async methods
- Add test for generic class
- Add test for anonymous extension
- Add test for top-level getter/setter
- Fix shouldParseComplexFile to use assertNotNull instead of silent return

Author: phodal

chapi-ast-dart/build.gradle.kts

@@ -35,7 +35,8 @@ dependencies {
 }
 
 sourceSets.main {
-    java.srcDirs("${project.layout.buildDirectory.get().asFile}/generated-src")
+    // Append generated-src to existing source directories (don't replace src/main/java)
+    java.srcDir("${project.layout.buildDirectory.get().asFile}/generated-src")
 }
 
 tasks.generateGrammarSource {

chapi-ast-dart/src/main/antlr/Dart2Lexer.g4

@@ -8,7 +8,7 @@
  * This grammar is generated from the CFG contained in:
  * https://github.com/dart-lang/language/blob/70eb85cf9a6606a9da0de824a5d55fd06de1287f/specification/dartLangSpec.tex
  *
- * The bash script used to scrape and the refactor the gramamr is here:
+ * The bash script used to scrape and the refactor the grammar is here:
  * https://github.com/kaby76/ScrapeDartSpec/blob/master/refactor.sh
  *
  * Note: the CFG in the Specification is in development, and is for approximately
@@ -143,7 +143,6 @@ RETURN_     : 'return';
 // Dart 3 class modifiers
 SEALED_     : 'sealed';
 BASE_       : 'base';
-WHEN_       : 'when';
 SET_        : 'set';
 SHOW_       : 'show';
 STATIC_     : 'static';

chapi-ast-dart/src/main/antlr/Dart2Parser.g4

@@ -8,7 +8,7 @@
  * This grammar is generated from the CFG contained in:
  * https://github.com/dart-lang/language/blob/70eb85cf9a6606a9da0de824a5d55fd06de1287f/specification/dartLangSpec.tex
  *
- * The bash script used to scrape and the refactor the gramamr is here:
+ * The bash script used to scrape and the refactor the grammar is here:
  * https://github.com/kaby76/ScrapeDartSpec/blob/master/refactor.sh
  *
  * Note: the CFG in the Specification is in development, and is for approximately
@@ -484,7 +484,6 @@ identifier
     | SET_
     | STATIC_
     | TYPEDEF_
-    | FUNCTION_
     | ASYNC_
     | HIDE_
     | OF_
@@ -493,8 +492,9 @@ identifier
     | SYNC_
     | AWAIT_
     | YIELD_
-    | DYNAMIC_
     | NATIVE_
+    | BASE_
+    | SEALED_
     ;
 
 identifierList
@@ -1052,6 +1052,8 @@ typeIdentifier
     | DYNAMIC_
     | NATIVE_
     | FUNCTION_
+    | BASE_
+    | SEALED_
     ;
 
 typeList

chapi-ast-dart/src/main/kotlin/chapi/ast/dartast/DartBasicIdentListener.kt

@@ -16,9 +16,9 @@ open class DartBasicIdentListener(private val filePath: String) : DartAstListene
     )
 
     private var classNodes: MutableList<CodeDataStruct> = mutableListOf()
-    private var currentNode: CodeDataStruct = CodeDataStruct()
+    protected var currentNode: CodeDataStruct = CodeDataStruct()
     private var currentFunction: CodeFunction = CodeFunction()
-    private var hasEnterClass: Boolean = false
+    protected var hasEnterClass: Boolean = false
 
     // Track library name if specified
     override fun enterLibraryName(ctx: Dart2Parser.LibraryNameContext?) {
@@ -66,11 +66,28 @@ open class DartBasicIdentListener(private val filePath: String) : DartAstListene
     override fun enterLibraryExport(ctx: Dart2Parser.LibraryExportContext?) {
         val uri = ctx?.configurableUri()?.uri()?.stringLiteral()?.text?.trim('"', '\'') ?: return
 
-        // Create an export entry
-        val codeExport = CodeExport(Name = uri)
-        codeContainer.DataStructures.find { it.NodeName == "default" }?.Exports?.let {
-            // Add to default struct if exists
+        // Create an export entry and store in TopLevel scope
+        val codeExport = CodeExport(
+            Name = uri,
+            FromSource = uri,
+            Kind = ExportKind.RE_EXPORT_ALL
+        )
+        
+        // Handle show/hide combinators for exports
+        ctx.combinator()?.forEach { combinator ->
+            val identifiers = combinator.identifierList()?.identifier()?.map { it.text } ?: return@forEach
+            if (combinator.SHOW_() != null) {
+                codeExport.Kind = ExportKind.RE_EXPORT_NAMED
+                codeExport.Specifiers = identifiers.map { name ->
+                    ExportSpecifier(LocalName = name, ExportedName = name)
+                }
+            }
         }
+
+        ensureTopLevelScope()
+        codeContainer.TopLevel = codeContainer.TopLevel?.copy(
+            Exports = (codeContainer.TopLevel?.Exports ?: emptyList()) + codeExport
+        )
     }
 
     // Handle class declaration

chapi-ast-dart/src/main/kotlin/chapi/ast/dartast/DartFullIdentListener.kt

@@ -15,22 +15,23 @@ open class DartFullIdentListener(filePath: String) : DartBasicIdentListener(file
 
     override fun enterMethodSignature(ctx: Dart2Parser.MethodSignatureContext?) {
         super.enterMethodSignature(ctx)
-        isInFunction = true
-        currentFunctionCalls.clear()
-        localVariables.clear()
+        // Don't set isInFunction here - wait for function body
     }
 
     override fun exitMethodSignature(ctx: Dart2Parser.MethodSignatureContext?) {
         super.exitMethodSignature(ctx)
-        isInFunction = false
     }
 
     override fun enterFunctionBody(ctx: Dart2Parser.FunctionBodyContext?) {
-        // Reset for function body processing
+        isInFunction = true
+        currentFunctionCalls.clear()
+        localVariables.clear()
     }
 
     override fun exitFunctionBody(ctx: Dart2Parser.FunctionBodyContext?) {
-        // Attach collected function calls
+        // Function calls collected during body processing are stored in currentFunctionCalls
+        // They can be attached to the current function if needed
+        isInFunction = false
     }
 
     // Handle class member declarations for fields
@@ -72,65 +73,32 @@ open class DartFullIdentListener(filePath: String) : DartBasicIdentListener(file
             ?: "var"
     }
 
-    private fun addFieldToCurrentClass(
+    /**
+     * Add a field to the current class being parsed.
+     * Creates a CodeField and adds it to the current node's fields.
+     */
+    protected fun addFieldToCurrentClass(
         name: String,
         type: String,
         isStatic: Boolean = false,
         isFinal: Boolean = false,
         isLate: Boolean = false
     ) {
-        // This will be handled by the parent class's current node
-    }
-
-    // Handle function calls in expressions
-    override fun enterArgumentPart(ctx: Dart2Parser.ArgumentPartContext?) {
-        if (!isInFunction) return
-
-        // Extract function call information from the parent context
-        val parent = ctx?.parent
-        if (parent is Dart2Parser.SelectorContext || parent is Dart2Parser.PostfixExpressionContext) {
-            // Function call detected
-            extractFunctionCall(ctx)
-        }
-    }
-
-    private fun extractFunctionCall(ctx: Dart2Parser.ArgumentPartContext) {
-        // Build function call from context
-        val call = CodeCall()
-        call.Position = buildPosition(ctx)
-
-        // Parse arguments
-        ctx.arguments()?.argumentList()?.let { argList ->
-            call.Parameters = parseCallArguments(argList)
-        }
-
-        currentFunctionCalls.add(call)
-    }
-
-    private fun parseCallArguments(ctx: Dart2Parser.ArgumentListContext): List<CodeProperty> {
-        val params = mutableListOf<CodeProperty>()
-
-        // Expression list
-        ctx.expressionList()?.expr()?.forEach { expr ->
-            params.add(CodeProperty(TypeType = "dynamic", TypeValue = expr.text))
-        }
-
-        // Named arguments
-        ctx.namedArgument()?.forEach { named ->
-            val name = named.label()?.identifier()?.text ?: ""
-            val value = named.expr()?.text ?: ""
-            params.add(CodeProperty(TypeType = value, TypeValue = name))
-        }
-
-        return params
-    }
+        if (!hasEnterClass) return
+
+        val modifiers = mutableListOf<String>()
+        if (isStatic) modifiers.add("static")
+        if (isFinal) modifiers.add("final")
+        if (isLate) modifiers.add("late")
+
+        val field = CodeField(
+            TypeKey = name,
+            TypeType = type,
+            TypeValue = "",
+            Modifiers = modifiers
+        )
 
-    // Handle primary expressions (identifiers, literals, etc.)
-    override fun enterPrimary(ctx: Dart2Parser.PrimaryContext?) {
-        // Track identifiers for variable resolution
-        ctx?.identifier()?.let { id ->
-            // Could be a variable reference or function call
-        }
+        currentNode.Fields += field
     }
 
     // Handle new expressions
@@ -208,6 +176,13 @@ open class DartFullIdentListener(filePath: String) : DartBasicIdentListener(file
         var currentTarget = primary.text
 
         for (selector in selectors) {
+            // First update target if there's an identifier selector
+            selector.assignableSelector()?.let { assignable ->
+                assignable.identifier()?.let { id ->
+                    currentTarget = "$currentTarget.${id.text}"
+                }
+            }
+
             // Check if this selector includes arguments (function call)
             selector.argumentPart()?.let { argPart ->
                 val call = CodeCall(
@@ -222,14 +197,25 @@ open class DartFullIdentListener(filePath: String) : DartBasicIdentListener(file
 
                 currentFunctionCalls.add(call)
             }
+        }
+    }
 
-            // Update target for chained calls
-            selector.assignableSelector()?.let { assignable ->
-                assignable.identifier()?.let { id ->
-                    currentTarget = "$currentTarget.${id.text}"
-                }
-            }
+    private fun parseCallArguments(ctx: Dart2Parser.ArgumentListContext): List<CodeProperty> {
+        val params = mutableListOf<CodeProperty>()
+
+        // Expression list
+        ctx.expressionList()?.expr()?.forEach { expr ->
+            params.add(CodeProperty(TypeType = "dynamic", TypeValue = expr.text))
+        }
+
+        // Named arguments
+        ctx.namedArgument()?.forEach { named ->
+            val name = named.label()?.identifier()?.text ?: ""
+            val value = named.expr()?.text ?: ""
+            params.add(CodeProperty(TypeType = value, TypeValue = name))
         }
+
+        return params
     }
 
     // Handle local variable declarations
@@ -268,11 +254,6 @@ open class DartFullIdentListener(filePath: String) : DartBasicIdentListener(file
         }
     }
 
-    // Handle await expressions
-    override fun enterAwaitExpression(ctx: Dart2Parser.AwaitExpressionContext?) {
-        // Mark that we're in an async context
-    }
-
     // Handle throw expressions
     override fun enterThrowExpression(ctx: Dart2Parser.ThrowExpressionContext?) {
         if (!isInFunction) return
@@ -299,4 +280,9 @@ open class DartFullIdentListener(filePath: String) : DartBasicIdentListener(file
             currentFunctionCalls.add(call)
         }
     }
+
+    /**
+     * Get the function calls collected during parsing.
+     */
+    fun getFunctionCalls(): List<CodeCall> = currentFunctionCalls.toList()
 }