Split name and package

pkgs/assets/README.md

@@ -39,7 +39,7 @@ At runtime, you can access the data by:
 import 'package:assets/src/assets.dart';
 
 Future<void> main(List<String> arguments) async {
-  final asset = const StringAsset('package/myPackageName/myData1');
+  final asset = const StringAsset(package: 'myPackage', name: 'myData1');
   final json = await asset.load();
   print(json);
 }

pkgs/assets/example/assets_example.dart

@@ -5,6 +5,6 @@
 import 'package:assets/assets.dart';
 
 Future<void> main() async {
-  final awesome = const StringAsset('testKey');
+  final awesome = const StringAsset(name: 'testKey', package: 'myPackage');
   print('awesome: ${await awesome.load()}');
 }

pkgs/assets/lib/src/assets.dart

@@ -10,9 +10,10 @@ import 'assets_internal.dart';
 import 'hook/assets_build.dart' show AssetBuilder;
 
 abstract class Asset<T> {
-  final String key;
+  final String package;
+  final String name;
 
-  const Asset(this.key);
+  const Asset({required this.package, required this.name});
 
   /// Load the asset asynchronously.
   Future<T> load();
@@ -22,20 +23,28 @@ abstract class Asset<T> {
 class StringAsset extends Asset<String> {
   static const uniquePrefix = 'StringAsset';
 
-  const StringAsset(@mustBeConst super.key);
+  const StringAsset({
+    @mustBeConst required super.package,
+    @mustBeConst required super.name,
+  });
 
   @override
-  Future<String> load() =>
-      loadAssetString(AssetBuilder.assetNameMangler<StringAsset>(key));
+  Future<String> load() => loadAssetString(
+    'package/$package/${AssetBuilder.assetNameMangler<StringAsset>(name)}',
+  );
 }
 
 @RecordUse()
 class ByteAsset extends Asset<Uint8List> {
   static const uniquePrefix = 'ByteAsset';
 
-  const ByteAsset(@mustBeConst super.key);
+  const ByteAsset({
+    @mustBeConst required super.package,
+    @mustBeConst required super.name,
+  });
 
   @override
-  Future<Uint8List> load() =>
-      loadAssetBytes(AssetBuilder.assetNameMangler<ByteAsset>(key));
+  Future<Uint8List> load() => loadAssetBytes(
+    'package/$package/${AssetBuilder.assetNameMangler<ByteAsset>(name)}',
+  );
 }

pkgs/assets/lib/src/hook/assets_build.dart

@@ -45,9 +45,9 @@ class AssetBuilder {
             .entries,
       ].map(
         (file) => DataAsset(
-          file: file.value,
           name: file.key,
           package: input.packageName,
+          file: file.value,
         ),
       ),
       linkInPackage: linkInPackage,

pkgs/assets/lib/src/hook/assets_link.dart

@@ -34,10 +34,10 @@ class AssetLinker {
     final assets = input.assets.data.where(
       (asset) =>
           usedStringSymbols.contains(
-            AssetBuilder.assetNameMangler<StringAsset>(asset.id),
+            AssetBuilder.assetNameMangler<StringAsset>(asset.name),
           ) ||
           usedByteSymbols.contains(
-            AssetBuilder.assetNameMangler<ByteAsset>(asset.id),
+            AssetBuilder.assetNameMangler<ByteAsset>(asset.name),
           ),
     );
     output.assets.data.addAll(assets);
@@ -58,8 +58,8 @@ extension on record_use.RecordedUsages {
       (instancesOf(identifier) ?? [])
           .map(
             (instance) =>
-                // Get the "key" field value from "RecordSymbol"
-                (instance.instanceConstant.fields.values.first
+                // Get the "name" field value from the String/ByteAsset class
+                (instance.instanceConstant.fields['name']
                         as record_use.StringConstant)
                     .value,
           )