[native_assets_cli] Format with Dart 3.8 (#2195)

The CI will be red soon because `package:native_assets_cli` is opted in to a Dart 3.8 dev release.

When the CI will be red, we should land this PR to make it green again.

The PR will be red before a new dart dev release is cut. (Tuesday?)

Bug: #2194

Author: dcharkes

pkgs/native_assets_cli/lib/src/code_assets/architecture.dart

@@ -100,11 +100,11 @@ extension ArchitectureSyntax on Architecture {
 
   syntax.Architecture toSyntax() => _toSyntax[this]!;
 
-  static Architecture fromSyntax(
-    syntax.Architecture syntax,
-  ) => switch (_fromSyntax[syntax]) {
-    null =>
-      throw FormatException('The architecture "${syntax.name}" is not known'),
-    final arch => arch,
-  };
+  static Architecture fromSyntax(syntax.Architecture syntax) =>
+      switch (_fromSyntax[syntax]) {
+        null => throw FormatException(
+          'The architecture "${syntax.name}" is not known',
+        ),
+        final arch => arch,
+      };
 }

pkgs/native_assets_cli/lib/src/code_assets/c_compiler_config.dart

@@ -22,10 +22,9 @@ final class CCompilerConfig {
 
   /// Configuration provided when [CodeConfig.targetOS] is [OS.windows].
   WindowsCCompilerConfig get windows => switch (_windows) {
-    null =>
-      throw StateError(
-        'Cannot access windows if CodeConfig.targetOS is not Windows',
-      ),
+    null => throw StateError(
+      'Cannot access windows if CodeConfig.targetOS is not Windows',
+    ),
     final c => c,
   };
 

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

@@ -18,10 +18,9 @@ extension CodeAssetHookConfig on HookConfig {
   /// Code asset specific configuration.
   CodeConfig get code => CodeConfig._fromJson(json, path);
 
-  bool get buildCodeAssets =>
-      buildAssetTypes
-          .where((e) => CodeAssetType.typesForBuildAssetTypes.contains(e))
-          .isNotEmpty;
+  bool get buildCodeAssets => buildAssetTypes
+      .where((e) => CodeAssetType.typesForBuildAssetTypes.contains(e))
+      .isNotEmpty;
 }
 
 /// Extension to the [LinkInput] providing access to configuration specific to
@@ -78,17 +77,17 @@ class CodeConfig {
 
   /// Configuration provided when [CodeConfig.targetOS] is [OS.android].
   AndroidCodeConfig get android => switch (_syntax.android) {
-    null =>
-      throw StateError(
-        'Cannot access androidConfig if targetOS is not android.',
-      ),
+    null => throw StateError(
+      'Cannot access androidConfig if targetOS is not android.',
+    ),
     final c => AndroidCodeConfig._(c),
   };
 
   /// Configuration provided when [CodeConfig.targetOS] is [OS.macOS].
   MacOSCodeConfig get macOS => switch (_syntax.macOS) {
-    null =>
-      throw StateError('Cannot access macOSConfig if targetOS is not MacOS.'),
+    null => throw StateError(
+      'Cannot access macOSConfig if targetOS is not MacOS.',
+    ),
     final c => MacOSCodeConfig._(c),
   };
 }
@@ -217,21 +216,19 @@ extension CodeAssetBuildInputBuilder on HookConfigBuilder {
 /// Provides access to [CodeAsset]s from a build hook output.
 extension CodeAssetBuildOutput on BuildOutputAssets {
   /// The code assets emitted by the build hook.
-  List<CodeAsset> get code =>
-      encodedAssets
-          .where((asset) => asset.isCodeAsset)
-          .map(CodeAsset.fromEncoded)
-          .toList();
+  List<CodeAsset> get code => encodedAssets
+      .where((asset) => asset.isCodeAsset)
+      .map(CodeAsset.fromEncoded)
+      .toList();
 }
 
 /// Provides access to [CodeAsset]s from a link hook output.
 extension CodeAssetLinkOutput on LinkOutputAssets {
   /// The code assets emitted by the link hook.
-  List<CodeAsset> get code =>
-      encodedAssets
-          .where((asset) => asset.isCodeAsset)
-          .map(CodeAsset.fromEncoded)
-          .toList();
+  List<CodeAsset> get code => encodedAssets
+      .where((asset) => asset.isCodeAsset)
+      .map(CodeAsset.fromEncoded)
+      .toList();
 }
 
 extension MacOSCodeConfigSyntax on MacOSCodeConfig {

pkgs/native_assets_cli/lib/src/code_assets/testing.dart

@@ -39,21 +39,18 @@ Future<void> testCodeBuildHook({
     cCompiler: cCompiler,
     targetArchitecture: targetArchitecture ?? Architecture.current,
     targetOS: targetOS ?? OS.current,
-    iOS:
-        targetOS == OS.iOS
-            ? IOSCodeConfig(
-              targetSdk: targetIOSSdk!,
-              targetVersion: targetIOSVersion!,
-            )
-            : null,
-    macOS:
-        targetOS == OS.macOS
-            ? MacOSCodeConfig(targetVersion: targetMacOSVersion!)
-            : null,
-    android:
-        targetOS == OS.android
-            ? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
-            : null,
+    iOS: targetOS == OS.iOS
+        ? IOSCodeConfig(
+            targetSdk: targetIOSSdk!,
+            targetVersion: targetIOSVersion!,
+          )
+        : null,
+    macOS: targetOS == OS.macOS
+        ? MacOSCodeConfig(targetVersion: targetMacOSVersion!)
+        : null,
+    android: targetOS == OS.android
+        ? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
+        : null,
   );
   await testBuildHook(
     mainMethod: mainMethod,

pkgs/native_assets_cli/lib/src/config.dart

@@ -103,10 +103,9 @@ extension type HookInputUserDefines._(HookInput _input) {
 }
 
 sealed class HookInputBuilder {
-  final _syntax =
-      syntax.HookInput.fromJson({})
-        ..version = latestVersion.toString()
-        ..config = syntax.Config(buildAssetTypes: [], extensions: null);
+  final _syntax = syntax.HookInput.fromJson({})
+    ..version = latestVersion.toString()
+    ..config = syntax.Config(buildAssetTypes: [], extensions: null);
 
   Map<String, Object?> get json => _syntax.json;
 
@@ -129,8 +128,9 @@ sealed class HookInputBuilder {
     _syntax.outDir = outputDirectory;
     _syntax.outDirShared = outputDirectoryShared;
     _syntax.outFile = outputFile;
-    _syntax.userDefines =
-        userDefines == null ? null : syntax.JsonObject.fromJson(userDefines);
+    _syntax.userDefines = userDefines == null
+        ? null
+        : syntax.JsonObject.fromJson(userDefines);
   }
 
   /// Constructs a checksum for a [BuildInput].
@@ -237,16 +237,15 @@ final class BuildInputBuilder extends HookInputBuilder {
       dependencyMetadata: {
         for (final key in metadata.keys) key: metadata[key]!.toJson(),
       },
-      assets:
-          assets == null
-              ? null
-              : {
-                for (final MapEntry(:key, :value) in assets.entries)
-                  key: [
-                    for (final asset in value)
-                      syntax.Asset.fromJson(asset.toJson()),
-                  ],
-              },
+      assets: assets == null
+          ? null
+          : {
+              for (final MapEntry(:key, :value) in assets.entries)
+                key: [
+                  for (final asset in value)
+                    syntax.Asset.fromJson(asset.toJson()),
+                ],
+            },
     );
   }
 
@@ -332,13 +331,12 @@ final class LinkInputBuilder extends HookInputBuilder {
       extension.setupLinkInput(this);
 }
 
-List<EncodedAsset> _parseAssets(List<syntax.Asset>? assets) =>
-    assets == null
-        ? []
-        : [
-          for (final asset in assets)
-            EncodedAsset.fromJson(asset.json, asset.path),
-        ];
+List<EncodedAsset> _parseAssets(List<syntax.Asset>? assets) => assets == null
+    ? []
+    : [
+        for (final asset in assets)
+          EncodedAsset.fromJson(asset.json, asset.path),
+      ];
 
 sealed class HookOutput {
   /// The underlying json configuration of this [HookOutput].

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

@@ -81,10 +81,9 @@ extension AddDataAssetsDirectory on BuildOutputBuilder {
 /// Extension to the [HookConfig] providing access to configuration specific
 /// to data assets.
 extension DataAssetHookConfig on HookConfig {
-  bool get buildDataAssets =>
-      buildAssetTypes
-          .where((e) => DataAssetType.typesForBuildAssetTypes.contains(e))
-          .isNotEmpty;
+  bool get buildDataAssets => buildAssetTypes
+      .where((e) => DataAssetType.typesForBuildAssetTypes.contains(e))
+      .isNotEmpty;
 }
 
 /// Extension to initialize data specific configuration on link/build inputs.
@@ -149,18 +148,16 @@ extension type DataAssetLinkOutputBuilderAdd(
 
 /// Provides access to [DataAsset]s from a build hook output.
 extension DataAssetBuildOutput on BuildOutputAssets {
-  List<DataAsset> get data =>
-      encodedAssets
-          .where((asset) => asset.isDataAsset)
-          .map<DataAsset>(DataAsset.fromEncoded)
-          .toList();
+  List<DataAsset> get data => encodedAssets
+      .where((asset) => asset.isDataAsset)
+      .map<DataAsset>(DataAsset.fromEncoded)
+      .toList();
 }
 
 /// Provides access to [DataAsset]s from a link hook output.
 extension DataAssetLinkOutput on LinkOutputAssets {
-  List<DataAsset> get data =>
-      encodedAssets
-          .where((asset) => asset.isDataAsset)
-          .map<DataAsset>(DataAsset.fromEncoded)
-          .toList();
+  List<DataAsset> get data => encodedAssets
+      .where((asset) => asset.isDataAsset)
+      .map<DataAsset>(DataAsset.fromEncoded)
+      .toList();
 }

pkgs/native_assets_cli/lib/src/encoded_asset.dart

@@ -36,15 +36,14 @@ final class EncodedAsset {
   ]) {
     final syntax_ = syntax.Asset.fromJson(json, path: path ?? []);
     final encodingSyntax = syntax_.encoding;
-    final encoding =
-        encodingSyntax != null
-            // If 'encoding' is provided, copy that.
-            ? Map.of(encodingSyntax.json)
-            // Otherwise, fall back to copying the keys except for 'type'.
-            : {
-              for (final key in json.keys)
-                if (key != _typeKey) key: json[key],
-            };
+    final encoding = encodingSyntax != null
+        // If 'encoding' is provided, copy that.
+        ? Map.of(encodingSyntax.json)
+        // Otherwise, fall back to copying the keys except for 'type'.
+        : {
+            for (final key in json.keys)
+              if (key != _typeKey) key: json[key],
+          };
     final path_ = encodingSyntax != null ? [...?path, 'encoding'] : path;
 
     return EncodedAsset._(

pkgs/native_assets_cli/lib/src/model/resource_identifiers.dart

@@ -20,11 +20,10 @@ class ResourceIdentifiers {
   factory ResourceIdentifiers.fromFileContents(String fileContents) {
     final fileJson = (jsonDecode(fileContents) as Map)['identifiers'] as List;
     return ResourceIdentifiers(
-      identifiers:
-          fileJson
-              .map((e) => e as Map<String, Object?>)
-              .map(Identifier.fromJson)
-              .toList(),
+      identifiers: fileJson
+          .map((e) => e as Map<String, Object?>)
+          .map(Identifier.fromJson)
+          .toList(),
     );
   }
 

pkgs/native_assets_cli/lib/src/target.dart

@@ -114,30 +114,29 @@ final class Target implements Comparable<Target> {
 
   Architecture get architecture => Architecture.fromAbi(abi);
 
-  OS get os =>
-      {
-        Abi.androidArm: OS.android,
-        Abi.androidArm64: OS.android,
-        Abi.androidIA32: OS.android,
-        Abi.androidX64: OS.android,
-        Abi.androidRiscv64: OS.android,
-        Abi.fuchsiaArm64: OS.fuchsia,
-        Abi.fuchsiaX64: OS.fuchsia,
-        Abi.iosArm: OS.iOS,
-        Abi.iosArm64: OS.iOS,
-        Abi.iosX64: OS.iOS,
-        Abi.linuxArm: OS.linux,
-        Abi.linuxArm64: OS.linux,
-        Abi.linuxIA32: OS.linux,
-        Abi.linuxRiscv32: OS.linux,
-        Abi.linuxRiscv64: OS.linux,
-        Abi.linuxX64: OS.linux,
-        Abi.macosArm64: OS.macOS,
-        Abi.macosX64: OS.macOS,
-        Abi.windowsArm64: OS.windows,
-        Abi.windowsIA32: OS.windows,
-        Abi.windowsX64: OS.windows,
-      }[abi]!;
+  OS get os => {
+    Abi.androidArm: OS.android,
+    Abi.androidArm64: OS.android,
+    Abi.androidIA32: OS.android,
+    Abi.androidX64: OS.android,
+    Abi.androidRiscv64: OS.android,
+    Abi.fuchsiaArm64: OS.fuchsia,
+    Abi.fuchsiaX64: OS.fuchsia,
+    Abi.iosArm: OS.iOS,
+    Abi.iosArm64: OS.iOS,
+    Abi.iosX64: OS.iOS,
+    Abi.linuxArm: OS.linux,
+    Abi.linuxArm64: OS.linux,
+    Abi.linuxIA32: OS.linux,
+    Abi.linuxRiscv32: OS.linux,
+    Abi.linuxRiscv64: OS.linux,
+    Abi.linuxX64: OS.linux,
+    Abi.macosArm64: OS.macOS,
+    Abi.macosX64: OS.macOS,
+    Abi.windowsArm64: OS.windows,
+    Abi.windowsIA32: OS.windows,
+    Abi.windowsX64: OS.windows,
+  }[abi]!;
 
   @override
   String toString() => dartVMToString();
@@ -154,16 +153,15 @@ final class Target implements Comparable<Target> {
   /// A list of supported target [Target]s from this host [os].
   List<Target> supportedTargetTargets({
     Map<OS, List<OS>> osCrossCompilation = OS.osCrossCompilationDefault,
-  }) =>
-      Target.values
-          .where(
-            (target) =>
-                // Only valid cross compilation.
-                osCrossCompilation[os]!.contains(target.os) &&
-                // And no deprecated architectures.
-                target != Target.iOSArm,
-          )
-          .sorted;
+  }) => Target.values
+      .where(
+        (target) =>
+            // Only valid cross compilation.
+            osCrossCompilation[os]!.contains(target.os) &&
+            // And no deprecated architectures.
+            target != Target.iOSArm,
+      )
+      .sorted;
 }
 
 /// Common methods for manipulating iterables of [Target]s.

pkgs/native_assets_cli/lib/test.dart

@@ -36,8 +36,9 @@ Future<void> testBuildHook({
 
   try {
     // Deal with Windows temp folder aliases.
-    final tempUri =
-        Directory(await tempDir.resolveSymbolicLinks()).uri.normalizePath();
+    final tempUri = Directory(
+      await tempDir.resolveSymbolicLinks(),
+    ).uri.normalizePath();
     final outputDirectory = tempUri.resolve('output/');
     final outputDirectoryShared = tempUri.resolve('output_shared/');
     final outputFile = tempUri.resolve('output.json');