Allow custom build/link configuration, decouple core CLI infrastructure from code assets, data assets, ...

pkgs/native_assets_builder/lib/src/model/build_dry_run_result.dart

@@ -4,19 +4,12 @@
 
 import 'package:native_assets_cli/native_assets_cli_internal.dart';
 
-import '../../native_assets_builder.dart';
-
 /// The result of executing the build hooks in dry run mode from all packages in
 /// the dependency tree of the entry point application.
 abstract interface class BuildDryRunResult {
   /// The native assets produced by the hooks, which should be bundled.
   List<EncodedAsset> get encodedAssets;
 
-  /// Whether all hooks completed without errors.
-  ///
-  /// All error messages are streamed to [NativeAssetsBuildRunner.logger].
-  bool get success;
-
   /// The native assets produced by the hooks, which should be linked.
   Map<String, List<EncodedAsset>> get encodedAssetsForLinking;
 }

pkgs/native_assets_builder/lib/src/model/build_result.dart

@@ -4,19 +4,12 @@
 
 import 'package:native_assets_cli/native_assets_cli_internal.dart';
 
-import '../build_runner/build_runner.dart';
-
 /// The result of executing build hooks from all packages in the dependency tree
 /// of the entry point application.
 abstract class BuildResult {
   /// The files used by the hooks.
   List<Uri> get dependencies;
 
-  /// Whether all hooks completed without errors.
-  ///
-  /// All error messages are streamed to [NativeAssetsBuildRunner.logger].
-  bool get success;
-
   /// The native assets produced by the hooks, which should be bundled.
   List<EncodedAsset> get encodedAssets;
 

pkgs/native_assets_builder/lib/src/model/hook_result.dart

@@ -22,61 +22,48 @@ final class HookResult implements BuildResult, BuildDryRunResult, LinkResult {
   @override
   final List<Uri> dependencies;
 
-  /// Whether all hooks completed without errors.
-  ///
-  /// All error messages are streamed to [NativeAssetsBuildRunner.logger].
-  @override
-  final bool success;
-
   HookResult._({
     required this.encodedAssets,
     required this.encodedAssetsForLinking,
     required this.dependencies,
-    required this.success,
   });
 
   factory HookResult({
     List<EncodedAsset>? encodedAssets,
     Map<String, List<EncodedAsset>>? encodedAssetsForLinking,
     List<Uri>? dependencies,
-    bool success = true,
   }) =>
       HookResult._(
         encodedAssets: encodedAssets ?? [],
         encodedAssetsForLinking: encodedAssetsForLinking ?? {},
         dependencies: dependencies ?? [],
-        success: success,
       );
 
-  factory HookResult.failure() => HookResult(success: false);
-
-  HookResult copyAdd(HookOutputImpl hookOutput, bool hookSuccess) {
-    final mergedMaps =
-        mergeMaps(encodedAssetsForLinking, hookOutput.encodedAssetsForLinking,
-            value: (encodedAssets1, encodedAssets2) => [
-                  ...encodedAssets1,
-                  ...encodedAssets2,
-                ]);
+  HookResult copyAdd(HookOutput hookOutput) {
+    final mergedMaps = mergeMaps(
+        encodedAssetsForLinking,
+        hookOutput is BuildOutput
+            ? hookOutput.encodedAssetsForLinking
+            : <String, List<EncodedAsset>>{},
+        value: (encodedAssets1, encodedAssets2) => [
+              ...encodedAssets1,
+              ...encodedAssets2,
+            ]);
+    final hookOutputAssets = (hookOutput is BuildOutput)
+        ? hookOutput.encodedAssets
+        : (hookOutput as LinkOutput).encodedAssets;
     return HookResult(
       encodedAssets: [
         ...encodedAssets,
-        ...hookOutput.encodedAssets,
+        ...hookOutputAssets,
       ],
       encodedAssetsForLinking: mergedMaps,
       dependencies: [
         ...dependencies,
         ...hookOutput.dependencies,
       ]..sort(_uriCompare),
-      success: success && hookSuccess,
     );
   }
-
-  HookResult withSuccess(bool success) => HookResult(
-        encodedAssets: encodedAssets,
-        encodedAssetsForLinking: encodedAssetsForLinking,
-        dependencies: dependencies,
-        success: success,
-      );
 }
 
 int _uriCompare(Uri u1, Uri u2) => u1.toString().compareTo(u2.toString());

pkgs/native_assets_builder/lib/src/model/link_result.dart

@@ -4,8 +4,6 @@
 
 import 'package:native_assets_cli/native_assets_cli_internal.dart';
 
-import '../build_runner/build_runner.dart';
-
 /// The result of executing the link hooks in dry run mode from all packages in
 /// the dependency tree of the entry point application.
 abstract interface class LinkResult {
@@ -15,9 +13,4 @@ abstract interface class LinkResult {
 
   /// The files used by the hooks.
   List<Uri> get dependencies;
-
-  /// Whether all hooks completed without errors.
-  ///
-  /// All error messages are streamed to [NativeAssetsBuildRunner.logger].
-  bool get success;
 }

pkgs/native_assets_builder/test/build_runner/build_dependencies_test.dart

@@ -26,15 +26,15 @@ void main() async {
       // Trigger a build, should invoke build for libraries with native assets.
       {
         final logMessages = <String>[];
-        final result = await build(
+        final result = (await build(
           packageUri,
           logger,
           dartExecutable,
           capturedLogs: logMessages,
           supportedAssetTypes: [CodeAsset.type],
           buildValidator: validateCodeAssetBuildOutput,
           applicationAssetValidator: validateCodeAssetsInApplication,
-        );
+        ))!;
         expect(
           logMessages.join('\n'),
           stringContainsInOrder(

pkgs/native_assets_builder/test/build_runner/build_runner_asset_id_test.dart

@@ -32,7 +32,7 @@ void main() async {
           applicationAssetValidator: validateCodeAssetsInApplication,
         );
         final fullLog = logMessages.join('\n');
-        expect(result.success, false);
+        expect(result, isNull);
         expect(
           fullLog,
           contains('does not start with "package:wrong_namespace_asset/"'),
@@ -66,7 +66,7 @@ void main() async {
           buildValidator: validateCodeAssetBuildOutput,
           applicationAssetValidator: validateCodeAssetsInApplication,
         );
-        expect(result.success, true);
+        expect(result, isNotNull);
       }
     });
   });

pkgs/native_assets_builder/test/build_runner/build_runner_build_dry_run_test.dart

@@ -23,22 +23,22 @@ void main() async {
         logger: logger,
       );
 
-      final dryRunResult = await buildDryRun(
+      final dryRunResult = (await buildDryRun(
         packageUri,
         logger,
         dartExecutable,
         linkingEnabled: false,
         supportedAssetTypes: [CodeAsset.type],
         buildValidator: validateCodeAssetBuildOutput,
-      );
-      final buildResult = await build(
+      ))!;
+      final buildResult = (await build(
         packageUri,
         logger,
         dartExecutable,
         supportedAssetTypes: [CodeAsset.type],
         buildValidator: validateCodeAssetBuildOutput,
         applicationAssetValidator: validateCodeAssetsInApplication,
-      );
+      ))!;
 
       expect(dryRunResult.encodedAssets.length, 1);
       expect(buildResult.encodedAssets.length, 1);

pkgs/native_assets_builder/test/build_runner/build_runner_build_output_format_test.dart

@@ -38,7 +38,7 @@ void main() async {
             applicationAssetValidator: validateCodeAssetsInApplication,
           );
           final fullLog = logMessages.join('\n');
-          expect(result.success, false);
+          expect(result, isNull);
           if (package == 'wrong_build_output_3') {
             // Should re-execute the process on second run.
             expect(

pkgs/native_assets_builder/test/build_runner/build_runner_caching_test.dart

@@ -28,15 +28,15 @@ void main() async {
 
       {
         final logMessages = <String>[];
-        final result = await build(
+        final result = (await build(
           packageUri,
           logger,
           dartExecutable,
           capturedLogs: logMessages,
           supportedAssetTypes: [CodeAsset.type],
           buildValidator: validateCodeAssetBuildOutput,
           applicationAssetValidator: validateCodeAssetsInApplication,
-        );
+        ))!;
         expect(
           logMessages.join('\n'),
           contains(
@@ -54,15 +54,15 @@ void main() async {
 
       {
         final logMessages = <String>[];
-        final result = await build(
+        final result = (await build(
           packageUri,
           logger,
           dartExecutable,
           capturedLogs: logMessages,
           supportedAssetTypes: [CodeAsset.type],
           buildValidator: validateCodeAssetBuildOutput,
           applicationAssetValidator: validateCodeAssetsInApplication,
-        );
+        ))!;
         expect(
           logMessages.join('\n'),
           contains('Skipping build for native_add'),
@@ -99,14 +99,14 @@ void main() async {
       await Future<void>.delayed(const Duration(seconds: 1));
 
       {
-        final result = await build(
+        final result = (await build(
           packageUri,
           logger,
           dartExecutable,
           supportedAssetTypes: [CodeAsset.type],
           buildValidator: validateCodeAssetBuildOutput,
           applicationAssetValidator: validateCodeAssetsInApplication,
-        );
+        ))!;
         await expectSymbols(
             asset: CodeAsset.fromEncoded(result.encodedAssets.single),
             symbols: ['add']);
@@ -118,14 +118,14 @@ void main() async {
       );
 
       {
-        final result = await build(
+        final result = (await build(
           packageUri,
           logger,
           dartExecutable,
           supportedAssetTypes: [CodeAsset.type],
           buildValidator: validateCodeAssetBuildOutput,
           applicationAssetValidator: validateCodeAssetsInApplication,
-        );
+        ))!;
         await expectSymbols(
           asset: CodeAsset.fromEncoded(result.encodedAssets.single),
           symbols: ['add', 'subtract'],
@@ -152,14 +152,14 @@ void main() async {
         // cached.
         await Future<void>.delayed(const Duration(seconds: 1));
 
-        final result = await build(
+        final result = (await build(
           packageUri,
           logger,
           dartExecutable,
           supportedAssetTypes: [CodeAsset.type],
           buildValidator: validateCodeAssetBuildOutput,
           applicationAssetValidator: validateCodeAssetsInApplication,
-        );
+        ))!;
         {
           final compiledHook = logMessages
               .where((m) =>
@@ -179,14 +179,14 @@ void main() async {
             targetUri: packageUri);
 
         {
-          final result = await build(
+          final result = (await build(
             packageUri,
             logger,
             dartExecutable,
             supportedAssetTypes: [CodeAsset.type],
             buildValidator: validateCodeAssetBuildOutput,
             applicationAssetValidator: validateCodeAssetsInApplication,
-          );
+          ))!;
           {
             final compiledHook = logMessages
                 .where((m) =>

pkgs/native_assets_builder/test/build_runner/build_runner_cycle_test.dart

@@ -31,7 +31,7 @@ void main() async {
           buildValidator: (config, output) async => [],
         );
         final fullLog = logMessages.join('\n');
-        expect(result.success, false);
+        expect(result, isNull);
         expect(
           fullLog,
           contains(
@@ -52,7 +52,7 @@ void main() async {
           applicationAssetValidator: (_) async => [],
         );
         final fullLog = logMessages.join('\n');
-        expect(result.success, false);
+        expect(result, isNull);
         expect(
           fullLog,
           contains(

pkgs/native_assets_builder/test/build_runner/build_runner_failure_test.dart

@@ -24,14 +24,14 @@ void main() async {
       );
 
       {
-        final result = await build(
+        final result = (await build(
           packageUri,
           logger,
           dartExecutable,
           supportedAssetTypes: [CodeAsset.type],
           buildValidator: validateCodeAssetBuildOutput,
           applicationAssetValidator: validateCodeAssetsInApplication,
-        );
+        ))!;
         expect(result.encodedAssets.length, 1);
         await expectSymbols(
             asset: CodeAsset.fromEncoded(result.encodedAssets.single),
@@ -60,7 +60,7 @@ void main() async {
           applicationAssetValidator: validateCodeAssetsInApplication,
         );
         final fullLog = logMessages.join('\n');
-        expect(result.success, false);
+        expect(result, isNull);
         expect(fullLog, contains('To reproduce run:'));
         final reproCommand = fullLog
             .split('\n')
@@ -78,14 +78,14 @@ void main() async {
       );
 
       {
-        final result = await build(
+        final result = (await build(
           packageUri,
           logger,
           dartExecutable,
           supportedAssetTypes: [CodeAsset.type],
           buildValidator: validateCodeAssetBuildOutput,
           applicationAssetValidator: validateCodeAssetsInApplication,
-        );
+        ))!;
         expect(result.encodedAssets.length, 1);
         await expectSymbols(
             asset: CodeAsset.fromEncoded(result.encodedAssets.single),