diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 8318082..b7a279d 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -682,14 +682,16 @@ dependencies = [ [[package]] name = "calamine" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47a4d6ea525ea187df1e3a1c4b23469b1cbe60c5bafc1c0ef14b2b8738a8303d" +checksum = "8a3a315226fdc5b1c3e33521073e1712a05944bc0664d665ff1f6ff0396334da" dependencies = [ "byteorder", + "chrono", "codepage", "encoding_rs", "log", + "once_cell", "quick-xml 0.31.0", "serde", "zip", @@ -856,7 +858,7 @@ dependencies = [ "anstyle", "clap_lex", "strsim 0.11.0", - "terminal_size 0.3.0", + "terminal_size", ] [[package]] @@ -1513,9 +1515,9 @@ dependencies = [ [[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fallible-streaming-iterator" @@ -1525,12 +1527,13 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fancy-regex" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" dependencies = [ "bit-set", - "regex", + "regex-automata 0.4.6", + "regex-syntax 0.8.2", ] [[package]] @@ -2177,9 +2180,9 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "692eaaf7f7607518dd3cef090f1474b61edc5301d8012f09579920df68b725ee" dependencies = [ "hashbrown 0.14.3", ] @@ -2507,17 +2510,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "is-terminal" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "is-wsl" version = "0.4.0" @@ -2740,9 +2732,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "cc", "pkg-config", @@ -2930,18 +2922,16 @@ dependencies = [ [[package]] name = "miette" -version = "5.10.0" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" +checksum = "baed61d13cc3723ee6dbed730a82bfacedc60a85d81da2d77e9c3e8ebc0b504a" dependencies = [ - "is-terminal", "miette-derive", - "once_cell", "owo-colors", "supports-color", "supports-hyperlinks", "supports-unicode", - "terminal_size 0.1.17", + "terminal_size", "textwrap", "thiserror", "unicode-width", @@ -2949,9 +2939,9 @@ dependencies = [ [[package]] name = "miette-derive" -version = "5.10.0" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" +checksum = "f301c3f54f98abc6c212ee722f5e5c62e472a334415840669e356f04850051ec" dependencies = [ "proc-macro2", "quote", @@ -3193,9 +3183,9 @@ dependencies = [ [[package]] name = "nu-cli" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bacf67be4e0c5aa8493ef5eb55bc8e50b1fea0e38de213e1f7190cc407edbd" +checksum = "c3501c8ab496a139b070d8f62f1a76bbad2fc40e98a346ece4f0bf6247f8fdec" dependencies = [ "chrono", "crossterm", @@ -3203,6 +3193,7 @@ dependencies = [ "fuzzy-matcher", "is_executable", "log", + "lscolors", "miette", "nu-ansi-term 0.50.0", "nu-cmd-base", @@ -3224,29 +3215,25 @@ dependencies = [ [[package]] name = "nu-cmd-base" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ac9cecf8b5ba434f2570f8e677e8e8fcd7d1c0c390188060810ab7d1ee36d2" +checksum = "8a52d101f245ef4455c11d8810b5ab1182b749ee852c7263feb7e240e16e4b44" dependencies = [ "indexmap 2.2.5", "miette", "nu-engine", - "nu-glob", "nu-parser", "nu-path", "nu-protocol", - "nu-utils", ] [[package]] name = "nu-cmd-lang" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9ff31cc095e7f4fb1140a94de76e8fc2e7d4eaf6a761eb482cf32609ce5d27" +checksum = "acf8e7a1a127c229676c3198ad90c9d03b96e495945b190834da5849fce08d7f" dependencies = [ - "fancy-regex", "itertools 0.12.1", - "nu-ansi-term 0.50.0", "nu-engine", "nu-parser", "nu-protocol", @@ -3256,23 +3243,22 @@ dependencies = [ [[package]] name = "nu-color-config" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9400134391c1ad4b063ea1189d757868ce428bb0e5985cf6ffe3c66b31de399" +checksum = "feb344f6f4547a50edc7aae9c95c5017bcb4d5606ead0d104fc16b928f82ab84" dependencies = [ "nu-ansi-term 0.50.0", "nu-engine", "nu-json", "nu-protocol", - "nu-utils", "serde", ] [[package]] name = "nu-command" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bb00770a84ba4af9740e145f23c7df4834329a729d104e666caedfd4fdd00f" +checksum = "09238db7c16880a2ea71168481fd2ccb439b27aa8a1cc68886d6f1d9ec323f4a" dependencies = [ "alphanumeric-sort", "base64 0.21.7", @@ -3302,7 +3288,6 @@ dependencies = [ "log", "lscolors", "md-5", - "miette", "mime", "mime_guess", "native-tls", @@ -3344,7 +3329,7 @@ dependencies = [ "sha2", "sysinfo", "tabled", - "terminal_size 0.3.0", + "terminal_size", "titlecase", "toml 0.8.10", "umask", @@ -3365,9 +3350,9 @@ dependencies = [ [[package]] name = "nu-engine" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14c9964821cb71d32bcf70dde6a9b0ba8e246cfc821561eddec03d9a3fe8c87" +checksum = "870973d5e19d88ff79ffe1aab547abf415eb3c99c10e6769b487fbf4a01d8f48" dependencies = [ "nu-glob", "nu-path", @@ -3377,15 +3362,15 @@ dependencies = [ [[package]] name = "nu-glob" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "506855a5ab4939d7895efcc12faf4e97cf98c07251ce22baaddb41237f6a3100" +checksum = "7d79b73e5d14edcac3d35f1c2aced0e5ec0f4647dcbea27b0394d17c969b9224" [[package]] name = "nu-json" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c908028619b4b8c1f274c69d9c36a946d49f3c32733a0f71fab067bd313bcfd" +checksum = "302c53d74b11489b14636c84a38c01de8a27a7a9f2c831a7ec79b4ad6a9d46bd" dependencies = [ "linked-hash-map", "num-traits", @@ -3394,9 +3379,9 @@ dependencies = [ [[package]] name = "nu-parser" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da96ad77c42106f1bb53ba44fcb9ec405be71bb1eed3d9abab03b03be885b1de" +checksum = "9ff072c9cc772ae462fa5d484280bdd93d96f5c27e9849403271814ccd7f1284" dependencies = [ "bytesize", "chrono", @@ -3410,9 +3395,9 @@ dependencies = [ [[package]] name = "nu-path" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a4dbc274758daaa42844476a24ed177313c22a8cfd41e7c11506c6c4c7882a9" +checksum = "4a076bc9b50335131195e6ff20cf2c7fb1407fc5943543f22c3c29bb11a9d490" dependencies = [ "dirs-next", "omnipath", @@ -3421,18 +3406,18 @@ dependencies = [ [[package]] name = "nu-pretty-hex" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9dbd7a639f4c27bb75dca5812f939f2c1c537e7146e39b94226c6327314dad" +checksum = "866616e59711210fb3b24c2efe091072898d9f2e941c5b6eefc261586e5508c7" dependencies = [ "nu-ansi-term 0.50.0", ] [[package]] name = "nu-protocol" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55b914bb2bf4ba26b72633c362ee9c1c160b28b62d904013a7f3424edacd471" +checksum = "4ff49daf9788fbaebcf49fbf2bc030583776b4315b9ec57e2c3c9d5ee99bd140" dependencies = [ "byte-unit", "chrono", @@ -3453,9 +3438,9 @@ dependencies = [ [[package]] name = "nu-system" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dadea74341e329c0f53fe3f11ac6bba6fca71e5845f4d5c1a2c12bce5a3954e" +checksum = "7e256c9e9814ad235faeb9813a08d4f7f3e144d04e2a919970f3beba643e08cb" dependencies = [ "chrono", "libc", @@ -3472,9 +3457,9 @@ dependencies = [ [[package]] name = "nu-table" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001cf0ea4d1fe15cfc33d474e8373f94a0c69fc65798cb78af1a9141d7706ccf" +checksum = "35f9a66c5a9a02eb2204d14d5f8442e0cac234d0f41adc2f9bd3c93a37056b64" dependencies = [ "fancy-regex", "nu-ansi-term 0.50.0", @@ -3488,9 +3473,9 @@ dependencies = [ [[package]] name = "nu-term-grid" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5636df4a3fd286c349af8e90efd15cb99165fb6600214391830ac861397346ab" +checksum = "39a10e7a23316a216e48d84e56ccba2e520599794e4eaa7670f35267ea89c089" dependencies = [ "nu-utils", "unicode-width", @@ -3498,9 +3483,9 @@ dependencies = [ [[package]] name = "nu-utils" -version = "0.90.1" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6cd989464dc19ddb8ae66b972f74570e2f3890970e6a03267580501c293ae5" +checksum = "4f91d3ae92e0ec8e8c21fd6efc4511987b61f05762c96a7fb764d70f22859676" dependencies = [ "crossterm_winapi", "log", @@ -3755,9 +3740,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" -version = "3.5.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" [[package]] name = "pango" @@ -4469,8 +4454,8 @@ dependencies = [ [[package]] name = "reedline" -version = "0.29.0" -source = "git+https://github.com/nushell/reedline?tag=v0.29.0#62fdea8158848a3fc1247be60a437c99d632d2f6" +version = "0.30.0" +source = "git+https://github.com/nushell/reedline?tag=v0.30.0#d12357bcbee07dbc97a4a0a77d3204c93206b55d" dependencies = [ "chrono", "crossterm", @@ -4638,18 +4623,15 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" -dependencies = [ - "xmlparser", -] +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" [[package]] name = "rusqlite" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" dependencies = [ "bitflags 2.4.2", "fallible-iterator", @@ -5247,31 +5229,24 @@ dependencies = [ [[package]] name = "supports-color" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" +checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f" dependencies = [ - "is-terminal", "is_ci", ] [[package]] name = "supports-hyperlinks" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d" -dependencies = [ - "is-terminal", -] +checksum = "2c0a1e5168041f5f3ff68ff7d95dcb9c8749df29f6e7e89ada40dd4c9de404ee" [[package]] name = "supports-unicode" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f850c19edd184a205e883199a261ed44471c81e39bd95b1357f5febbef00e77a" -dependencies = [ - "is-terminal", -] +checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "syn" @@ -5722,16 +5697,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "terminal_size" version = "0.3.0" @@ -5744,9 +5709,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.2" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "smawk", "unicode-linebreak", @@ -6739,15 +6704,15 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "which" -version = "5.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" +checksum = "7fa5e0c10bf77f44aac573e498d1a82d5fbd5e91f6fc0a99e7be4b38e85e101c" dependencies = [ "either", "home", "once_cell", "rustix 0.38.31", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -7352,12 +7317,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "xmlparser" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" - [[package]] name = "zbus" version = "3.15.2" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 5b1000a..3cbacc7 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -18,15 +18,15 @@ tauri = {version = "1.6", features = ["clipboard", "devtools", "api-all"] } serde_json = "1" serde = { version = "1", features = ["derive"] } -nu-engine = "0.90.1" -nu-protocol = "0.90.1" -nu-parser = "0.90.1" -nu-path = "0.90.1" -nu-command = "0.90.1" -nu-cli = "0.90.1" -nu-cmd-lang = "0.90.1" +nu-engine = "0.91" +nu-protocol = "0.91" +nu-parser = "0.91" +nu-path = "0.91" +nu-command = "0.91" +nu-cli = "0.91" +nu-cmd-lang = "0.91" -reedline = { version = "0.29.0", features = ["bashisms", "sqlite"] } +reedline = { version = "0.30.0", features = ["bashisms", "sqlite"] } parking_lot = "0.12.1" regex = "1.10.3" @@ -51,4 +51,4 @@ features = [ ] [patch.crates-io] -reedline = { git = "https://github.com/nushell/reedline", tag = "v0.29.0" } +reedline = { git = "https://github.com/nushell/reedline", tag = "v0.30.0" } diff --git a/src-tauri/src/run_external.rs b/src-tauri/src/run_external.rs index 9c707b7..a1dc873 100644 --- a/src-tauri/src/run_external.rs +++ b/src-tauri/src/run_external.rs @@ -7,7 +7,7 @@ use std::sync::mpsc; use nu_engine::env_to_strings; use nu_protocol::engine::{EngineState, Stack}; -use nu_protocol::{ast::Call, engine::Command, NuPath, ShellError, Signature, SyntaxShape, Value}; +use nu_protocol::{ast::Call, engine::Command, NuGlob, ShellError, Signature, SyntaxShape, Value}; use nu_protocol::{Category, Example, ListStream, PipelineData, RawStream, Span, Spanned}; use itertools::Itertools; @@ -58,7 +58,7 @@ impl Command for External { let span = value.span(); value - .as_string() + .coerce_into_string() .map(|item| Spanned { item, span }) .map_err(|_| ShellError::ExternalCommand { label: "Cannot convert argument to a string".into(), @@ -459,7 +459,7 @@ impl ExternalCommand { if arg.item.contains('*') { let nu_path_arg = Spanned { - item: NuPath::UnQuoted(arg.item.clone()), + item: NuGlob::Expand(arg.item.clone()), span: arg.span, };