Add arguments to ConstructorMetadataAnnotation.

Support serializing them. Add helper methods to serialize lists of `Code` and `Map<String, Code`.

[email protected]

Bug: dart-lang/language#3443
Change-Id: If03b4ad5bf761b089f800834fc103b26143a0ddc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/335446
Commit-Queue: Jake Macdonald <[email protected]>
Reviewed-by: Jake Macdonald <[email protected]>
Auto-Submit: Morgan :) <[email protected]>

Author: davidmorgan

pkg/_fe_analyzer_shared/lib/src/macros/api/introspection.dart

@@ -424,4 +424,10 @@ abstract interface class ConstructorMetadataAnnotation
   /// For unnamed constructors, the name of this identifier will be the empty
   /// String.
   Identifier get constructor;
+
+  /// The positional arguments of this constructor call.
+  Iterable<ExpressionCode> get positionalArguments;
+
+  /// The named arguments of this constructor call.
+  Map<String, ExpressionCode> get namedArguments;
 }

pkg/_fe_analyzer_shared/lib/src/macros/executor/introspection_impls.dart

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import '../api.dart';
 import 'remote_instance.dart';
 import 'serialization.dart';
 import 'serialization_extensions.dart';
-import '../api.dart';
 
 class IdentifierImpl extends RemoteInstance implements Identifier {
   @override
@@ -287,12 +287,22 @@ class ConstructorMetadataAnnotationImpl extends MetadataAnnotationImpl
   @override
   final IdentifierImpl type;
 
+  @override
+  final List<ExpressionCode> positionalArguments;
+
+  @override
+  final Map<String, ExpressionCode> namedArguments;
+
   @override
   RemoteInstanceKind get kind =>
       RemoteInstanceKind.constructorMetadataAnnotation;
 
   ConstructorMetadataAnnotationImpl(
-      {required int id, required this.constructor, required this.type})
+      {required int id,
+      required this.constructor,
+      required this.type,
+      required this.positionalArguments,
+      required this.namedArguments})
       : super(id);
 
   @override
@@ -301,6 +311,17 @@ class ConstructorMetadataAnnotationImpl extends MetadataAnnotationImpl
 
     constructor.serialize(serializer);
     type.serialize(serializer);
+    serializer.startList();
+    for (ExpressionCode positionalArgument in positionalArguments) {
+      positionalArgument.serialize(serializer);
+    }
+    serializer.endList();
+    serializer.startList();
+    for (MapEntry<String, ExpressionCode> entry in namedArguments.entries) {
+      serializer.addString(entry.key);
+      entry.value.serialize(serializer);
+    }
+    serializer.endList();
   }
 }
 

pkg/_fe_analyzer_shared/lib/src/macros/executor/serialization.dart

@@ -226,7 +226,11 @@ class JsonDeserializer implements Deserializer {
       throw new StateError(
           'You must call `moveNext()` before reading any values.');
     }
-    return _path.last.current as T;
+    Object? current = _path.last.current;
+    if (current is! T) {
+      throw new StateError('Expected $T, got: ${_path.last.current}');
+    }
+    return current;
   }
 
   @override

pkg/_fe_analyzer_shared/lib/src/macros/executor/serialization_extensions.dart

@@ -1,8 +1,8 @@
 import 'package:_fe_analyzer_shared/src/macros/executor/introspection_impls.dart';
 
+import '../api.dart';
 import 'remote_instance.dart';
 import 'serialization.dart';
-import '../api.dart';
 
 extension DeserializerExtensions on Deserializer {
   T expectRemoteInstance<T extends Object>() {
@@ -83,7 +83,7 @@ extension DeserializerExtensions on Deserializer {
 
   Uri expectUri() => Uri.parse(expectString());
 
-  /// Helper method to read a list of [RemoteInstance]s.
+  /// Reads a list of [RemoteInstance]s.
   List<T> _expectRemoteInstanceList<T extends RemoteInstance>() {
     expectList();
     return [
@@ -92,6 +92,24 @@ extension DeserializerExtensions on Deserializer {
     ];
   }
 
+  /// Reads a list of [Code]s.
+  List<T> _expectCodeList<T extends Code>() {
+    expectList();
+    return [
+      for (bool hasNext = moveNext(); hasNext; hasNext = moveNext())
+        expectCode(),
+    ];
+  }
+
+  /// Reads a `Map<String, T extends Code>`.
+  Map<String, T> _expectStringCodeMap<T extends Code>() {
+    expectList();
+    return {
+      for (bool hasNext = moveNext(); hasNext; hasNext = moveNext())
+        expectString(): (this..moveNext()).expectCode(),
+    };
+  }
+
   NamedTypeAnnotationImpl _expectNamedTypeAnnotation(int id) =>
       new NamedTypeAnnotationImpl(
         id: id,
@@ -284,7 +302,9 @@ extension DeserializerExtensions on Deserializer {
       new ConstructorMetadataAnnotationImpl(
           id: id,
           constructor: expectRemoteInstance(),
-          type: RemoteInstance.deserialize(this));
+          type: RemoteInstance.deserialize(this),
+          positionalArguments: (this..moveNext())._expectCodeList(),
+          namedArguments: (this..moveNext())._expectStringCodeMap());
 
   IdentifierMetadataAnnotationImpl _expectIdentifierMetadataAnnotation(
           int id) =>

pkg/_fe_analyzer_shared/test/macros/executor/serialization_test.dart

@@ -625,8 +625,16 @@ void main() {
               id: RemoteInstance.uniqueId,
               type: IdentifierImpl(
                   id: RemoteInstance.uniqueId, name: 'Singleton'),
-              constructor: IdentifierImpl(
-                  id: RemoteInstance.uniqueId, name: 'someName'));
+              constructor:
+                  IdentifierImpl(id: RemoteInstance.uniqueId, name: 'someName'),
+              positionalArguments: [
+                ExpressionCode.fromString("'foo'"),
+                ExpressionCode.fromString('12'),
+              ],
+              namedArguments: {
+                'bar': ExpressionCode.fromString("'bar'"),
+                'foobar': ExpressionCode.fromString('13'),
+              });
 
           expectSerializationEquality<ConstructorMetadataAnnotationImpl>(
               constructorMetadata, mode, RemoteInstance.deserialize);

pkg/_fe_analyzer_shared/test/macros/util.dart

@@ -8,7 +8,6 @@ import 'package:_fe_analyzer_shared/src/macros/api.dart';
 import 'package:_fe_analyzer_shared/src/macros/executor.dart';
 import 'package:_fe_analyzer_shared/src/macros/executor/introspection_impls.dart';
 import 'package:_fe_analyzer_shared/src/macros/executor/remote_instance.dart';
-
 import 'package:test/test.dart';
 
 class TestTypePhaseIntrospector implements TypePhaseIntrospector {
@@ -292,6 +291,23 @@ class _DeepEqualityMatcher extends Matcher {
           return false;
         }
       }
+    } else if (instance is Map) {
+      item as Map;
+      if (!equals(instance.length).matches(item.length, matchState)) {
+        return false;
+      }
+      for (var key in instance.keys) {
+        // Key sets are same size, so they are equal if every key in `instance`
+        // is also a key in `item`.
+        if (!contains(key).matches(item, matchState)) {
+          return false;
+        }
+        // Maps are equal if keys are equal and every value is equal.
+        if (!_DeepEqualityMatcher(instance[key])
+            .matches(item[key], matchState)) {
+          return false;
+        }
+      }
     } else {
       // Handles basic values and identity
       if (!equals(instance).matches(item, matchState)) {

pkg/analyzer/lib/src/summary2/macro_declarations.dart

@@ -187,6 +187,8 @@ class DeclarationBuilder {
           getElement: () => node.element,
         ),
         type: identifierMacro,
+        positionalArguments: [], // TODO(scheglov) implement
+        namedArguments: {}, // TODO(scheglov) implement
       );
     } else {
       return macro.IdentifierMetadataAnnotationImpl(