2019-05-10 16:59:12 +00:00
|
|
|
[package]
|
2019-05-16 23:39:58 +00:00
|
|
|
name = "nu"
|
2020-01-29 02:17:02 +00:00
|
|
|
version = "0.9.0"
|
2019-08-23 05:36:52 +00:00
|
|
|
authors = ["Yehuda Katz <wycats@gmail.com>", "Jonathan Turner <jonathan.d.turner@gmail.com>", "Andrés N. Robalino <andres@androbtech.com>"]
|
2019-05-16 21:46:24 +00:00
|
|
|
description = "A shell for the GitHub era"
|
2019-06-02 16:50:41 +00:00
|
|
|
license = "MIT"
|
2019-05-10 16:59:12 +00:00
|
|
|
edition = "2018"
|
2019-07-16 19:17:46 +00:00
|
|
|
readme = "README.md"
|
2019-06-27 04:56:48 +00:00
|
|
|
default-run = "nu"
|
2019-07-16 19:17:46 +00:00
|
|
|
repository = "https://github.com/nushell/nushell"
|
2019-09-29 19:03:51 +00:00
|
|
|
homepage = "https://www.nushell.sh"
|
2019-12-15 12:56:26 +00:00
|
|
|
documentation = "https://www.nushell.sh/book/"
|
2020-01-31 15:38:26 +00:00
|
|
|
exclude = ["images"]
|
2019-05-10 16:59:12 +00:00
|
|
|
|
2019-12-18 17:58:23 +00:00
|
|
|
[workspace]
|
|
|
|
|
|
|
|
|
|
members = [
|
|
|
|
|
"crates/nu-macros",
|
|
|
|
|
"crates/nu-errors",
|
|
|
|
|
"crates/nu-source",
|
|
|
|
|
"crates/nu_plugin_average",
|
|
|
|
|
"crates/nu_plugin_binaryview",
|
|
|
|
|
"crates/nu_plugin_fetch",
|
|
|
|
|
"crates/nu_plugin_inc",
|
|
|
|
|
"crates/nu_plugin_match",
|
|
|
|
|
"crates/nu_plugin_post",
|
|
|
|
|
"crates/nu_plugin_ps",
|
|
|
|
|
"crates/nu_plugin_str",
|
|
|
|
|
"crates/nu_plugin_sum",
|
|
|
|
|
"crates/nu_plugin_sys",
|
|
|
|
|
"crates/nu_plugin_textview",
|
|
|
|
|
"crates/nu_plugin_tree",
|
|
|
|
|
"crates/nu-protocol",
|
2019-12-27 13:30:14 +00:00
|
|
|
"crates/nu-plugin",
|
2019-12-18 17:58:23 +00:00
|
|
|
"crates/nu-parser",
|
|
|
|
|
"crates/nu-value-ext",
|
|
|
|
|
"crates/nu-build"
|
|
|
|
|
]
|
2019-11-21 14:33:14 +00:00
|
|
|
|
2019-05-10 16:59:12 +00:00
|
|
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
|
|
|
|
|
|
|
|
[dependencies]
|
2020-01-31 22:45:33 +00:00
|
|
|
nu-source = { version = "0.9.0", path = "./crates/nu-source" }
|
|
|
|
|
nu-plugin = { version = "0.9.0", path = "./crates/nu-plugin" }
|
|
|
|
|
nu-protocol = { version = "0.9.0", path = "./crates/nu-protocol" }
|
|
|
|
|
nu-errors = { version = "0.9.0", path = "./crates/nu-errors" }
|
|
|
|
|
nu-parser = { version = "0.9.0", path = "./crates/nu-parser" }
|
|
|
|
|
nu-value-ext = { version = "0.9.0", path = "./crates/nu-value-ext" }
|
|
|
|
|
nu_plugin_average = { version = "0.9.0", path = "./crates/nu_plugin_average", optional=true }
|
|
|
|
|
nu_plugin_binaryview = { version = "0.9.0", path = "./crates/nu_plugin_binaryview", optional=true }
|
|
|
|
|
nu_plugin_fetch = { version = "0.9.0", path = "./crates/nu_plugin_fetch", optional=true }
|
|
|
|
|
nu_plugin_inc = { version = "0.9.0", path = "./crates/nu_plugin_inc", optional=true }
|
|
|
|
|
nu_plugin_match = { version = "0.9.0", path = "./crates/nu_plugin_match", optional=true }
|
|
|
|
|
nu_plugin_post = { version = "0.9.0", path = "./crates/nu_plugin_post", optional=true }
|
|
|
|
|
nu_plugin_ps = { version = "0.9.0", path = "./crates/nu_plugin_ps", optional=true }
|
|
|
|
|
nu_plugin_str = { version = "0.9.0", path = "./crates/nu_plugin_str", optional=true }
|
|
|
|
|
nu_plugin_sum = { version = "0.9.0", path = "./crates/nu_plugin_sum", optional=true }
|
|
|
|
|
nu_plugin_sys = { version = "0.9.0", path = "./crates/nu_plugin_sys", optional=true }
|
|
|
|
|
nu_plugin_textview = { version = "0.9.0", path = "./crates/nu_plugin_textview", optional=true }
|
|
|
|
|
nu_plugin_tree = { version = "0.9.0", path = "./crates/nu_plugin_tree", optional=true }
|
2020-01-29 02:17:02 +00:00
|
|
|
nu-macros = { version = "0.9.0", path = "./crates/nu-macros" }
|
2019-12-04 21:14:52 +00:00
|
|
|
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 02:30:48 +00:00
|
|
|
query_interface = "0.3.5"
|
|
|
|
|
typetag = "0.1.4"
|
2020-01-27 03:41:17 +00:00
|
|
|
rustyline = "6.0.0"
|
2019-12-08 17:56:21 +00:00
|
|
|
chrono = { version = "0.4.10", features = ["serde"] }
|
2019-08-31 21:19:59 +00:00
|
|
|
derive-new = "0.5.8"
|
2019-05-10 16:59:12 +00:00
|
|
|
prettytable-rs = "0.8.0"
|
2019-12-08 17:56:21 +00:00
|
|
|
itertools = "0.8.2"
|
2019-09-13 03:44:21 +00:00
|
|
|
ansi_term = "0.12.1"
|
2019-11-10 17:48:49 +00:00
|
|
|
nom = "5.0.1"
|
2019-05-11 07:00:33 +00:00
|
|
|
dunce = "1.0.0"
|
2020-01-17 20:35:48 +00:00
|
|
|
indexmap = { version = "1.3.1", features = ["serde-1"] }
|
2019-11-10 17:48:49 +00:00
|
|
|
byte-unit = "3.0.3"
|
|
|
|
|
base64 = "0.11"
|
|
|
|
|
futures-preview = { version = "=0.3.0-alpha.19", features = ["compat", "io-compat"] }
|
|
|
|
|
async-stream = "0.1.2"
|
2019-08-02 19:15:07 +00:00
|
|
|
futures_codec = "0.2.5"
|
2020-01-17 20:35:48 +00:00
|
|
|
num-traits = "0.2.11"
|
2019-05-24 18:48:33 +00:00
|
|
|
term = "0.5.2"
|
2019-05-25 19:07:52 +00:00
|
|
|
bytes = "0.4.12"
|
2019-08-07 17:49:11 +00:00
|
|
|
log = "0.4.8"
|
2019-08-23 03:29:08 +00:00
|
|
|
pretty_env_logger = "0.3.1"
|
2020-01-17 20:35:48 +00:00
|
|
|
serde = { version = "1.0.104", features = ["derive"] }
|
2019-08-31 14:22:45 +00:00
|
|
|
bson = { version = "0.14.0", features = ["decimal128"] }
|
2019-12-08 17:56:21 +00:00
|
|
|
serde_json = "1.0.44"
|
2019-08-23 03:29:08 +00:00
|
|
|
serde-hjson = "0.9.1"
|
2019-06-03 07:41:28 +00:00
|
|
|
serde_yaml = "0.8"
|
2019-12-08 17:56:21 +00:00
|
|
|
serde_bytes = "0.11.3"
|
2019-11-10 17:48:49 +00:00
|
|
|
getset = "0.0.9"
|
2019-10-15 19:54:46 +00:00
|
|
|
language-reporting = "0.4.0"
|
2019-06-01 05:50:16 +00:00
|
|
|
app_dirs = "1.2.1"
|
2019-07-19 20:11:49 +00:00
|
|
|
csv = "1.1"
|
2020-01-17 20:35:48 +00:00
|
|
|
toml = "0.5.6"
|
2019-06-01 17:00:42 +00:00
|
|
|
clap = "2.33.0"
|
2020-01-17 20:35:48 +00:00
|
|
|
git2 = { version = "0.11.0", default_features = false }
|
2019-07-29 07:46:24 +00:00
|
|
|
dirs = "2.0.2"
|
2019-08-01 21:00:08 +00:00
|
|
|
glob = "0.3.0"
|
2019-06-07 00:31:22 +00:00
|
|
|
ctrlc = "3.1.3"
|
2020-01-17 20:35:48 +00:00
|
|
|
roxmltree = "0.9.0"
|
2019-09-14 16:30:24 +00:00
|
|
|
nom_locate = "1.0.0"
|
2019-11-10 17:48:49 +00:00
|
|
|
nom-tracable = "0.4.1"
|
2019-07-29 07:46:24 +00:00
|
|
|
unicode-xid = "0.2.0"
|
2019-06-16 06:43:40 +00:00
|
|
|
serde_ini = "0.2.0"
|
2019-11-10 17:48:49 +00:00
|
|
|
pretty-hex = "0.1.1"
|
|
|
|
|
hex = "0.4"
|
2019-07-04 22:17:18 +00:00
|
|
|
tempfile = "3.1.0"
|
2020-01-23 19:24:31 +00:00
|
|
|
which = "3.1.0"
|
2020-01-22 23:26:49 +00:00
|
|
|
ichwh = "0.3"
|
2019-08-16 05:47:47 +00:00
|
|
|
textwrap = {version = "0.11.0", features = ["term_size"]}
|
2020-01-17 20:35:48 +00:00
|
|
|
shellexpand = "1.1.1"
|
2019-08-30 19:07:07 +00:00
|
|
|
pin-utils = "0.1.0-alpha.4"
|
2020-01-17 20:35:48 +00:00
|
|
|
num-bigint = { version = "0.2.5", features = ["serde"] }
|
2019-09-01 16:20:31 +00:00
|
|
|
bigdecimal = { version = "0.1.0", features = ["serde"] }
|
2019-09-19 04:25:29 +00:00
|
|
|
serde_urlencoded = "0.6.1"
|
2019-10-18 22:41:24 +00:00
|
|
|
trash = "1.0.0"
|
2019-10-02 18:56:28 +00:00
|
|
|
regex = "1"
|
2019-10-28 14:46:50 +00:00
|
|
|
cfg-if = "0.1"
|
2019-11-16 20:02:26 +00:00
|
|
|
strip-ansi-escapes = "0.1.0"
|
2019-11-17 03:18:41 +00:00
|
|
|
calamine = "0.16"
|
2019-11-19 05:46:47 +00:00
|
|
|
umask = "0.1"
|
2019-12-08 17:56:21 +00:00
|
|
|
futures-util = "0.3.1"
|
2020-01-17 20:35:48 +00:00
|
|
|
termcolor = "1.1.0"
|
2019-12-09 18:39:51 +00:00
|
|
|
natural = "0.3.0"
|
2020-01-04 06:44:17 +00:00
|
|
|
parking_lot = "0.10.0"
|
2020-01-29 13:34:36 +00:00
|
|
|
meval = "0.2"
|
2019-05-23 04:30:43 +00:00
|
|
|
|
2020-01-31 22:45:33 +00:00
|
|
|
futures-timer = { version = "1.0.2", optional = true }
|
2019-09-08 07:06:15 +00:00
|
|
|
clipboard = {version = "0.5", optional = true }
|
2019-10-21 15:18:43 +00:00
|
|
|
ptree = {version = "0.2" }
|
2020-01-17 20:35:48 +00:00
|
|
|
starship = { version = "0.33.1", optional = true}
|
2019-12-14 13:27:14 +00:00
|
|
|
heim = {version = "0.0.9", optional = true}
|
2019-12-10 00:05:40 +00:00
|
|
|
battery = {version = "0.7.5", optional = true}
|
|
|
|
|
syntect = {version = "3.2.0", optional = true }
|
|
|
|
|
onig_sys = {version = "=69.1.0", optional = true }
|
2020-01-27 02:51:46 +00:00
|
|
|
crossterm = {version = "0.14.2", optional = true}
|
2020-01-17 20:35:48 +00:00
|
|
|
url = {version = "2.1.1", optional = true}
|
Restructure and streamline token expansion (#1123)
Restructure and streamline token expansion
The purpose of this commit is to streamline the token expansion code, by
removing aspects of the code that are no longer relevant, removing
pointless duplication, and eliminating the need to pass the same
arguments to `expand_syntax`.
The first big-picture change in this commit is that instead of a handful
of `expand_` functions, which take a TokensIterator and ExpandContext, a
smaller number of methods on the `TokensIterator` do the same job.
The second big-picture change in this commit is fully eliminating the
coloring traits, making coloring a responsibility of the base expansion
implementations. This also means that the coloring tracer is merged into
the expansion tracer, so you can follow a single expansion and see how
the expansion process produced colored tokens.
One side effect of this change is that the expander itself is marginally
more error-correcting. The error correction works by switching from
structured expansion to `BackoffColoringMode` when an unexpected token
is found, which guarantees that all spans of the source are colored, but
may not be the most optimal error recovery strategy.
That said, because `BackoffColoringMode` only extends as far as a
closing delimiter (`)`, `]`, `}`) or pipe (`|`), it does result in
fairly granular correction strategy.
The current code still produces an `Err` (plus a complete list of
colored shapes) from the parsing process if any errors are encountered,
but this could easily be addressed now that the underlying expansion is
error-correcting.
This commit also colors any spans that are syntax errors in red, and
causes the parser to include some additional information about what
tokens were expected at any given point where an error was encountered,
so that completions and hinting could be more robust in the future.
Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
Co-authored-by: Andrés N. Robalino <andres@androbtech.com>
2020-01-21 22:45:03 +00:00
|
|
|
semver = {version = "0.9.0", optional = true}
|
2019-10-08 13:47:30 +00:00
|
|
|
|
2020-01-11 20:49:20 +00:00
|
|
|
[target.'cfg(unix)'.dependencies]
|
|
|
|
|
users = "0.9"
|
|
|
|
|
|
2019-08-28 23:32:58 +00:00
|
|
|
[features]
|
2020-01-22 03:00:27 +00:00
|
|
|
# Test executables
|
|
|
|
|
test-bins = []
|
2020-01-12 21:44:22 +00:00
|
|
|
|
2020-01-22 03:00:27 +00:00
|
|
|
default = ["sys", "ps", "textview", "inc", "str"]
|
2020-01-13 06:17:56 +00:00
|
|
|
stable = ["default", "starship-prompt", "binaryview", "match", "tree", "average", "sum", "post", "fetch", "clipboard"]
|
|
|
|
|
|
2019-12-19 17:18:06 +00:00
|
|
|
# Default
|
2020-01-31 22:45:33 +00:00
|
|
|
textview = ["crossterm", "syntect", "onig_sys", "url", "nu_plugin_textview"]
|
|
|
|
|
sys = ["heim", "battery", "nu_plugin_sys"]
|
|
|
|
|
ps = ["heim", "futures-timer", "nu_plugin_ps"]
|
|
|
|
|
inc = ["semver", "nu_plugin_inc"]
|
2019-12-27 13:30:14 +00:00
|
|
|
str = ["nu_plugin_str"]
|
2019-12-10 00:05:40 +00:00
|
|
|
|
2019-12-19 17:18:06 +00:00
|
|
|
# Stable
|
|
|
|
|
average = ["nu_plugin_average"]
|
2019-12-04 17:51:20 +00:00
|
|
|
binaryview = ["nu_plugin_binaryview"]
|
2019-12-19 17:18:06 +00:00
|
|
|
fetch = ["nu_plugin_fetch"]
|
2019-12-09 18:39:51 +00:00
|
|
|
match = ["nu_plugin_match"]
|
2019-12-19 17:18:06 +00:00
|
|
|
post = ["nu_plugin_post"]
|
|
|
|
|
starship-prompt = ["starship"]
|
2019-12-09 18:39:51 +00:00
|
|
|
sum = ["nu_plugin_sum"]
|
2019-12-04 21:14:52 +00:00
|
|
|
trace = ["nu-parser/trace"]
|
2019-12-19 17:18:06 +00:00
|
|
|
tree = ["nu_plugin_tree"]
|
2019-08-28 23:32:58 +00:00
|
|
|
|
2019-08-27 21:45:18 +00:00
|
|
|
[dependencies.rusqlite]
|
Restructure and streamline token expansion (#1123)
Restructure and streamline token expansion
The purpose of this commit is to streamline the token expansion code, by
removing aspects of the code that are no longer relevant, removing
pointless duplication, and eliminating the need to pass the same
arguments to `expand_syntax`.
The first big-picture change in this commit is that instead of a handful
of `expand_` functions, which take a TokensIterator and ExpandContext, a
smaller number of methods on the `TokensIterator` do the same job.
The second big-picture change in this commit is fully eliminating the
coloring traits, making coloring a responsibility of the base expansion
implementations. This also means that the coloring tracer is merged into
the expansion tracer, so you can follow a single expansion and see how
the expansion process produced colored tokens.
One side effect of this change is that the expander itself is marginally
more error-correcting. The error correction works by switching from
structured expansion to `BackoffColoringMode` when an unexpected token
is found, which guarantees that all spans of the source are colored, but
may not be the most optimal error recovery strategy.
That said, because `BackoffColoringMode` only extends as far as a
closing delimiter (`)`, `]`, `}`) or pipe (`|`), it does result in
fairly granular correction strategy.
The current code still produces an `Err` (plus a complete list of
colored shapes) from the parsing process if any errors are encountered,
but this could easily be addressed now that the underlying expansion is
error-correcting.
This commit also colors any spans that are syntax errors in red, and
causes the parser to include some additional information about what
tokens were expected at any given point where an error was encountered,
so that completions and hinting could be more robust in the future.
Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
Co-authored-by: Andrés N. Robalino <andres@androbtech.com>
2020-01-21 22:45:03 +00:00
|
|
|
version = "0.20.0"
|
2019-08-27 21:45:18 +00:00
|
|
|
features = ["bundled", "blob"]
|
|
|
|
|
|
2019-05-29 15:26:45 +00:00
|
|
|
[dev-dependencies]
|
|
|
|
|
pretty_assertions = "0.6.1"
|
2020-01-29 02:17:02 +00:00
|
|
|
nu-test-support = { version = "0.9.0", path = "./crates/nu-test-support" }
|
2019-06-27 04:56:48 +00:00
|
|
|
|
2019-10-11 18:39:05 +00:00
|
|
|
[build-dependencies]
|
2020-01-17 20:35:48 +00:00
|
|
|
toml = "0.5.6"
|
|
|
|
|
serde = { version = "1.0.104", features = ["derive"] }
|
2020-01-29 02:17:02 +00:00
|
|
|
nu-build = { version = "0.9.0", path = "./crates/nu-build" }
|
2019-10-11 18:39:05 +00:00
|
|
|
|
2019-06-27 04:56:48 +00:00
|
|
|
[lib]
|
|
|
|
|
name = "nu"
|
2019-12-29 05:17:24 +00:00
|
|
|
doctest = false
|
2019-06-27 04:56:48 +00:00
|
|
|
path = "src/lib.rs"
|
|
|
|
|
|
2020-01-12 21:44:22 +00:00
|
|
|
[[bin]]
|
|
|
|
|
name = "fail"
|
2020-01-22 03:00:27 +00:00
|
|
|
path = "crates/nu-test-support/src/bins/fail.rs"
|
|
|
|
|
required-features = ["test-bins"]
|
2020-01-12 21:44:22 +00:00
|
|
|
|
|
|
|
|
[[bin]]
|
|
|
|
|
name = "chop"
|
2020-01-22 03:00:27 +00:00
|
|
|
path = "crates/nu-test-support/src/bins/chop.rs"
|
|
|
|
|
required-features = ["test-bins"]
|
2020-01-12 21:44:22 +00:00
|
|
|
|
|
|
|
|
[[bin]]
|
|
|
|
|
name = "cococo"
|
2020-01-22 03:00:27 +00:00
|
|
|
path = "crates/nu-test-support/src/bins/cococo.rs"
|
|
|
|
|
required-features = ["test-bins"]
|
2020-01-12 21:44:22 +00:00
|
|
|
|
2019-12-10 00:05:40 +00:00
|
|
|
# Core plugins that ship with `cargo install nu` by default
|
2019-12-10 03:57:55 +00:00
|
|
|
# Currently, Cargo limits us to installing only one binary
|
|
|
|
|
# unless we use [[bin]], so we use this as a workaround
|
2019-12-10 00:05:40 +00:00
|
|
|
[[bin]]
|
2019-12-10 03:57:55 +00:00
|
|
|
name = "nu_plugin_core_textview"
|
2019-12-18 16:35:17 +00:00
|
|
|
path = "src/plugins/nu_plugin_core_textview.rs"
|
2019-12-10 00:05:40 +00:00
|
|
|
required-features = ["textview"]
|
|
|
|
|
|
2019-12-10 00:59:13 +00:00
|
|
|
[[bin]]
|
2019-12-10 03:57:55 +00:00
|
|
|
name = "nu_plugin_core_inc"
|
2019-12-18 16:35:17 +00:00
|
|
|
path = "src/plugins/nu_plugin_core_inc.rs"
|
2019-12-10 00:59:13 +00:00
|
|
|
required-features = ["inc"]
|
|
|
|
|
|
2019-12-10 00:05:40 +00:00
|
|
|
[[bin]]
|
2019-12-10 03:57:55 +00:00
|
|
|
name = "nu_plugin_core_ps"
|
2019-12-18 16:35:17 +00:00
|
|
|
path = "src/plugins/nu_plugin_core_ps.rs"
|
2019-12-10 00:05:40 +00:00
|
|
|
required-features = ["ps"]
|
|
|
|
|
|
2019-12-10 00:59:13 +00:00
|
|
|
[[bin]]
|
2019-12-10 03:57:55 +00:00
|
|
|
name = "nu_plugin_core_str"
|
2019-12-18 16:35:17 +00:00
|
|
|
path = "src/plugins/nu_plugin_core_str.rs"
|
2019-12-10 00:59:13 +00:00
|
|
|
required-features = ["str"]
|
|
|
|
|
|
2019-12-10 00:05:40 +00:00
|
|
|
[[bin]]
|
2019-12-10 03:57:55 +00:00
|
|
|
name = "nu_plugin_core_sys"
|
2019-12-18 16:35:17 +00:00
|
|
|
path = "src/plugins/nu_plugin_core_sys.rs"
|
2019-12-10 00:05:40 +00:00
|
|
|
required-features = ["sys"]
|
|
|
|
|
|
|
|
|
|
# Main nu binary
|
2019-06-27 04:56:48 +00:00
|
|
|
[[bin]]
|
|
|
|
|
name = "nu"
|
|
|
|
|
path = "src/main.rs"
|
