Disallow None data in output data

Author: Heliozoa

crates/tmc-langs-cli/bindings.d.ts

@@ -2,7 +2,7 @@ export type Locale = string;
 
 export type CliOutput = { "output-kind": "output-data" } & OutputData | { "output-kind": "status-update" } & StatusUpdateData | { "output-kind": "notification" } & Notification;
 
-export type DataKind = { "output-data-kind": "error", "output-data": { kind: Kind, trace: Array<string>, } } | { "output-data-kind": "validation", "output-data": StyleValidationResult } | { "output-data-kind": "available-points", "output-data": Array<string> } | { "output-data-kind": "exercises", "output-data": Array<string> } | { "output-data-kind": "exercise-packaging-configuration", "output-data": ExercisePackagingConfiguration } | { "output-data-kind": "local-exercises", "output-data": Array<LocalExercise> } | { "output-data-kind": "refresh-result", "output-data": RefreshData } | { "output-data-kind": "test-result", "output-data": RunResult } | { "output-data-kind": "exercise-desc", "output-data": ExerciseDesc } | { "output-data-kind": "updated-exercises", "output-data": Array<UpdatedExercise> } | { "output-data-kind": "exercise-download", "output-data": DownloadOrUpdateCourseExercisesResult } | { "output-data-kind": "combined-course-data", "output-data": CombinedCourseData } | { "output-data-kind": "course-details", "output-data": CourseDetails } | { "output-data-kind": "course-exercises", "output-data": Array<CourseExercise> } | { "output-data-kind": "course-data", "output-data": CourseData } | { "output-data-kind": "courses", "output-data": Array<Course> } | { "output-data-kind": "exercise-details", "output-data": ExerciseDetails } | { "output-data-kind": "submissions", "output-data": Array<Submission> } | { "output-data-kind": "update-result", "output-data": UpdateResult } | { "output-data-kind": "organization", "output-data": Organization } | { "output-data-kind": "organizations", "output-data": Array<Organization> } | { "output-data-kind": "reviews", "output-data": Array<Review> } | { "output-data-kind": "token", "output-data": unknown } | { "output-data-kind": "new-submission", "output-data": NewSubmission } | { "output-data-kind": "submission-feedback-response", "output-data": SubmissionFeedbackResponse } | { "output-data-kind": "submission-finished", "output-data": SubmissionFinished } | { "output-data-kind": "config-value", "output-data": ConfigValue } | { "output-data-kind": "tmc-config", "output-data": TmcConfig } | { "output-data-kind": "compressed-project-hash", "output-data": string } | { "output-data-kind": "submission-sandbox", "output-data": string } | { "output-data-kind": "mooc-course-instances", "output-data": Array<CourseInstance> } | { "output-data-kind": "mooc-exercise-slides", "output-data": Array<TmcExerciseSlide> } | { "output-data-kind": "mooc-exercise-slide", "output-data": TmcExerciseSlide } | { "output-data-kind": "mooc-submission-finished", "output-data": ExerciseTaskSubmissionResult };
+export type DataKind = { "output-data-kind": "error", "output-data": { kind: Kind, trace: Array<string>, } } | { "output-data-kind": "validation", "output-data": StyleValidationResult | null } | { "output-data-kind": "available-points", "output-data": Array<string> } | { "output-data-kind": "exercises", "output-data": Array<string> } | { "output-data-kind": "exercise-packaging-configuration", "output-data": ExercisePackagingConfiguration } | { "output-data-kind": "local-exercises", "output-data": Array<LocalExercise> } | { "output-data-kind": "refresh-result", "output-data": RefreshData } | { "output-data-kind": "test-result", "output-data": RunResult } | { "output-data-kind": "exercise-desc", "output-data": ExerciseDesc } | { "output-data-kind": "updated-exercises", "output-data": Array<UpdatedExercise> } | { "output-data-kind": "exercise-download", "output-data": DownloadOrUpdateCourseExercisesResult } | { "output-data-kind": "combined-course-data", "output-data": CombinedCourseData } | { "output-data-kind": "course-details", "output-data": CourseDetails } | { "output-data-kind": "course-exercises", "output-data": Array<CourseExercise> } | { "output-data-kind": "course-data", "output-data": CourseData } | { "output-data-kind": "courses", "output-data": Array<Course> } | { "output-data-kind": "exercise-details", "output-data": ExerciseDetails } | { "output-data-kind": "submissions", "output-data": Array<Submission> } | { "output-data-kind": "update-result", "output-data": UpdateResult } | { "output-data-kind": "organization", "output-data": Organization } | { "output-data-kind": "organizations", "output-data": Array<Organization> } | { "output-data-kind": "reviews", "output-data": Array<Review> } | { "output-data-kind": "token", "output-data": unknown } | { "output-data-kind": "new-submission", "output-data": NewSubmission } | { "output-data-kind": "submission-feedback-response", "output-data": SubmissionFeedbackResponse } | { "output-data-kind": "submission-finished", "output-data": SubmissionFinished } | { "output-data-kind": "config-value", "output-data": ConfigValue } | { "output-data-kind": "tmc-config", "output-data": TmcConfig } | { "output-data-kind": "compressed-project-hash", "output-data": string } | { "output-data-kind": "submission-sandbox", "output-data": string } | { "output-data-kind": "mooc-course-instances", "output-data": Array<CourseInstance> } | { "output-data-kind": "mooc-exercise-slides", "output-data": Array<TmcExerciseSlide> } | { "output-data-kind": "mooc-exercise-slide", "output-data": TmcExerciseSlide } | { "output-data-kind": "mooc-submission-finished", "output-data": ExerciseTaskSubmissionResult };
 
 export type Kind = "generic" | "forbidden" | "not-logged-in" | "connection-error" | "obsolete-client" | "invalid-token" | { "failed-exercise-download": { completed: Array<ExerciseDownload>, skipped: Array<ExerciseDownload>, failed: Array<[ExerciseDownload, Array<string>]>, } };
 

crates/tmc-langs-cli/src/lib.rs

@@ -185,7 +185,7 @@ fn run_app(cli: Cli) -> Result<CliOutput> {
 
             let check_result =
                 run_checkstyle_write_results(&exercise_path, output_path.as_deref(), locale)?;
-            CliOutput::finished_with_data("ran checkstyle", check_result.map(DataKind::Validation))
+            CliOutput::finished_with_data("ran checkstyle", DataKind::Validation(check_result))
         }
 
         Command::Clean { exercise_path } => {

crates/tmc-langs-cli/src/output.rs

@@ -33,10 +33,7 @@ pub enum CliOutput {
 }
 
 impl CliOutput {
-    pub fn finished_with_data(
-        message: impl Into<String>,
-        data: impl Into<Option<DataKind>>,
-    ) -> Self {
+    pub fn finished_with_data(message: impl Into<String>, data: DataKind) -> Self {
         Self::OutputData(Box::new(OutputData {
             status: Status::Finished,
             message: message.into(),
@@ -74,7 +71,7 @@ pub enum DataKind {
         kind: Kind,
         trace: Vec<String>,
     },
-    Validation(StyleValidationResult),
+    Validation(Option<StyleValidationResult>),
     /// megabytes
     // FreeDiskSpace(u64),
     AvailablePoints(Vec<String>),

crates/tmc-langs-cli/tests/snapshots/integration__checkstyle@make__failing-exercise.snap

@@ -1,11 +1,12 @@
 ---
 source: crates/tmc-langs-cli/tests/integration.rs
 expression: output
-input_file: crates/tmc-langs-cli/tests/sample_exercises/make/failing-exercise
+input_file: sample_exercises/make/failing-exercise
 ---
 output-kind: output-data
 status: finished
 message: ran checkstyle
 result: executed-command
-data: ~
-
+data:
+  output-data-kind: validation
+  output-data: ~

crates/tmc-langs-cli/tests/snapshots/integration__checkstyle@make__passing-exercise.snap

@@ -1,11 +1,12 @@
 ---
 source: crates/tmc-langs-cli/tests/integration.rs
 expression: output
-input_file: crates/tmc-langs-cli/tests/sample_exercises/make/passing-exercise
+input_file: sample_exercises/make/passing-exercise
 ---
 output-kind: output-data
 status: finished
 message: ran checkstyle
 result: executed-command
-data: ~
-
+data:
+  output-data-kind: validation
+  output-data: ~

crates/tmc-langs-cli/tests/snapshots/integration__checkstyle@make__valgrind-failing-exercise.snap

@@ -1,11 +1,12 @@
 ---
 source: crates/tmc-langs-cli/tests/integration.rs
 expression: output
-input_file: crates/tmc-langs-cli/tests/sample_exercises/make/valgrind-failing-exercise
+input_file: sample_exercises/make/valgrind-failing-exercise
 ---
 output-kind: output-data
 status: finished
 message: ran checkstyle
 result: executed-command
-data: ~
-
+data:
+  output-data-kind: validation
+  output-data: ~

crates/tmc-langs-cli/tests/snapshots/integration__checkstyle@python3__exercise.snap

@@ -7,5 +7,6 @@ output-kind: output-data
 status: finished
 message: ran checkstyle
 result: executed-command
-data: ~
-
+data:
+  output-data-kind: validation
+  output-data: ~

crates/tmc-langs-cli/tests/snapshots/integration__checkstyle@r__exercise.snap

@@ -7,5 +7,6 @@ output-kind: output-data
 status: finished
 message: ran checkstyle
 result: executed-command
-data: ~
-
+data:
+  output-data-kind: validation
+  output-data: ~