feat: impl sort keys in setting files. (#552)

internal/spec/gpyrpc/gpyrpc.proto

@@ -263,6 +263,7 @@ message CliConfig {
 	bool disable_none = 6;
 	int64 verbose = 7;
 	bool debug = 8;
+	bool sort_keys = 9;
 }
 
 message KeyValuePair {

kclvm/api/src/service/into.rs

@@ -18,6 +18,7 @@ impl IntoLoadSettingsFiles for SettingsFile {
                 disable_none: config.disable_none.unwrap_or_default(),
                 verbose: config.verbose.unwrap_or_default() as i64,
                 debug: config.debug.unwrap_or_default(),
+                sort_keys: config.sort_keys.unwrap_or_default(),
             }),
             kcl_options: match self.kcl_options {
                 Some(opts) => opts

kclvm/cmd/src/lib.rs

@@ -57,7 +57,7 @@ pub fn app() -> clap::App<'static> {
             (@arg disable_none: -n --disable_none "Disable dumping None values")
             (@arg strict_range_check: -r --strict_range_check "Do perform strict numeric range checks")
             (@arg debug: -d --debug "Run in debug mode (for developers only)")
-            (@arg sort_key: -k --sort "Sort result keys")
+            (@arg sort_keys: -k --sort_keys "Sort result keys")
             (@arg arguments: ... -D --argument +takes_value "Specify the top-level argument")
             (@arg path_selector: ... -S --path_selector "Specify the path selector")
             (@arg overrides: ... -O --overrides +takes_value "Specify the configuration override path and value")

kclvm/cmd/src/settings.rs

@@ -50,6 +50,7 @@ pub(crate) fn build_settings(matches: &ArgMatches) -> Result<SettingsPathBuf> {
                 disable_none: bool_from_matches(matches, "disable_none"),
                 verbose: u32_from_matches(matches, "verbose"),
                 debug: bool_from_matches(matches, "debug"),
+                sort_keys: bool_from_matches(matches, "sort_keys"),
                 package_maps,
                 ..Default::default()
             }),

kclvm/config/src/settings.rs

@@ -59,6 +59,7 @@ pub struct Config {
     pub disable_none: Option<bool>,
     pub verbose: Option<u32>,
     pub debug: Option<bool>,
+    pub sort_keys: Option<bool>,
     // kclvm needs a mapping between the package name and the package path
     // to determine the source code path corresponding to different version package.
     pub package_maps: Option<HashMap<String, String>>,
@@ -77,6 +78,7 @@ impl SettingsFile {
                 disable_none: Some(false),
                 verbose: Some(0),
                 debug: Some(false),
+                sort_keys: Some(false),
                 package_maps: Some(HashMap::default()),
             }),
             kcl_options: Some(vec![]),
@@ -373,6 +375,7 @@ pub fn merge_settings(settings: &[SettingsFile]) -> SettingsFile {
                 set_if!(result_kcl_cli_configs, disable_none, kcl_cli_configs);
                 set_if!(result_kcl_cli_configs, verbose, kcl_cli_configs);
                 set_if!(result_kcl_cli_configs, debug, kcl_cli_configs);
+                set_if!(result_kcl_cli_configs, sort_keys, kcl_cli_configs);
                 set_if!(result_kcl_cli_configs, package_maps, kcl_cli_configs);
             }
         }
@@ -414,6 +417,7 @@ mod settings_test {
             assert!(kcl_cli_configs.debug.is_some());
             assert!(kcl_cli_configs.path_selector.is_none());
             assert!(kcl_cli_configs.overrides.is_none());
+            assert_eq!(kcl_cli_configs.sort_keys, Some(true));
             if let Some(config_files) = kcl_cli_configs.files {
                 assert!(config_files == files);
             }

kclvm/config/src/testdata/settings.yaml

@@ -7,6 +7,7 @@ kcl_cli_configs:
   disable_none: false
   strict_range_check: false
   debug: false
+  sort_keys: true
 kcl_options:
   - key: app-name
     value: kclvm

kclvm/runner/src/runner.rs

@@ -108,6 +108,7 @@ impl TryFrom<SettingsFile> for ExecProgramArgs {
             args.disable_none = cli_configs.disable_none.unwrap_or_default();
             args.verbose = cli_configs.verbose.unwrap_or_default() as i32;
             args.debug = cli_configs.debug.unwrap_or_default() as i32;
+            args.sort_keys = cli_configs.sort_keys.unwrap_or_default();
             for override_str in &cli_configs.overrides.unwrap_or_default() {
                 args.overrides.push(parse_override_spec(override_str)?);
             }

test/grammar/sort_keys/hello/settings.yaml

@@ -1 +1 @@
-kcl_options: -d --sort
+kcl_options: -d --sort_keys