diff --git a/Cargo.lock b/Cargo.lock index 3af9fc5a..f5d4621a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1071,9 +1071,9 @@ dependencies = [ [[package]] name = "zen-expression" -version = "0.53.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7948c672b89b5f6df93182e72277dbdd2745bf3ea6a8e88b6d93d97b1c0a994" +checksum = "1510e0c05b502e2a88930f71e11ffe0581c874f0fe2191dea2c4a5253a165d32" dependencies = [ "ahash 0.8.12", "anyhow", @@ -1101,9 +1101,9 @@ dependencies = [ [[package]] name = "zen-macros" -version = "0.53.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1577c88d5027ea74c66208a007c158882d2521908dd399aed88aaa23a677a445" +checksum = "201058abd164116259059c2ee3af097b20201f9332e479c23eb1b458cab1e98f" dependencies = [ "proc-macro2", "quote", @@ -1113,9 +1113,9 @@ dependencies = [ [[package]] name = "zen-types" -version = "0.53.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd12942fef33e4931a88c44cbaa048f07633df8adc55f6ceb197a368ee38982" +checksum = "a055e1e78e1d22a1719d1a446b296bac7034c696d4c0b16ccfaf8b10a8479aea" dependencies = [ "ahash 0.8.12", "nohash-hasher", diff --git a/packages/zen-engine-wasm/Cargo.toml b/packages/zen-engine-wasm/Cargo.toml index c535059f..1e2bb120 100644 --- a/packages/zen-engine-wasm/Cargo.toml +++ b/packages/zen-engine-wasm/Cargo.toml @@ -9,7 +9,7 @@ crate-type = ["cdylib"] [dependencies] bumpalo = "3" -zen-expression = { version = "0.53.0", default-features = false, features = ["regex-lite"] } +zen-expression = { version = "0.55.0", default-features = false, features = ["regex-lite"] } getrandom = { version = "0.3", features = ["wasm_js"] } fastrand = { version = "2", features = ["js"] } diff --git a/packages/zen-engine-wasm/src/completion/function.rs b/packages/zen-engine-wasm/src/completion/function.rs index 78b00057..cd120446 100644 --- a/packages/zen-engine-wasm/src/completion/function.rs +++ b/packages/zen-engine-wasm/src/completion/function.rs @@ -40,7 +40,9 @@ impl From for CompletionInfo { InternalFunction::Type => m("Returns a string representing the data type of the value."), InternalFunction::Keys => m("Returns an array of a given object's own enumerable property names."), InternalFunction::Values => m("Returns an array of a given object's own enumerable property values."), - InternalFunction::Date => m("Returns a new date time instance.") + InternalFunction::Date => m("Returns a new date time instance."), + InternalFunction::Merge => m("Merges multiple objects into one."), + InternalFunction::MergeDeep => m("Deeply merges multiple objects into one."), }, FunctionKind::Deprecated(d) => match d { DeprecatedFunction::Date => m("Converts a numeric timestamp to a unix timestamp."), @@ -110,6 +112,8 @@ impl From for CompletionParamNames { InternalFunction::Keys => m(&["obj"]), InternalFunction::Values => m(&["obj"]), InternalFunction::Date => m(&["dateOrTimezone", "timezone"]), + InternalFunction::Merge => m(&["objects"]), + InternalFunction::MergeDeep => m(&["objects"]), }, FunctionKind::Deprecated(d) => match d { DeprecatedFunction::Date => m(&["timestamp"]),