Fix: Typescript/Rust ts-rs.

Author: bjones1

builder/src/main.rs

@@ -392,14 +392,15 @@ fn run_test() -> io::Result<()> {
 }
 
 fn run_build() -> io::Result<()> {
-    // Clean out all bundled files before the rebuild.
-    remove_dir_all_if_exists("../client/static/bundled")?;
-    run_client_build(false, false)?;
-    run_script("npm", &["run", "compile"], "../extensions/VSCode", true)?;
     run_cmd!(
         cargo build --manifest-path=../builder/Cargo.toml;
         cargo build;
+        cargo test export_bindings;
     )?;
+    // Clean out all bundled files before the rebuild.
+    remove_dir_all_if_exists("../client/static/bundled")?;
+    run_client_build(false, false)?;
+    run_script("npm", &["run", "compile"], "../extensions/VSCode", true)?;
     Ok(())
 }
 

client/src/CodeChatEditorFramework.mts

@@ -275,12 +275,9 @@ class WebSocketComm {
     current_file = (url: URL) => {
         // If this points to the Server, then tell the IDE to load a new file.
         if (url.host === window.location.host) {
-            this.send_message(
-                { CurrentFile: [url.toString(), null] },
-                () => {
-                    this.set_root_iframe_src(url.toString());
-                },
-            );
+            this.send_message({ CurrentFile: [url.toString(), null] }, () => {
+                this.set_root_iframe_src(url.toString());
+            });
         } else {
             this.set_root_iframe_src(url.toString());
         }

client/src/shared_types.mts

@@ -30,9 +30,10 @@ import { CodeMirror } from "./rust-types/CodeMirror.js";
 import { StringDiff } from "./rust-types/StringDiff.js";
 import { CodeMirrorDocBlockTuple } from "./rust-types/CodeMirrorDocBlockTuple.js";
 import { UpdateMessageContents } from "./rust-types/UpdateMessageContents.js";
+import { ResultOkTypes } from "./rust-types/ResultOkTypes.js";
 
 // Manually define this, since `ts-rs` can't export `webserver.MessageResult`.
-type MessageResult = Extract<EditorMessageContents, { Result: any }>;
+type MessageResult = { Ok: ResultOkTypes } | { Err: string };
 
 export type {
     EditorMessageContents,

extensions/VSCode/src/extension.ts

@@ -369,7 +369,7 @@ export const activate = (context: vscode.ExtensionContext) => {
                                     });
                                     break;
                                 }
-                                if (current_update.contents !== undefined) {
+                                if (current_update.contents !== null) {
                                     const source =
                                         current_update.contents.source;
                                     // Is this plain text, or a diff?
@@ -624,8 +624,8 @@ const start_render = () => {
                                 },
                             },
                         },
-                        cursor_position: undefined,
-                        scroll_position: undefined,
+                        cursor_position: null,
+                        scroll_position: null,
                     },
                 });
             }
@@ -639,7 +639,7 @@ const current_file = () => {
     if (can_render() && ate !== current_editor) {
         current_editor = ate;
         send_message({
-            CurrentFile: [ate!.document.fileName, undefined],
+            CurrentFile: [ate!.document.fileName, null],
         });
     }
 };