diff --git a/src/lang/abstractSyntaxTree.test.ts b/src/lang/abstractSyntaxTree.test.ts index 30befb42e6..9aec536a00 100644 --- a/src/lang/abstractSyntaxTree.test.ts +++ b/src/lang/abstractSyntaxTree.test.ts @@ -1766,17 +1766,17 @@ const key = 'c'` const ast = parse(code) if (err(ast)) throw ast const { nonCodeMeta } = ast - expect(nonCodeMeta.nonCodeNodes[0][0]).toEqual(nonCodeMetaInstance) + expect(nonCodeMeta.nonCodeNodes[0]?.[0]).toEqual(nonCodeMetaInstance) // extra whitespace won't change it's position (0) or value (NB the start end would have changed though) const codeWithExtraStartWhitespace = '\n\n\n' + code const ast2 = parse(codeWithExtraStartWhitespace) if (err(ast2)) throw ast2 const { nonCodeMeta: nonCodeMeta2 } = ast2 - expect(nonCodeMeta2.nonCodeNodes[0][0].value).toStrictEqual( + expect(nonCodeMeta2.nonCodeNodes[0]?.[0].value).toStrictEqual( nonCodeMetaInstance.value ) - expect(nonCodeMeta2.nonCodeNodes[0][0].start).not.toBe( + expect(nonCodeMeta2.nonCodeNodes[0]?.[0].start).not.toBe( nonCodeMetaInstance.start ) }) diff --git a/src/wasm-lib/Cargo.lock b/src/wasm-lib/Cargo.lock index dc88e43cf5..b206000e9a 100644 --- a/src/wasm-lib/Cargo.lock +++ b/src/wasm-lib/Cargo.lock @@ -255,9 +255,9 @@ dependencies = [ [[package]] name = "bson" -version = "2.12.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80cf6f7806607bd58ad490bab34bf60e25455ea4aaf995f897a13324d41ea580" +checksum = "068208f2b6fcfa27a7f1ee37488d2bb8ba2640f68f5475d08e1d9130696aba59" dependencies = [ "ahash", "base64 0.13.1", @@ -3425,11 +3425,12 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ts-rs" -version = "9.0.1" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b44017f9f875786e543595076374b9ef7d13465a518dd93d6ccdbf5b432dde8c" +checksum = "3a2f31991cee3dce1ca4f929a8a04fdd11fd8801aac0f2030b0fa8a0a3fef6b9" dependencies = [ "chrono", + "lazy_static", "serde_json", "thiserror", "ts-rs-macros", @@ -3439,9 +3440,9 @@ dependencies = [ [[package]] name = "ts-rs-macros" -version = "9.0.1" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c88cc88fd23b5a04528f3a8436024f20010a16ec18eb23c164b1242f65860130" +checksum = "0ea0b99e8ec44abd6f94a18f28f7934437809dd062820797c52401298116f70e" dependencies = [ "proc-macro2", "quote", diff --git a/src/wasm-lib/Cargo.toml b/src/wasm-lib/Cargo.toml index 982003aaee..b915afe4ef 100644 --- a/src/wasm-lib/Cargo.toml +++ b/src/wasm-lib/Cargo.toml @@ -10,7 +10,7 @@ rust-version = "1.73" crate-type = ["cdylib"] [dependencies] -bson = { version = "2.12.0", features = ["uuid-1", "chrono"] } +bson = { version = "2.13.0", features = ["uuid-1", "chrono"] } data-encoding = "2.6.0" gloo-utils = "0.2.0" kcl-lib = { path = "kcl" } diff --git a/src/wasm-lib/kcl/Cargo.toml b/src/wasm-lib/kcl/Cargo.toml index 3a9d246db4..7b6573e04e 100644 --- a/src/wasm-lib/kcl/Cargo.toml +++ b/src/wasm-lib/kcl/Cargo.toml @@ -44,7 +44,7 @@ sha2 = "0.10.8" tabled = { version = "0.15.0", optional = true } thiserror = "1.0.63" toml = "0.8.19" -ts-rs = { version = "9.0.1", features = ["uuid-impl", "url-impl", "chrono-impl", "no-serde-warnings", "serde-json-impl"] } +ts-rs = { version = "10.0.0", features = ["uuid-impl", "url-impl", "chrono-impl", "no-serde-warnings", "serde-json-impl"] } url = { version = "2.5.2", features = ["serde"] } urlencoding = "2.1.3" uuid = { version = "1.10.0", features = ["v4", "js", "serde"] } @@ -62,7 +62,7 @@ web-sys = { version = "0.3.69", features = ["console"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] approx = "0.5" -bson = { version = "2.12.0", features = ["uuid-1", "chrono"] } +bson = { version = "2.13.0", features = ["uuid-1", "chrono"] } tokio = { version = "1.39.3", features = ["full"] } tokio-tungstenite = { version = "0.24.0", features = ["rustls-tls-native-roots"] } tower-lsp = { version = "0.20.0", features = ["proposed"] } diff --git a/src/wasm-lib/kcl/src/docs.rs b/src/wasm-lib/kcl/src/docs.rs index 760c11f526..f04d0f7f51 100644 --- a/src/wasm-lib/kcl/src/docs.rs +++ b/src/wasm-lib/kcl/src/docs.rs @@ -40,7 +40,8 @@ pub struct StdLibFnData { /// This struct defines a single argument to a stdlib function. #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, JsonSchema, ts_rs::TS)] -#[ts(export)] +// There's a bug in ts_rs where this isn't correctly imported by StdLibFnData. +#[ts(export_to = "StdLibFnData.ts")] #[serde(rename_all = "camelCase")] pub struct StdLibFnArg { /// The name of the argument.