[native-*] DataAsset names default to the full path (#1352)

Does not yet create a helper function as suggested in #1346, but does standardize the asset names to be the file path.

@mosuem I don't believe this should break https://dart-review.googlesource.com/c/sdk/+/351140, as the asset id is part of the `.dart.debug` files and I updated it there.

Author: dcharkes

pkgs/native_assets_builder/CHANGELOG.md

@@ -2,7 +2,8 @@
 
 - Fix some more cases of: `BuildConfig.dependencies` and
   `LinkConfig.dependencies` no longer have to specify Dart sources.
-- `DataAsset` test projects report all assets from `assets/` dir.
+- `DataAsset` test projects report all assets from `assets/` dir and default the
+  asset names to the path inside the package.
 
 ## 0.8.1
 

pkgs/native_assets_builder/test/build_runner/link_dry_run_test.dart

@@ -50,11 +50,20 @@ void main() async {
     timeout: longTimeout,
     () async {
       await inTempDir((tempUri) async {
-        // From package:complex_link_helper
-        const builtHelperAssets = ['data_helper_0', 'data_helper_1'];
-        const helperAssetsForLinking = ['data_helper_2', 'data_helper_3'];
-        // From package:complex_link
-        const mainAssetsForLinking = ['data_0', 'data_1'];
+        // From package:complex_link_helper.
+        const builtHelperAssets = [
+          'assets/data_helper_0.json',
+          'assets/data_helper_1.json',
+        ];
+        const helperAssetsForLinking = [
+          'assets/data_helper_2.json',
+          'assets/data_helper_3.json',
+        ];
+        // From package:complex_link.
+        const mainAssetsForLinking = [
+          'assets/data_0.json',
+          'assets/data_1.json',
+        ];
         final assetsForLinking = [
           ...helperAssetsForLinking,
           ...mainAssetsForLinking,

pkgs/native_assets_builder/test/build_runner/link_test.dart

@@ -58,11 +58,20 @@ void main() async {
     timeout: longTimeout,
     () async {
       await inTempDir((tempUri) async {
-        // From package:complex_link_helper
-        const builtHelperAssets = ['data_helper_0', 'data_helper_1'];
-        const helperAssetsForLinking = ['data_helper_2', 'data_helper_3'];
-        // From package:complex_link
-        const mainAssetsForLinking = ['data_0', 'data_1'];
+        // From package:complex_link_helper.
+        const builtHelperAssets = [
+          'assets/data_helper_0.json',
+          'assets/data_helper_1.json',
+        ];
+        const helperAssetsForLinking = [
+          'assets/data_helper_2.json',
+          'assets/data_helper_3.json',
+        ];
+        // From package:complex_link.
+        const mainAssetsForLinking = [
+          'assets/data_0.json',
+          'assets/data_1.json',
+        ];
         final assetsForLinking = [
           ...helperAssetsForLinking,
           ...mainAssetsForLinking,

pkgs/native_assets_builder/test_data/complex_link/hook/build.dart

@@ -18,8 +18,12 @@ void main(List<String> args) async {
       if (dataAsset is! File) {
         continue;
       }
-      final fileName = dataAsset.uri.pathSegments.last;
-      final name = fileName.split('.').first;
+
+      // The file path relative to the package root, with forward slashes.
+      final name = dataAsset.uri
+          .toFilePath(windows: false)
+          .substring(config.packageRoot.toFilePath(windows: false).length);
+
       output.addAsset(
         DataAsset(
           package: packageName,

pkgs/native_assets_builder/test_data/complex_link/hook/link.dart

@@ -12,4 +12,4 @@ void main(List<String> args) async {
 }
 
 Iterable<Asset> treeshake(Iterable<Asset> assets) =>
-    assets.where((asset) => !asset.id.endsWith('data_helper_2'));
+    assets.where((asset) => !asset.id.endsWith('assets/data_helper_2.json'));

pkgs/native_assets_builder/test_data/complex_link_helper/hook/build.dart

@@ -18,8 +18,12 @@ void main(List<String> args) async {
       if (dataAsset is! File) {
         continue;
       }
-      final fileName = dataAsset.uri.pathSegments.last;
-      final name = fileName.split('.').first;
+
+      // The file path relative to the package root, with forward slashes.
+      final name = dataAsset.uri
+          .toFilePath(windows: false)
+          .substring(config.packageRoot.toFilePath(windows: false).length);
+
       final forLinking = name.contains('2') || name.contains('3');
       output.addAsset(
         DataAsset(

pkgs/native_assets_builder/test_data/manifest.yaml

@@ -85,7 +85,7 @@
 - simple_link/hook/link.dart
 - simple_link/pubspec.yaml
 - simple_data_asset/pubspec.yaml
-- simple_data_asset/asset/test_asset.txt
+- simple_data_asset/assets/test_asset.txt
 - simple_data_asset/README.md
 - simple_data_asset/hook/build.dart
 - simple_data_asset/bin/simple_data_asset.dart.debug

pkgs/native_assets_builder/test_data/simple_data_asset/asset/test_asset.txt renamed to pkgs/native_assets_builder/test_data/simple_data_asset/assets/test_asset.txt

@@ -10,7 +10,7 @@ Future<void> main(List<String> args) async {
 
 // Expect this to throw
 Future<String> getWorld() async {
-  const asset = ByteAsset('package:simple_data_asset/test_asset.txt');
+  const asset = ByteAsset('package:simple_data_asset/assets/test_asset.txt');
   final byteBuffer = await asset.load();
   byteBuffer.buffer.asFloat32List()[0] = 1.0;
   return String.fromCharCodes(byteBuffer);

pkgs/native_assets_builder/test_data/simple_data_asset/bin/deep_modify_data_asset.dart.debug

@@ -10,7 +10,7 @@ Future<void> main(List<String> args) async {
 
 // Expect this to throw
 Future<String> getWorld() async {
-  const asset = ByteAsset('package:simple_data_asset/test_asset.txt');
+  const asset = ByteAsset('package:simple_data_asset/assets/test_asset.txt');
   final byteBuffer = await asset.load();
   byteBuffer[0] = 42;
   return String.fromCharCodes(byteBuffer);

pkgs/native_assets_builder/test_data/simple_data_asset/bin/modify_data_asset.dart.debug

@@ -8,7 +8,7 @@ Future<void> main(List<String> args) async {
 }
 
 Future<String> getWorld() async {
-  const asset = ByteAsset('package:simple_data_asset/test_asset.txt');
+  const asset = ByteAsset('package:simple_data_asset/assets/test_asset.txt');
   final byteBuffer = await asset.load();
   return String.fromCharCodes(byteBuffer);
 }

pkgs/native_assets_builder/test_data/simple_data_asset/bin/simple_data_asset.dart.debug

@@ -18,7 +18,12 @@ void main(List<String> args) async {
         if (dataAsset is! File) {
           continue;
         }
-        final name = dataAsset.uri.pathSegments.last;
+
+        // The file path relative to the package root, with forward slashes.
+        final name = dataAsset.uri
+            .toFilePath(windows: false)
+            .substring(config.packageRoot.toFilePath(windows: false).length);
+
         output.addAsset(
           DataAsset(
             package: config.packageName,

pkgs/native_assets_builder/test_data/simple_data_asset/hook/build.dart

@@ -18,8 +18,12 @@ void main(List<String> args) async {
       if (dataAsset is! File) {
         continue;
       }
-      final fileName = dataAsset.uri.pathSegments.last;
-      final name = fileName.split('.').first;
+
+      // The file path relative to the package root, with forward slashes.
+      final name = dataAsset.uri
+          .toFilePath(windows: false)
+          .substring(config.packageRoot.toFilePath(windows: false).length);
+
       output.addAsset(
         DataAsset(
           package: packageName,

pkgs/native_assets_builder/test_data/simple_link/hook/build.dart

@@ -2,7 +2,8 @@
 
 - Fix some more cases of: `BuildConfig.dependencies` and
   `LinkConfig.dependencies` no longer have to specify Dart sources.
-- `DataAsset` examples report all assets from `assets/` dir.
+- `DataAsset` examples report all assets from `assets/` dir and default the
+  asset names to the path inside the package.
 
 ## 0.7.2
 

pkgs/native_assets_cli/CHANGELOG.md

@@ -18,8 +18,12 @@ void main(List<String> args) async {
       if (dataAsset is! File) {
         continue;
       }
-      final fileName = dataAsset.uri.pathSegments.last;
-      final name = fileName.split('.').first;
+
+      // The file path relative to the package root, with forward slashes.
+      final name = dataAsset.uri
+          .toFilePath(windows: false)
+          .substring(config.packageRoot.toFilePath(windows: false).length);
+
       output.addAsset(
         DataAsset(
           package: packageName,

pkgs/native_assets_cli/example/link/package_with_assets/hook/build.dart

@@ -6,8 +6,8 @@ import 'package:meta/meta.dart';
 
 //TODO: Actually use the assets, needs the AssetBundle interface for Dart. See
 //also https://github.com/dart-lang/sdk/issues/54003.
-@ResourceIdentifier('used_asset')
+@ResourceIdentifier('assets/used_asset.json')
 String someMethod() => 'Using used_asset';
 
-@ResourceIdentifier('unused_asset')
+@ResourceIdentifier('assets/unused_asset.json')
 String someOtherMethod() => 'Using unused_asset';