Add input types to CLI bindings

Author: Heliozoa

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

@@ -1,3 +1,7 @@
+export type Locale = string;
+
+export type Compression = "tar" | "zip" | "zstd";
+
 export type CliOutput = { "output-kind": "output-data" } & OutputData | { "output-kind": "status-update" } & StatusUpdateData | { "output-kind": "notification" } & Notification;
 
 export interface OutputData { status: Status, message: string, result: OutputResult, data: DataKind | null, }

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

@@ -565,7 +565,8 @@ pub enum Settings {
 }
 
 #[derive(Clone, Copy)]
-pub struct Locale(pub Language);
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+pub struct Locale(#[cfg_attr(feature = "ts-rs", ts(type = "string"))] pub Language);
 
 impl FromStr for Locale {
     type Err = anyhow::Error;
@@ -1097,3 +1098,71 @@ mod settings_test {
         get_matches_settings(&["unset", "key"]);
     }
 }
+
+#[test]
+#[ignore]
+#[cfg(feature = "ts-rs")]
+fn generate_cli_bindings() {
+    use crate::output::*;
+    use tmc_langs::*;
+
+    let mut f = std::fs::File::create("./bindings.d.ts").unwrap();
+    ts_rs::export_to!(
+        &mut f,
+        // input
+        Locale,
+        Compression,
+        // output
+        CliOutput,
+        OutputData,
+        StatusUpdateData,
+        notification_reporter::Notification,
+        Status,
+        OutputResult,
+        ClientUpdateData,
+        progress_reporter::StatusUpdate<()>,
+        notification_reporter::NotificationKind,
+        DataKind,
+        NewSubmission,
+        Kind,
+        StyleValidationResult,
+        ExerciseDownload,
+        StyleValidationStrategy,
+        StyleValidationError,
+        ExercisePackagingConfiguration,
+        LocalExercise,
+        RefreshData,
+        RunResult,
+        ExerciseDesc,
+        RefreshExercise,
+        RunStatus,
+        TestResult,
+        TestDesc,
+        TmcProjectYml,
+        UpdatedExercise,
+        DownloadOrUpdateCourseExercisesResult,
+        CombinedCourseData,
+        CourseDetails,
+        CourseExercise,
+        CourseData,
+        Course,
+        ExerciseDetails,
+        Submission,
+        UpdateResult,
+        Organization,
+        Review,
+        Exercise,
+        ExerciseSubmission,
+        ExercisePoint,
+        PythonVer,
+        TmcConfig,
+        ConfigValue,
+        SubmissionFinished,
+        SubmissionFeedbackResponse,
+        SubmissionStatus,
+        SubmissionFeedbackQuestion,
+        TestCase,
+        SubmissionFeedbackKind,
+    )
+    .unwrap();
+}

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

@@ -263,66 +263,3 @@ mod test {
         assert_eq!(actual, expected);
     }
 }
-
-#[test]
-#[ignore]
-#[cfg(feature = "ts-rs")]
-fn generate_output_definition() {
-    use tmc_langs::*;
-
-    let mut f = std::fs::File::create("./bindings.d.ts").unwrap();
-    ts_rs::export_to!(
-        &mut f,
-        CliOutput,
-        OutputData,
-        StatusUpdateData,
-        Notification,
-        Status,
-        OutputResult,
-        ClientUpdateData,
-        StatusUpdate<()>,
-        notification_reporter::NotificationKind,
-        DataKind,
-        NewSubmission,
-        Kind,
-        StyleValidationResult,
-        ExerciseDownload,
-        StyleValidationStrategy,
-        StyleValidationError,
-        ExercisePackagingConfiguration,
-        LocalExercise,
-        RefreshData,
-        RunResult,
-        ExerciseDesc,
-        RefreshExercise,
-        RunStatus,
-        TestResult,
-        TestDesc,
-        TmcProjectYml,
-        UpdatedExercise,
-        DownloadOrUpdateCourseExercisesResult,
-        CombinedCourseData,
-        CourseDetails,
-        CourseExercise,
-        CourseData,
-        Course,
-        ExerciseDetails,
-        Submission,
-        UpdateResult,
-        Organization,
-        Review,
-        Exercise,
-        ExerciseSubmission,
-        ExercisePoint,
-        PythonVer,
-        TmcConfig,
-        ConfigValue,
-        SubmissionFinished,
-        SubmissionFeedbackResponse,
-        SubmissionStatus,
-        SubmissionFeedbackQuestion,
-        TestCase,
-        SubmissionFeedbackKind,
-    )
-    .unwrap();
-}