[native_assets_cli] Stablize config hashes (#2070)

Author: dcharkes

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

@@ -5,8 +5,7 @@
 import 'package:collection/collection.dart';
 
 import '../../code_assets.dart';
-import '../json_utils.dart';
-import '../utils/map.dart';
+import '../utils/json.dart';
 
 /// The configuration for a C toolchain.
 final class CCompilerConfig {
@@ -77,27 +76,26 @@ final class CCompilerConfig {
   ///
   /// The returned json can be used in [CCompilerConfig.fromJson] to
   /// obtain a [CCompilerConfig] again.
-  Map<String, Object> toJson() =>
-      {
-        _arConfigKey: archiver.toFilePath(),
-        _ccConfigKey: compiler.toFilePath(),
-        _ldConfigKey: linker.toFilePath(),
-        if (_windows?.developerCommandPrompt?.script != null)
-          _envScriptConfigKeyDeprecated:
-              _windows!.developerCommandPrompt!.script.toFilePath(),
-        if (_windows?.developerCommandPrompt?.arguments != null)
-          _envScriptArgsConfigKeyDeprecated:
-              _windows!.developerCommandPrompt!.arguments,
-        if (_windows != null)
-          _windowsConfigKey: {
-            if (_windows.developerCommandPrompt != null)
-              _developerCommandPromptConfigKey: {
-                _argumentsConfigKey: _windows.developerCommandPrompt!.arguments,
-                _scriptConfigKey:
-                    _windows.developerCommandPrompt!.script.toFilePath(),
-              },
+  Map<String, Object> toJson() => {
+    _arConfigKey: archiver.toFilePath(),
+    _ccConfigKey: compiler.toFilePath(),
+    _ldConfigKey: linker.toFilePath(),
+    if (_windows?.developerCommandPrompt?.script != null)
+      _envScriptConfigKeyDeprecated:
+          _windows!.developerCommandPrompt!.script.toFilePath(),
+    if (_windows?.developerCommandPrompt?.arguments != null)
+      _envScriptArgsConfigKeyDeprecated:
+          _windows!.developerCommandPrompt!.arguments,
+    if (_windows != null)
+      _windowsConfigKey: {
+        if (_windows.developerCommandPrompt != null)
+          _developerCommandPromptConfigKey: {
+            _argumentsConfigKey: _windows.developerCommandPrompt!.arguments,
+            _scriptConfigKey:
+                _windows.developerCommandPrompt!.script.toFilePath(),
           },
-      }.sortOnKey();
+      },
+  }..sortOnKey();
 
   @override
   bool operator ==(Object other) {

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

@@ -4,9 +4,7 @@
 
 import '../config.dart';
 import '../encoded_asset.dart';
-import '../json_utils.dart';
 import '../utils/json.dart';
-import '../utils/map.dart';
 import 'architecture.dart';
 import 'link_mode.dart';
 import 'os.dart';

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

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import '../config.dart';
-import '../json_utils.dart';
+import '../utils/json.dart';
 import 'architecture.dart';
 import 'c_compiler_config.dart';
 import 'code_asset.dart';
@@ -314,6 +314,8 @@ extension CodeAssetBuildInputBuilder on HookConfigBuilder {
         _targetVersionKey,
       ], macOS?.targetVersion);
     }
+    (json[_configKey] as Map<String, Object?>).sortOnKey();
+    ((json[_configKey] as Map)[_codeKey] as Map<String, Object?>).sortOnKey();
   }
 }
 

pkgs/native_assets_cli/lib/src/config.dart

@@ -10,7 +10,6 @@ import 'package:pub_semver/pub_semver.dart';
 
 import 'api/deprecation_messages.dart';
 import 'encoded_asset.dart';
-import 'json_utils.dart';
 import 'metadata.dart';
 import 'utils/datetime.dart';
 import 'utils/json.dart';
@@ -174,6 +173,7 @@ final class HookConfigBuilder {
 
   void setupShared({required List<String> buildAssetTypes}) {
     json.setNested([_configKey, _buildAssetTypesKey], buildAssetTypes);
+    (json[_configKey] as Map<String, Object?>).sortOnKey();
   }
 }
 
@@ -184,6 +184,7 @@ final class BuildConfigBuilder extends HookConfigBuilder {
 extension BuildConfigBuilderSetup on BuildConfigBuilder {
   void setupBuild({required bool linkingEnabled}) {
     json.setNested([_configKey, _linkingEnabledKey], linkingEnabled);
+    (json[_configKey] as Map<String, Object?>).sortOnKey();
   }
 }
 

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

@@ -3,8 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import '../encoded_asset.dart';
-import '../json_utils.dart';
-import '../utils/map.dart';
+import '../utils/json.dart';
 
 /// Data bundled with a Dart or Flutter application.
 ///

pkgs/native_assets_cli/lib/src/encoded_asset.dart

@@ -4,8 +4,7 @@
 
 import 'package:collection/collection.dart';
 
-import 'json_utils.dart';
-import 'utils/map.dart';
+import 'utils/json.dart';
 
 /// An encoding of a particular asset type.
 final class EncodedAsset {

pkgs/native_assets_cli/lib/src/json_utils.dart

@@ -5,7 +5,6 @@
 import 'package:collection/collection.dart';
 
 import 'utils/json.dart';
-import 'utils/map.dart';
 
 class Metadata {
   final Map<String, Object> metadata;
@@ -15,7 +14,7 @@ class Metadata {
   factory Metadata.fromJson(Map<Object?, Object?>? jsonMap) =>
       Metadata(jsonMap?.formatCast<String, Object>() ?? {});
 
-  Map<String, Object> toJson() => metadata..sortOnKey();
+  Map<String, Object> toJson() => {...metadata}..sortOnKey();
 
   @override
   bool operator ==(Object other) {