Merge pull request #210 from code0-tech/196-update-cli

raphael-goetz · web-flow · commit fa774f61d26e · 2026-01-08T12:51:38.000+01:00
Update CLI
diff --git a/crates/cli/src/analyser/core.rs b/crates/cli/src/analyser/core.rs
@@ -39,7 +39,7 @@ impl Analyser {
         super::loader::load_from_path(path)
     }
 
-    pub fn report(&mut self, will_exit: bool) {
+    pub fn report(&mut self, will_exit: bool, with_warning: bool) {
         // Run analysis passes
         for dt in self.data_types.clone() {
             self.analyse_data_type(&dt);
@@ -50,7 +50,7 @@ impl Analyser {
         for f in self.functions.clone() {
             self.analyse_runtime_function(&f);
         }
-        self.reporter.print(will_exit);
+        self.reporter.print(will_exit, true, with_warning);
     }
 
     pub fn data_type_identifier_exists(&self, identifier: &str, except_id: Option<i16>) -> bool {
diff --git a/crates/cli/src/analyser/data_type.rs b/crates/cli/src/analyser/data_type.rs
@@ -26,6 +26,25 @@ impl Analyser {
             ));
         }
 
+        if dt.alias.is_empty() {
+            self.reporter.add(Diagnose::new(
+                dt.identifier.clone(),
+                adt.original_definition.clone(),
+                DiagnosticKind::MissingTranslation {
+                    translation_field: "alias".into(),
+                },
+            ));
+        }
+
+        if dt.display_message.is_empty() {
+            self.reporter.add(Diagnose::new(
+                dt.identifier.clone(),
+                adt.original_definition.clone(),
+                DiagnosticKind::MissingTranslation {
+                    translation_field: "displayMessage".into(),
+                },
+            ));
+        }
         let mut detected: Vec<String> = vec![];
         for optional_rule in &dt.rules {
             if let Some(config) = &optional_rule.config {
diff --git a/crates/cli/src/analyser/flow_type.rs b/crates/cli/src/analyser/flow_type.rs
@@ -8,6 +8,35 @@ impl Analyser {
         let name = flow.identifier.clone();
         let original = aft.original_definition.clone();
 
+        if flow.display_icon.is_empty() {
+            self.reporter.add(Diagnose::new(
+                name.clone(),
+                original.clone(),
+                DiagnosticKind::NullField {
+                    field_name: "displayIcon".into(),
+                },
+            ))
+        }
+        if flow.alias.is_empty() {
+            self.reporter.add(Diagnose::new(
+                name.clone(),
+                original.clone(),
+                DiagnosticKind::MissingTranslation {
+                    translation_field: "alias".into(),
+                },
+            ));
+        }
+
+        if flow.display_message.is_empty() {
+            self.reporter.add(Diagnose::new(
+                name.clone(),
+                original.clone(),
+                DiagnosticKind::MissingTranslation {
+                    translation_field: "displayMessage".into(),
+                },
+            ));
+        }
+
         if flow.name.is_empty() {
             self.reporter.add(Diagnose::new(
                 name.clone(),
diff --git a/crates/cli/src/analyser/function.rs b/crates/cli/src/analyser/function.rs
@@ -10,6 +10,36 @@ impl Analyser {
         let function = &af.function;
         let original = af.original_definition.clone();
 
+        if function.display_icon.is_empty() {
+            self.reporter.add(Diagnose::new(
+                name.clone(),
+                original.clone(),
+                DiagnosticKind::NullField {
+                    field_name: "displayIcon".into(),
+                },
+            ))
+        }
+
+        if function.alias.is_empty() {
+            self.reporter.add(Diagnose::new(
+                name.clone(),
+                original.clone(),
+                DiagnosticKind::MissingTranslation {
+                    translation_field: "alias".into(),
+                },
+            ));
+        }
+
+        if function.display_message.is_empty() {
+            self.reporter.add(Diagnose::new(
+                name.clone(),
+                original.clone(),
+                DiagnosticKind::MissingTranslation {
+                    translation_field: "displayMessage".into(),
+                },
+            ));
+        }
+
         if function.name.is_empty() {
             self.reporter.add(Diagnose::new(
                 name.clone(),
diff --git a/crates/cli/src/command/feature.rs b/crates/cli/src/command/feature.rs
@@ -14,7 +14,7 @@ pub fn search_feature(name: Option<String>, path: Option<String>) {
     };
 
     let mut analyser = Analyser::new(dir_path.as_str());
-    analyser.report(true);
+    analyser.report(true, true);
 
     let features = match name {
         None => parser.features.clone(),
diff --git a/crates/cli/src/command/push/mod.rs b/crates/cli/src/command/push/mod.rs
@@ -20,7 +20,7 @@ pub async fn push(token: String, url: String, path: Option<String>) {
     info(String::from("Press Ctrl+C to stop watching..."));
 
     {
-        Analyser::new(dir_path.as_str()).report(false);
+        Analyser::new(dir_path.as_str()).report(false, true);
     }
 
     // Set up file watcher
@@ -82,7 +82,7 @@ pub async fn push(token: String, url: String, path: Option<String>) {
                                 .await;
                         }
 
-                        analyzer.report(false);
+                        analyzer.report(false, true);
 
                         last_run = Instant::now();
                     }
@@ -126,7 +126,7 @@ pub async fn push(token: String, url: String, path: Option<String>) {
                                 .await;
                         }
 
-                        analyzer.report(false);
+                        analyzer.report(false, true);
                         last_run = Instant::now();
                     }
                 }
diff --git a/crates/cli/src/command/report.rs b/crates/cli/src/command/report.rs
@@ -14,7 +14,7 @@ pub fn report_errors(path: Option<String>) {
     };
 
     let mut analyser = Analyser::new(dir_path.as_str());
-    analyser.report(true);
+    analyser.report(true, true);
 
     let rows = summary_table(&parser.features);
     success_table(rows);
diff --git a/crates/cli/src/command/watch.rs b/crates/cli/src/command/watch.rs
@@ -5,14 +5,14 @@ use notify::{EventKind, RecursiveMode, Watcher, recommended_watcher};
 use std::sync::mpsc::channel;
 use std::time::{Duration, Instant};
 
-pub async fn watch_for_changes(path: Option<String>) {
+pub async fn watch_for_changes(path: Option<String>, with_warning: bool) {
     let dir_path = path.unwrap_or_else(|| "./definitions".to_string());
 
     info(format!("Watching directory: {dir_path}"));
     info(String::from("Press Ctrl+C to stop watching..."));
 
     {
-        Analyser::new(dir_path.as_str()).report(false);
+        Analyser::new(dir_path.as_str()).report(false, with_warning);
     }
 
     // Set up file watcher
@@ -35,7 +35,7 @@ pub async fn watch_for_changes(path: Option<String>) {
                             "\n\n\n--------------------------------------------------------------------------\n\n",
                         ));
                         info(String::from("Change detected! Regenerating report..."));
-                        Analyser::new(dir_path.as_str()).report(false);
+                        Analyser::new(dir_path.as_str()).report(false, with_warning);
                         last_run = Instant::now();
                     }
                 }
@@ -45,7 +45,7 @@ pub async fn watch_for_changes(path: Option<String>) {
                             "\n\n\n--------------------------------------------------------------------------\n\n",
                         ));
                         info(String::from("Change detected! Regenerating report..."));
-                        Analyser::new(dir_path.as_str()).report(false);
+                        Analyser::new(dir_path.as_str()).report(false, with_warning);
                         last_run = Instant::now();
                     }
                 }
diff --git a/crates/cli/src/diagnostics/diagnose.rs b/crates/cli/src/diagnostics/diagnose.rs
@@ -111,6 +111,13 @@ impl Diagnose {
                 ),
                 &path,
             ),
+            MissingTranslation { translation_field } => error(
+                format!(
+                    "`{}` has an required empty field (`{}`) of translations!",
+                    self.definition_name, translation_field
+                ),
+                &path,
+            ),
         }
     }
 
diff --git a/crates/cli/src/diagnostics/kinds.rs b/crates/cli/src/diagnostics/kinds.rs
@@ -15,6 +15,7 @@ pub enum DiagnosticKind {
     UnusedGenericKey { key: String },
     UndefinedGenericKey { key: String },
     UndefinedTranslation { translation_field: String },
+    MissingTranslation { translation_field: String },
 }
 
 impl DiagnosticKind {
@@ -32,7 +33,8 @@ impl DiagnosticKind {
             | NullField { .. }
             | ForbiddenVariant
             | UnusedGenericKey { .. }
-            | UndefinedGenericKey { .. } => Severity::Error,
+            | UndefinedGenericKey { .. }
+            | MissingTranslation { .. } => Severity::Error,
             UndefinedTranslation { .. } => Severity::Warning,
         }
     }
diff --git a/crates/cli/src/diagnostics/reporter.rs b/crates/cli/src/diagnostics/reporter.rs
@@ -28,13 +28,19 @@ impl Reporter {
         self.diagnostics.is_empty()
     }
 
-    pub fn print(&self, will_exit: bool) {
-        for d in self.errors() {
-            println!("{}", d.print());
+    pub fn print(&self, will_exit: bool, print_errors: bool, print_warning: bool) {
+        if print_warning {
+            for d in self.warnings() {
+                println!("{}", d.print());
+            }
         }
-        for d in self.warnings() {
-            println!("{}", d.print());
+
+        if print_errors {
+            for d in self.errors() {
+                println!("{}", d.print());
+            }
         }
+
         if self
             .diagnostics
             .iter()
diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
@@ -49,6 +49,9 @@ enum Commands {
         /// Optional path to root directory of all definitions.
         #[arg(short, long)]
         path: Option<String>,
+        /// Should ignore warnings, true on default
+        #[arg(short, long, default_value_t = false)]
+        ignore_warnings: bool,
     },
     Push {
         /// Runtime Token for Sagittarius.
@@ -80,7 +83,10 @@ async fn main() {
         Commands::Download { tag, features } => {
             command::download::handle_download(tag, features).await
         }
-        Commands::Watch { path } => command::watch::watch_for_changes(path).await,
+        Commands::Watch {
+            path,
+            ignore_warnings,
+        } => command::watch::watch_for_changes(path, !ignore_warnings).await,
         Commands::Push { token, url, path } => command::push::push(token, url, path).await,
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ impl Analyser {`
`39`	`39`	`super::loader::load_from_path(path)`
`40`	`40`	`}`
`41`	`41`
`42`		`- pub fn report(&mut self, will_exit: bool) {`
	`42`	`+ pub fn report(&mut self, will_exit: bool, with_warning: bool) {`
`43`	`43`	`// Run analysis passes`
`44`	`44`	`for dt in self.data_types.clone() {`
`45`	`45`	`self.analyse_data_type(&dt);`
`@@ -50,7 +50,7 @@ impl Analyser {`
`50`	`50`	`for f in self.functions.clone() {`
`51`	`51`	`self.analyse_runtime_function(&f);`
`52`	`52`	`}`
`53`		`- self.reporter.print(will_exit);`
	`53`	`+ self.reporter.print(will_exit, true, with_warning);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`pub fn data_type_identifier_exists(&self, identifier: &str, except_id: Option<i16>) -> bool {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ pub async fn push(token: String, url: String, path: Option<String>) {`
`20`	`20`	`info(String::from("Press Ctrl+C to stop watching..."));`
`21`	`21`
`22`	`22`	`{`
`23`		`- Analyser::new(dir_path.as_str()).report(false);`
	`23`	`+ Analyser::new(dir_path.as_str()).report(false, true);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`// Set up file watcher`
`@@ -82,7 +82,7 @@ pub async fn push(token: String, url: String, path: Option<String>) {`
`82`	`82`	`.await;`
`83`	`83`	`}`
`84`	`84`
`85`		`- analyzer.report(false);`
	`85`	`+ analyzer.report(false, true);`
`86`	`86`
`87`	`87`	`last_run = Instant::now();`
`88`	`88`	`}`
`@@ -126,7 +126,7 @@ pub async fn push(token: String, url: String, path: Option<String>) {`
`126`	`126`	`.await;`
`127`	`127`	`}`
`128`	`128`
`129`		`- analyzer.report(false);`
	`129`	`+ analyzer.report(false, true);`
`130`	`130`	`last_run = Instant::now();`
`131`	`131`	`}`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,14 @@ use notify::{EventKind, RecursiveMode, Watcher, recommended_watcher};`
`5`	`5`	`use std::sync::mpsc::channel;`
`6`	`6`	`use std::time::{Duration, Instant};`
`7`	`7`
`8`		`-pub async fn watch_for_changes(path: Option<String>) {`
	`8`	`+pub async fn watch_for_changes(path: Option<String>, with_warning: bool) {`
`9`	`9`	`let dir_path = path.unwrap_or_else(\|\| "./definitions".to_string());`
`10`	`10`
`11`	`11`	`info(format!("Watching directory: {dir_path}"));`
`12`	`12`	`info(String::from("Press Ctrl+C to stop watching..."));`
`13`	`13`
`14`	`14`	`{`
`15`		`- Analyser::new(dir_path.as_str()).report(false);`
	`15`	`+ Analyser::new(dir_path.as_str()).report(false, with_warning);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`// Set up file watcher`
`@@ -35,7 +35,7 @@ pub async fn watch_for_changes(path: Option<String>) {`
`35`	`35`	`"\n\n\n--------------------------------------------------------------------------\n\n",`
`36`	`36`	`));`
`37`	`37`	`info(String::from("Change detected! Regenerating report..."));`
`38`		`- Analyser::new(dir_path.as_str()).report(false);`
	`38`	`+ Analyser::new(dir_path.as_str()).report(false, with_warning);`
`39`	`39`	`last_run = Instant::now();`
`40`	`40`	`}`
`41`	`41`	`}`
`@@ -45,7 +45,7 @@ pub async fn watch_for_changes(path: Option<String>) {`
`45`	`45`	`"\n\n\n--------------------------------------------------------------------------\n\n",`
`46`	`46`	`));`
`47`	`47`	`info(String::from("Change detected! Regenerating report..."));`
`48`		`- Analyser::new(dir_path.as_str()).report(false);`
	`48`	`+ Analyser::new(dir_path.as_str()).report(false, with_warning);`
`49`	`49`	`last_run = Instant::now();`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,13 @@ impl Diagnose {`
`111`	`111`	`),`
`112`	`112`	`&path,`
`113`	`113`	`),`
	`114`	`+ MissingTranslation { translation_field } => error(`
	`115`	`+ format!(`
	`116`	+ "`{}` has an required empty field (`{}`) of translations!",
	`117`	`+ self.definition_name, translation_field`
	`118`	`+ ),`
	`119`	`+ &path,`
	`120`	`+ ),`
`114`	`121`	`}`
`115`	`122`	`}`
`116`	`123`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ pub enum DiagnosticKind {`
`15`	`15`	`UnusedGenericKey { key: String },`
`16`	`16`	`UndefinedGenericKey { key: String },`
`17`	`17`	`UndefinedTranslation { translation_field: String },`
	`18`	`+ MissingTranslation { translation_field: String },`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`impl DiagnosticKind {`
`@@ -32,7 +33,8 @@ impl DiagnosticKind {`
`32`	`33`	`\| NullField { .. }`
`33`	`34`	`\| ForbiddenVariant`
`34`	`35`	`\| UnusedGenericKey { .. }`
`35`		`- \| UndefinedGenericKey { .. } => Severity::Error,`
	`36`	`+ \| UndefinedGenericKey { .. }`
	`37`	`+ \| MissingTranslation { .. } => Severity::Error,`
`36`	`38`	`UndefinedTranslation { .. } => Severity::Warning,`
`37`	`39`	`}`
`38`	`40`	`}`