0.38.0

Heliozoa · Heliozoa · commit 93df9dbee7eb · 2025-06-19T11:44:32.000+03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,10 +22,10 @@ authors = [
 edition = "2024"
 license = "MIT OR Apache-2.0"
 rust-version = "1.85.0"
-version = "0.37.2"
+version = "0.38.0"
 
 [workspace.dependencies]
-mooc-langs-api = { git = "https://github.com/rage/secret-project-331.git", rev = "64d45c936a77f81af69c4077e9249b5e7245f66f" }
+mooc-langs-api = { git = "https://github.com/rage/secret-project-331.git", rev = "24179d597e5f4120649be50b903a9a4e544ea77c" }
 tmc-langs = { path = "crates/tmc-langs" }
 tmc-langs-csharp = { path = "crates/plugins/csharp" }
 tmc-langs-framework = { path = "crates/tmc-langs-framework" }
@@ -44,5 +44,5 @@ ts-rs = { git = "https://github.com/Heliozoa/ts-rs.git", rev = "16362e1936b328f9
 # [patch.'https://github.com/Heliozoa/ts-rs.git']
 # ts-rs = { path = "../ts-rs/ts-rs" }
 
-[patch.'https://github.com/rage/secret-project-331.git']
-mooc-langs-api = { path = "../secret-project-331/services/headless-lms/langs-api" }
+# [patch.'https://github.com/rage/secret-project-331.git']
+# mooc-langs-api = { path = "../secret-project-331/services/headless-lms/langs-api" }
diff --git a/crates/plugins/csharp/Cargo.toml b/crates/plugins/csharp/Cargo.toml
@@ -16,7 +16,7 @@ serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.78"
 thiserror = "2.0.3"
 walkdir = "2.3.2"
-zip = "2.2.0"
+zip = "4.1.0"
 
 [dev-dependencies]
 once_cell = "1.9.0"
diff --git a/crates/plugins/java/Cargo.toml b/crates/plugins/java/Cargo.toml
@@ -24,4 +24,4 @@ walkdir = "2.3.2"
 
 [dev-dependencies]
 simple_logger = "5.0.0"
-zip = "2.2.0"
+zip = "4.1.0"
diff --git a/crates/plugins/make/Cargo.toml b/crates/plugins/make/Cargo.toml
@@ -17,7 +17,7 @@ serde = { version = "1.0.136", features = ["derive"] }
 serde-xml-rs = "0.8.0"
 serde_yaml = "0.9.10"
 thiserror = "2.0.3"
-zip = "2.2.0"
+zip = "4.1.0"
 
 [dev-dependencies]
 simple_logger = "5.0.0"
diff --git a/crates/plugins/notests/Cargo.toml b/crates/plugins/notests/Cargo.toml
@@ -11,7 +11,7 @@ tmc-langs-framework.workspace = true
 tmc-langs-util.workspace = true
 
 log = "0.4.14"
-zip = "2.2.0"
+zip = "4.1.0"
 
 [dev-dependencies]
 simple_logger = "5.0.0"
diff --git a/crates/plugins/python3/Cargo.toml b/crates/plugins/python3/Cargo.toml
@@ -21,7 +21,7 @@ serde_json = "1.0.78"
 sha2 = "0.10.1"
 thiserror = "2.0.3"
 walkdir = "2.3.2"
-zip = "2.2.0"
+zip = "4.1.0"
 
 [dev-dependencies]
 simple_logger = "5.0.0"
diff --git a/crates/plugins/r/Cargo.toml b/crates/plugins/r/Cargo.toml
@@ -14,7 +14,7 @@ log = "0.4.14"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.78"
 thiserror = "2.0.3"
-zip = "2.2.0"
+zip = "4.1.0"
 
 [dev-dependencies]
 simple_logger = "5.0.0"
diff --git a/crates/tmc-langs-cli/Cargo.toml b/crates/tmc-langs-cli/Cargo.toml
@@ -20,7 +20,7 @@ dirs = "6.0.0"
 env_logger = "0.11.2"
 log = "0.4.14"
 rpassword = "7.0.0"
-schemars = "0.8.8"
+schemars = "0.9.0"
 serde = "1.0.136"
 serde_json = "1.0.78"
 tempfile = "3.3.0"
diff --git a/crates/tmc-langs-cli/api/output-data-download-or-update.json b/crates/tmc-langs-cli/api/output-data-download-or-update.json
@@ -4,7 +4,7 @@
   "message": "downloaded things",
   "result": "executed-command",
   "data": {
-    "output-data-kind": "exercise-download",
+    "output-data-kind": "tmc-exercise-download",
     "output-data": {
       "downloaded": [
         {
diff --git a/crates/tmc-langs-cli/bindings.d.ts b/crates/tmc-langs-cli/bindings.d.ts
@@ -2,9 +2,9 @@ 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 | 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-tmc-exercises", "output-data": Array<LocalTmcExercise> } | { "output-data-kind": "local-mooc-exercises", "output-data": Array<LocalMoocExercise> } | { "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-tmc-exercises", "output-data": Array<LocalTmcExercise> } | { "output-data-kind": "local-mooc-exercises", "output-data": Array<LocalMoocExercise> } | { "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": "tmc-exercise-download", "output-data": DownloadOrUpdateTmcCourseExercisesResult } | { "output-data-kind": "mooc-exercise-download", "output-data": DownloadOrUpdateMoocCourseExercisesResult } | { "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>]>, } };
+export type Kind = "generic" | "forbidden" | "not-logged-in" | "connection-error" | "obsolete-client" | "invalid-token" | { "failed-exercise-download": { completed: Array<TmcExerciseDownload>, skipped: Array<TmcExerciseDownload>, failed: Array<[TmcExerciseDownload, Array<string>]>, } };
 
 export type OutputData = { status: Status, message: string, result: OutputResult, data: DataKind | null, }
 
@@ -134,9 +134,9 @@ points: Array<string>, }
 
 export type UpdatedExercise = { id: number, }
 
-export type DownloadOrUpdateCourseExercisesResult = { downloaded: Array<ExerciseDownload>, skipped: Array<ExerciseDownload>, failed?: Array<[ExerciseDownload, Array<string>]>, }
+export type DownloadOrUpdateTmcCourseExercisesResult = { downloaded: Array<TmcExerciseDownload>, skipped: Array<TmcExerciseDownload>, failed?: Array<[TmcExerciseDownload, Array<string>]>, }
 
-export type ExerciseDownload = { id: number, "course-slug": string, "exercise-slug": string, path: string, }
+export type TmcExerciseDownload = { id: number, "course-slug": string, "exercise-slug": string, path: string, }
 
 export type CombinedCourseData = { details: CourseDetails, exercises: Array<CourseExercise>, settings: CourseData, }
 
diff --git a/crates/tmc-langs-cli/src/app.rs b/crates/tmc-langs-cli/src/app.rs
@@ -1249,8 +1249,8 @@ mod test {
             // checkExerciseUpdates
             tmc_langs::UpdatedExercise,
             // downloadOrUpdateCourseExercises
-            tmc_langs::DownloadOrUpdateCourseExercisesResult,
-            tmc_langs::ExerciseDownload,
+            tmc_langs::DownloadOrUpdateTmcCourseExercisesResult,
+            tmc_langs::TmcExerciseDownload,
             // getCourseData
             tmc_langs::CombinedCourseData,
             // getCourseDetails
diff --git a/crates/tmc-langs-framework/Cargo.toml b/crates/tmc-langs-framework/Cargo.toml
@@ -18,15 +18,15 @@ nom = { version = "8.0.0", features = ["alloc"] }
 nom-language = "0.1.0"
 once_cell = "1.9.0"
 regex = "1.10.6"
-schemars = "0.8.8"
+schemars = "0.9.0"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_yaml = "0.9.10"
 subprocess = "0.2.8"
 tar = "0.4.38"
 tempfile = "3.3.0"
 thiserror = "2.0.3"
 walkdir = "2.3.2"
-zip = "2.2.0"
+zip = "4.1.0"
 zstd = "0.13.0"
 
 [dev-dependencies]
diff --git a/crates/tmc-langs-framework/src/archive.rs b/crates/tmc-langs-framework/src/archive.rs
@@ -222,7 +222,7 @@ impl<T: Read + Seek> ArchiveIterator<'_, T> {
 pub enum Entry<'a, T: Read> {
     Tar(tar::Entry<'a, T>),
     TarZstd(tar::Entry<'a, zstd::Decoder<'static, BufReader<T>>>),
-    Zip(zip::read::ZipFile<'a>),
+    Zip(zip::read::ZipFile<'a, T>),
 }
 
 impl<T: Read> Entry<'_, T> {
diff --git a/crates/tmc-langs-plugins/Cargo.toml b/crates/tmc-langs-plugins/Cargo.toml
@@ -21,7 +21,7 @@ log = "0.4.14"
 tar = "0.4.38"
 thiserror = "2.0.3"
 walkdir = "2.3.2"
-zip = "2.2.0"
+zip = "4.1.0"
 zstd = "0.13.0"
 
 # The Java plugin causes compilation to fail on musl
diff --git a/crates/tmc-langs/Cargo.toml b/crates/tmc-langs/Cargo.toml
@@ -28,7 +28,7 @@ md5 = "0.7.0"
 oauth2 = { version = "5.0.0", features = ["reqwest"] }
 once_cell = "1.9.0"
 regex = "1.10.6"
-schemars = "0.8.8"
+schemars = "0.9.0"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.78"
 serde_yaml = "0.9.10"
@@ -41,7 +41,7 @@ toml = "0.8.2"
 url = "2.2.2"
 uuid = { version = "1.3.4", features = ["v4"] }
 walkdir = "2.3.2"
-zip = "2.2.0"
+zip = "4.1.0"
 zstd = "0.13.0"
 
 [target.'cfg(unix)'.dependencies]
diff --git a/crates/tmc-mooc-client/Cargo.toml b/crates/tmc-mooc-client/Cargo.toml
@@ -21,7 +21,7 @@ reqwest = { version = "0.12.15", default-features = false, features = [
   "multipart",
   "cookies",
 ] }
-schemars = { version = "0.8.8", features = ["uuid1"] }
+schemars = { version = "0.9.0", features = ["uuid1"] }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 thiserror = "2.0.3"
diff --git a/crates/tmc-testmycode-client/Cargo.toml b/crates/tmc-testmycode-client/Cargo.toml
@@ -25,7 +25,7 @@ reqwest = { version = "0.12.15", default-features = false, features = [
   "rustls-tls",
   "multipart",
 ] }
-schemars = { version = "0.8.8", features = ["chrono"] }
+schemars = { version = "0.9.0", features = ["chrono04"] }
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.78"
 tempfile = "3.3.0"

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"message": "downloaded things",`
`5`	`5`	`"result": "executed-command",`
`6`	`6`	`"data": {`
`7`		`- "output-data-kind": "exercise-download",`
	`7`	`+ "output-data-kind": "tmc-exercise-download",`
`8`	`8`	`"output-data": {`
`9`	`9`	`"downloaded": [`
`10`	`10`	`{`