Update annotation

dart-lang · Oct 18, 2023 · 942803e · 942803e
1 parent 88b8ff4
commit 942803e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 40 deletions.
diff --git a/pkgs/asset_bundle/lib/src/resources.dart b/pkgs/asset_bundle/lib/src/resources.dart
@@ -17,26 +17,19 @@ class Resources {
 
 class Identifier {
   final String name;
+  final String id;
   final String uri;
   final bool nonConstant;
   final List<ResourceFile> files;
 
   Identifier({
     required this.name,
+    required this.id,
     required this.uri,
     required this.nonConstant,
     required this.files,
   });
 
-  Map<String, dynamic> toJson() {
-    return {
-      'name': name,
-      'uri': uri,
-      'nonConstant': nonConstant,
-      'files': files.map((x) => x.toJson()).toList(),
-    };
-  }
-
   @override
   String toString() {
     return 'Identifier(name: $name, uri: $uri, nonConstant: $nonConstant, files: $files)';
@@ -45,6 +38,7 @@ class Identifier {
   factory Identifier.fromJson(Map<String, dynamic> map) {
     return Identifier(
       name: map['name'] ?? '',
+      id: map['id'] ?? '',
       uri: map['uri'] ?? '',
       nonConstant: map['nonConstant'] ?? false,
       files: List<ResourceFile>.from(

diff --git a/pkgs/messages/example_json/bin/example.exe b/pkgs/messages/example_json/bin/example.exe
diff --git a/pkgs/messages/example_json/lib/testarbctx2.g.dart b/pkgs/messages/example_json/lib/testarbctx2.g.dart
@@ -41,7 +41,7 @@ class AboutPageMessages {
     );
   }
 
-  @pragma('resource-identifier')
+  @Resource('messages')
   @pragma('dart2js:resource-identifier')
   @pragma('dart2js:never-inline')
   static Future<String> generate(MessagesAssetBundle bundle, List args,

diff --git a/pkgs/messages/example_json/link.dart b/pkgs/messages/example_json/link.dart
@@ -13,7 +13,8 @@ void main(List<String> args) {
 
   final resources = Resources.fromString(input);
   final ourIdentifiers = resources.identifiers
-      .where((identifier) => identifier.name == 'generate');
+      .where((identifier) => identifier.name == 'generate')
+      .where((identifier) => identifier.id.startsWith('messages'));
   final entries = ourIdentifiers
       .expand((identifier) => identifier.files)
       .expand((file) => file.references.map((reference) {

diff --git a/pkgs/messages/example_json/resources_vm.json b/pkgs/messages/example_json/resources_vm.json