[hooks] Run link hooks in order

pkgs/code_assets/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.20.0
+
+* Enable passing metadata from link hooks of a package to the link hooks in 
+  depending packages, by fixing the link hook execution order.
+
 ## 0.19.4
 
 * Add doc comments to all public members.

pkgs/code_assets/lib/src/code_assets/config.dart

@@ -185,11 +185,19 @@ final class LinkOutputCodeAssetBuilder {
 
   LinkOutputCodeAssetBuilder._(this._output);
 
-  /// Adds the given [asset] to the link hook output.
-  void add(CodeAsset asset) => _output.addEncodedAsset(asset.encode());
+  /// Adds the given [asset] to the hook output with [routing].
+  void add(CodeAsset asset, {LinkAssetRouting routing = const ToAppBundle()}) =>
+      _output.addEncodedAsset(asset.encode(), routing: routing);
 
-  /// Adds the given [assets] to the link hook output.
-  void addAll(Iterable<CodeAsset> assets) => assets.forEach(add);
+  /// Adds the given [assets] to the hook output with [routing].
+  void addAll(
+    Iterable<CodeAsset> assets, {
+    LinkAssetRouting routing = const ToAppBundle(),
+  }) {
+    for (final asset in assets) {
+      add(asset, routing: routing);
+    }
+  }
 }
 
 /// Extension to initialize code specific configuration on link/build inputs.

pkgs/code_assets/lib/src/code_assets/validation.dart

@@ -91,8 +91,7 @@ Future<ValidationErrors> validateCodeAssetBuildOutput(
   output.assets.encodedAssets,
   [
     ...output.assets.encodedAssetsForBuild,
-    for (final assetList in output.assets.encodedAssetsForLinking.values)
-      ...assetList,
+    ...output.assets.encodedAssetsForLinking.values.expand((l) => l),
   ],
   output,
   true,
@@ -106,7 +105,7 @@ Future<ValidationErrors> validateCodeAssetLinkOutput(
   input,
   input.config.code,
   output.assets.encodedAssets,
-  [],
+  output.assets.encodedAssetsForLink.values.expand((l) => l),
   output,
   false,
 );
@@ -135,8 +134,8 @@ Future<ValidationErrors> validateCodeAssetInApplication(
 Future<ValidationErrors> _validateCodeAssetBuildOrLinkOutput(
   HookInput input,
   CodeConfig codeConfig,
-  List<EncodedAsset> encodedAssetsBundled,
-  List<EncodedAsset> encodedAssetsNotBundled,
+  Iterable<EncodedAsset> encodedAssetsBundled,
+  Iterable<EncodedAsset> encodedAssetsNotBundled,
   HookOutput output,
   bool isBuild,
 ) async {

pkgs/code_assets/pubspec.yaml

@@ -3,7 +3,7 @@ description: >-
   This library contains the hook protocol specification for bundling native code
   with Dart packages.
 
-version: 0.19.4
+version: 0.20.0
 
 repository: https://github.com/dart-lang/native/tree/main/pkgs/code_assets
 
@@ -21,7 +21,7 @@ environment:
 
 dependencies:
   collection: ^1.19.1
-  hooks: ^0.19.5
+  hooks: ^0.20.0
 
 dev_dependencies:
   custom_lint: ^0.7.5

pkgs/code_assets/test/code_assets/config_test.dart

@@ -87,6 +87,7 @@ void main() async {
         'extensions': {'code_assets': codeConfig},
         if (hookType == 'build') 'linking_enabled': false,
       },
+      if (hookType == 'link') 'internal_assets': [],
       'out_dir_shared': outputDirectoryShared.toFilePath(),
       'out_file': outFile.toFilePath(),
       'package_name': packageName,
@@ -168,7 +169,7 @@ void main() async {
         outputFile: outFile,
         outputDirectoryShared: outputDirectoryShared,
       )
-      ..setupLink(assets: assets, recordedUsesFile: null)
+      ..setupLink(assets: assets, recordedUsesFile: null, internalAssets: [])
       ..addExtension(
         CodeAssetExtension(
           targetOS: OS.android,

pkgs/data_assets/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.20.0
+
+* Enable passing metadata from link hooks of a package to the link hooks in 
+  depending packages, by fixing the link hook execution order.
+
 ## 0.19.1
 
 * Bump the SDK constraint to at least the one from `package:hooks` to fix

pkgs/data_assets/lib/src/data_assets/config.dart

@@ -27,11 +27,24 @@ extension BuildOutputBuilderAddDataAssetsDirectories on BuildOutputBuilder {
     List<String> paths, {
     required BuildInput input,
     bool recursive = false,
+    AssetRouting routing = const ToAppBundle(),
   }) async {
     String assetName(Uri assetUri) => assetUri
         .toFilePath(windows: false)
         .substring(input.packageRoot.toFilePath().length);
 
+    void addAsset(File file) {
+      assets.data.add(
+        DataAsset(
+          package: input.packageName,
+          name: assetName(file.uri),
+          file: file.uri,
+        ),
+        routing: routing,
+      );
+      addDependency(file.uri);
+    }
+
     for (final path in paths) {
       final resolvedUri = input.packageRoot.resolve(path);
       final directory = Directory.fromUri(resolvedUri);
@@ -45,15 +58,10 @@ extension BuildOutputBuilderAddDataAssetsDirectories on BuildOutputBuilder {
             followLinks: false,
           )) {
             if (entity is File) {
-              assets.data.add(
-                DataAsset(
-                  package: input.packageName,
-                  name: assetName(entity.uri),
-                  file: entity.uri,
-                ),
-              );
+              addAsset(entity);
+            } else {
+              addDependency(entity.uri);
             }
-            addDependency(entity.uri);
           }
         } on FileSystemException catch (e) {
           throw FileSystemException(
@@ -63,14 +71,7 @@ extension BuildOutputBuilderAddDataAssetsDirectories on BuildOutputBuilder {
           );
         }
       } else if (await file.exists()) {
-        assets.data.add(
-          DataAsset(
-            package: input.packageName,
-            name: assetName(file.uri),
-            file: file.uri,
-          ),
-        );
-        addDependency(file.uri);
+        addAsset(file);
       } else {
         throw FileSystemException(
           'Path does not exist',
@@ -140,10 +141,18 @@ final class LinkOutputDataAssetsBuilder {
   LinkOutputDataAssetsBuilder(this._output);
 
   /// Adds the given [asset] to the link hook output.
-  void add(DataAsset asset) => _output.addEncodedAsset(asset.encode());
+  void add(DataAsset asset, {LinkAssetRouting routing = const ToAppBundle()}) =>
+      _output.addEncodedAsset(asset.encode(), routing: routing);
 
   /// Adds the given [assets] to the link hook output.
-  void addAll(Iterable<DataAsset> assets) => assets.forEach(add);
+  void addAll(
+    Iterable<DataAsset> assets, {
+    LinkAssetRouting routing = const ToAppBundle(),
+  }) {
+    for (final asset in assets) {
+      add(asset, routing: routing);
+    }
+  }
 }
 
 /// Provides access to [DataAsset]s from a build hook output.

pkgs/data_assets/pubspec.yaml

@@ -3,7 +3,7 @@ description: >-
   This library contains the hook protocol specification for bundling data assets
   with Dart packages.
 
-version: 0.19.1
+version: 0.20.0
 
 repository: https://github.com/dart-lang/native/tree/main/pkgs/data_assets
 
@@ -17,7 +17,7 @@ environment:
   sdk: '>=3.9.0-21.0.dev <4.0.0'
 
 dependencies:
-  hooks: ^0.19.5
+  hooks: ^0.20.0
 
 dev_dependencies:
   custom_lint: ^0.7.5

pkgs/hooks/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.20.0
+
+* Enable passing metadata from link hooks of a package to the link hooks in 
+  depending packages, by fixing the link hook execution order.
+
 ## 0.19.5
 
 * Stop leaking unexported symbols.

pkgs/hooks/doc/schema/shared/shared_definitions.schema.json

@@ -250,6 +250,12 @@
             "$ref": "#/definitions/Asset"
           }
         },
+        "internal_assets": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Asset"
+          }
+        },
         "resource_identifiers": {
           "$ref": "#/definitions/absolutePath"
         }
@@ -261,6 +267,18 @@
       ]
     },
     "LinkOutput": {
+      "type": "object",
+      "properties": {
+        "assets_for_link": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/Asset"
+            }
+          }
+        }
+      },
       "allOf": [
         {
           "$ref": "#/definitions/HookOutput"

pkgs/hooks/lib/hooks.dart

@@ -41,6 +41,7 @@ export 'src/config.dart'
         HookOutputBuilder,
         HookOutputFailure,
         InfraError,
+        LinkAssetRouting,
         LinkConfig,
         LinkConfigBuilder,
         LinkInput,