Improve bindings

Author: Heliozoa

Cargo.lock

@@ -39,7 +39,7 @@ tmc-langs-util = { path = "crates/tmc-langs-util" }
 tmc-mooc-client = { path = "crates/tmc-mooc-client" }
 tmc-server-mock = { path = "crates/helpers/tmc-server-mock" }
 tmc-testmycode-client = { path = "crates/tmc-testmycode-client" }
-ts-rs = { git = "https://github.com/Heliozoa/ts-rs.git", rev = "d6cad971aca4aac40462279cbf96cc3bb3b7f30c" }
+ts-rs = { git = "https://github.com/Heliozoa/ts-rs.git", rev = "043c49c461543367d702e4db503f793f1ba801c2" }
 
 # [patch.'https://github.com/Heliozoa/ts-rs.git']
 # ts-rs = { path = "../ts-rs/ts-rs" }

Cargo.toml

@@ -16,7 +16,7 @@ export type OutputResult = "logged-in" | "logged-out" | "not-logged-in" | "error
 
 export type ClientUpdateData = { "client-update-data-kind": "exercise-download", id: number, path: string, } | { "client-update-data-kind": "posted-submission" } & NewSubmission;
 
-export interface StatusUpdate<T> { finished: boolean, message: string, "percent-done": number, time: bigint, data: T | null, }
+export interface StatusUpdate<T> { finished: boolean, message: string, "percent-done": number, time: number, data: T | null, }
 
 export type NotificationKind = "warning" | "info";
 
@@ -52,7 +52,7 @@ export interface TestResult { name: string, successful: boolean, points: Array<s
 
 export interface TestDesc { name: string, points: Array<string>, }
 
-export interface TmcProjectYml { extra_student_files: Array<string>, extra_exercise_files: Array<string>, force_update: Array<string>, tests_timeout_ms?: bigint, fail_on_valgrind_error?: boolean, minimum_python_version?: PythonVer, sandbox_image?: string, }
+export interface TmcProjectYml { extra_student_files: Array<string>, extra_exercise_files: Array<string>, force_update: Array<string>, tests_timeout_ms?: number, fail_on_valgrind_error?: boolean, minimum_python_version?: PythonVer, sandbox_image?: string, }
 
 export interface UpdatedExercise { id: number, }
 

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

@@ -7,7 +7,7 @@ use std::{path::PathBuf, str::FromStr};
 use tmc_langs::{
     tmc::{
         response::{
-            CourseData, CourseDetails, CourseExercise, ExerciseDetails, NewSubmission,
+            Course, CourseData, CourseDetails, CourseExercise, ExerciseDetails, NewSubmission,
             Organization, Review, Submission, SubmissionFeedbackResponse, SubmissionFinished,
         },
         UpdateResult,
@@ -347,7 +347,7 @@ pub enum TestMyCodeCommand {
     },
 
     /// Lists courses
-    #[clap(long_about = schema_leaked::<Vec<CourseData>>())]
+    #[clap(long_about = schema_leaked::<Vec<Course>>())]
     GetCourses {
         /// Organization slug (e.g. mooc, hy).
         #[clap(long)]

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

@@ -537,7 +537,7 @@ fn run_tmc(tmc: TestMyCode) -> Result<CliOutput> {
     let (mut client, mut credentials) =
         tmc_langs::init_testmycode_client_with_credentials(root_url, client_name, client_version)?;
 
-    match run_core_inner(tmc, &mut client, &mut credentials) {
+    match run_tmc_inner(tmc, &mut client, &mut credentials) {
         Err(error) => {
             for cause in error.chain() {
                 // check if the token was rejected and delete it if so
@@ -561,7 +561,7 @@ fn run_tmc(tmc: TestMyCode) -> Result<CliOutput> {
     }
 }
 
-fn run_core_inner(
+fn run_tmc_inner(
     tmc: TestMyCode,
     client: &mut TestMyCodeClient,
     credentials: &mut Option<Credentials>,

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

@@ -54,6 +54,7 @@ pub trait LanguagePlugin {
         let timeout = Self::StudentFilePolicy::new(path)?
             .get_project_config()
             .tests_timeout_ms
+            .map(Into::into)
             .map(Duration::from_millis);
         let result = self.run_tests_with_timeout(path, timeout)?;
 

crates/tmc-langs-framework/src/plugin.rs

@@ -35,7 +35,7 @@ pub struct TmcProjectYml {
     /// If set, tests are forcibly stopped after this duration.
     #[serde(default)]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub tests_timeout_ms: Option<u64>,
+    pub tests_timeout_ms: Option<u32>,
 
     /// Marks the exercise as not containing any tests.
     #[serde(rename = "no-tests")]