2022-07-29 10:57:10 +02:00
|
|
|
use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
|
|
|
|
use nu_test_support::playground::Playground;
|
2023-07-12 19:07:20 +02:00
|
|
|
use nu_test_support::{nu, nu_repl_code};
|
2023-04-08 20:52:37 +02:00
|
|
|
use pretty_assertions::assert_eq;
|
2022-07-29 10:57:10 +02:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_private_import_decl() {
|
|
|
|
Playground::setup("module_private_import_decl", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"main.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-07-29 10:57:10 +02:00
|
|
|
use spam.nu foo-helper
|
|
|
|
|
|
|
|
export def foo [] { foo-helper }
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-07-29 10:57:10 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
|
|
|
r#"
|
|
|
|
def get-foo [] { "foo" }
|
|
|
|
export def foo-helper [] { get-foo }
|
|
|
|
"#,
|
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["use main.nu foo", "foo"];
|
2022-07-29 10:57:10 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp.join("; "));
|
2022-07-29 10:57:10 +02:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_private_import_alias() {
|
|
|
|
Playground::setup("module_private_import_alias", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"main.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-07-29 10:57:10 +02:00
|
|
|
use spam.nu foo-helper
|
|
|
|
|
|
|
|
export def foo [] { foo-helper }
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-07-29 10:57:10 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
|
|
|
r#"
|
Re-implement aliases (#8123)
# Description
This PR adds an alternative alias implementation. Old aliases still work
but you need to use `old-alias` instead of `alias`.
Instead of replacing spans in the original code and re-parsing, which
proved to be extremely error-prone and a constant source of panics, the
new implementation creates a new command that references the old
command. Consider the new alias defined as `alias ll = ls -l`. The
parser creates a new command called `ll` and remembers that it is
actually a `ls` command called with the `-l` flag. Then, when the parser
sees the `ll` command, it will translate it to `ls -l` and passes to it
any parameters that were passed to the call to `ll`. It works quite
similar to how known externals defined with `extern` are implemented.
The new alias implementation should work the same way as the old
aliases, including exporting from modules, referencing both known and
unknown externals. It seems to preserve custom completions and pipeline
metadata. It is quite robust in most cases but there are some rough
edges (see later).
Fixes https://github.com/nushell/nushell/issues/7648,
https://github.com/nushell/nushell/issues/8026,
https://github.com/nushell/nushell/issues/7512,
https://github.com/nushell/nushell/issues/5780,
https://github.com/nushell/nushell/issues/7754
No effect: https://github.com/nushell/nushell/issues/8122 (we might
revisit the completions code after this PR)
Should use custom command instead:
https://github.com/nushell/nushell/issues/6048
# User-Facing Changes
Since aliases are now basically commands, it has some new implications:
1. `alias spam = "spam"` (requires command call)
* **workaround**: use `alias spam = echo "spam"`
2. `def foo [] { 'foo' }; alias foo = ls -l` (foo defined more than
once)
* **workaround**: use different name (commands also have this
limitation)
4. `alias ls = (ls | sort-by type name -i)`
* **workaround**: Use custom command. _The common issue with this is
that it is currently not easy to pass flags through custom commands and
command referencing itself will lead to stack overflow. Both of these
issues are meant to be addressed._
5. TODO: Help messages, `which` command, `$nu.scope.aliases`, etc.
* Should we treat the aliases as commands or should they be separated
from regular commands?
6. Needs better error message and syntax highlight for recursed alias
(`alias f = f`)
7. Can't create alias with the same name as existing command (`alias ls
= ls -a`)
* Might be possible to add support for it (not 100% sure)
8. Standalone `alias` doesn't list aliases anymore
9. Can't alias parser keywords (e.g., stuff like `alias ou = overlay
use` won't work)
* TODO: Needs a better error message when attempting to do so
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2023-02-27 08:44:05 +01:00
|
|
|
export alias foo-helper = echo "foo"
|
2022-07-29 10:57:10 +02:00
|
|
|
"#,
|
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["use main.nu foo", "foo"];
|
2022-07-29 10:57:10 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp.join("; "));
|
2022-07-29 10:57:10 +02:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_private_import_decl_not_public() {
|
|
|
|
Playground::setup("module_private_import_decl_not_public", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"main.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-07-29 10:57:10 +02:00
|
|
|
use spam.nu foo-helper
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-07-29 10:57:10 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
|
|
|
r#"
|
|
|
|
def get-foo [] { "foo" }
|
|
|
|
export def foo-helper [] { get-foo }
|
|
|
|
"#,
|
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["use main.nu foo", "foo-helper"];
|
2022-07-29 10:57:10 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp.join("; "));
|
2022-07-29 10:57:10 +02:00
|
|
|
|
|
|
|
assert!(!actual.err.is_empty());
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_public_import_decl() {
|
|
|
|
Playground::setup("module_public_import_decl", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"main.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-07-29 10:57:10 +02:00
|
|
|
export use spam.nu foo
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-07-29 10:57:10 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
|
|
|
r#"
|
|
|
|
def foo-helper [] { "foo" }
|
|
|
|
export def foo [] { foo-helper }
|
|
|
|
"#,
|
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["use main.nu foo", "foo"];
|
2022-07-29 10:57:10 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp.join("; "));
|
2022-07-29 10:57:10 +02:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_public_import_alias() {
|
|
|
|
Playground::setup("module_public_import_alias", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"main.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-07-29 10:57:10 +02:00
|
|
|
export use spam.nu foo
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-07-29 10:57:10 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
|
|
|
r#"
|
Re-implement aliases (#8123)
# Description
This PR adds an alternative alias implementation. Old aliases still work
but you need to use `old-alias` instead of `alias`.
Instead of replacing spans in the original code and re-parsing, which
proved to be extremely error-prone and a constant source of panics, the
new implementation creates a new command that references the old
command. Consider the new alias defined as `alias ll = ls -l`. The
parser creates a new command called `ll` and remembers that it is
actually a `ls` command called with the `-l` flag. Then, when the parser
sees the `ll` command, it will translate it to `ls -l` and passes to it
any parameters that were passed to the call to `ll`. It works quite
similar to how known externals defined with `extern` are implemented.
The new alias implementation should work the same way as the old
aliases, including exporting from modules, referencing both known and
unknown externals. It seems to preserve custom completions and pipeline
metadata. It is quite robust in most cases but there are some rough
edges (see later).
Fixes https://github.com/nushell/nushell/issues/7648,
https://github.com/nushell/nushell/issues/8026,
https://github.com/nushell/nushell/issues/7512,
https://github.com/nushell/nushell/issues/5780,
https://github.com/nushell/nushell/issues/7754
No effect: https://github.com/nushell/nushell/issues/8122 (we might
revisit the completions code after this PR)
Should use custom command instead:
https://github.com/nushell/nushell/issues/6048
# User-Facing Changes
Since aliases are now basically commands, it has some new implications:
1. `alias spam = "spam"` (requires command call)
* **workaround**: use `alias spam = echo "spam"`
2. `def foo [] { 'foo' }; alias foo = ls -l` (foo defined more than
once)
* **workaround**: use different name (commands also have this
limitation)
4. `alias ls = (ls | sort-by type name -i)`
* **workaround**: Use custom command. _The common issue with this is
that it is currently not easy to pass flags through custom commands and
command referencing itself will lead to stack overflow. Both of these
issues are meant to be addressed._
5. TODO: Help messages, `which` command, `$nu.scope.aliases`, etc.
* Should we treat the aliases as commands or should they be separated
from regular commands?
6. Needs better error message and syntax highlight for recursed alias
(`alias f = f`)
7. Can't create alias with the same name as existing command (`alias ls
= ls -a`)
* Might be possible to add support for it (not 100% sure)
8. Standalone `alias` doesn't list aliases anymore
9. Can't alias parser keywords (e.g., stuff like `alias ou = overlay
use` won't work)
* TODO: Needs a better error message when attempting to do so
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2023-02-27 08:44:05 +01:00
|
|
|
export alias foo = echo "foo"
|
2022-07-29 10:57:10 +02:00
|
|
|
"#,
|
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["use main.nu foo", "foo"];
|
2022-07-29 10:57:10 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp.join("; "));
|
2022-07-29 10:57:10 +02:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_nested_imports() {
|
|
|
|
Playground::setup("module_nested_imports", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"main.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-07-29 10:57:10 +02:00
|
|
|
export use spam.nu [ foo bar ]
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-07-29 10:57:10 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-07-29 10:57:10 +02:00
|
|
|
export use spam2.nu [ foo bar ]
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-07-29 10:57:10 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam2.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-07-29 10:57:10 +02:00
|
|
|
export use spam3.nu [ foo bar ]
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-07-29 10:57:10 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam3.nu",
|
|
|
|
r#"
|
|
|
|
export def foo [] { "foo" }
|
Re-implement aliases (#8123)
# Description
This PR adds an alternative alias implementation. Old aliases still work
but you need to use `old-alias` instead of `alias`.
Instead of replacing spans in the original code and re-parsing, which
proved to be extremely error-prone and a constant source of panics, the
new implementation creates a new command that references the old
command. Consider the new alias defined as `alias ll = ls -l`. The
parser creates a new command called `ll` and remembers that it is
actually a `ls` command called with the `-l` flag. Then, when the parser
sees the `ll` command, it will translate it to `ls -l` and passes to it
any parameters that were passed to the call to `ll`. It works quite
similar to how known externals defined with `extern` are implemented.
The new alias implementation should work the same way as the old
aliases, including exporting from modules, referencing both known and
unknown externals. It seems to preserve custom completions and pipeline
metadata. It is quite robust in most cases but there are some rough
edges (see later).
Fixes https://github.com/nushell/nushell/issues/7648,
https://github.com/nushell/nushell/issues/8026,
https://github.com/nushell/nushell/issues/7512,
https://github.com/nushell/nushell/issues/5780,
https://github.com/nushell/nushell/issues/7754
No effect: https://github.com/nushell/nushell/issues/8122 (we might
revisit the completions code after this PR)
Should use custom command instead:
https://github.com/nushell/nushell/issues/6048
# User-Facing Changes
Since aliases are now basically commands, it has some new implications:
1. `alias spam = "spam"` (requires command call)
* **workaround**: use `alias spam = echo "spam"`
2. `def foo [] { 'foo' }; alias foo = ls -l` (foo defined more than
once)
* **workaround**: use different name (commands also have this
limitation)
4. `alias ls = (ls | sort-by type name -i)`
* **workaround**: Use custom command. _The common issue with this is
that it is currently not easy to pass flags through custom commands and
command referencing itself will lead to stack overflow. Both of these
issues are meant to be addressed._
5. TODO: Help messages, `which` command, `$nu.scope.aliases`, etc.
* Should we treat the aliases as commands or should they be separated
from regular commands?
6. Needs better error message and syntax highlight for recursed alias
(`alias f = f`)
7. Can't create alias with the same name as existing command (`alias ls
= ls -a`)
* Might be possible to add support for it (not 100% sure)
8. Standalone `alias` doesn't list aliases anymore
9. Can't alias parser keywords (e.g., stuff like `alias ou = overlay
use` won't work)
* TODO: Needs a better error message when attempting to do so
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2023-02-27 08:44:05 +01:00
|
|
|
export alias bar = echo "bar"
|
2022-07-29 10:57:10 +02:00
|
|
|
"#,
|
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp1 = &["use main.nu foo", "foo"];
|
|
|
|
let inp2 = &["use main.nu bar", "bar"];
|
2022-07-29 10:57:10 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp1.join("; "));
|
2022-07-29 10:57:10 +02:00
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp2.join("; "));
|
2022-07-29 10:57:10 +02:00
|
|
|
assert_eq!(actual.out, "bar");
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_nested_imports_in_dirs() {
|
|
|
|
Playground::setup("module_nested_imports_in_dirs", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.mkdir("spam")
|
|
|
|
.mkdir("spam/spam2")
|
|
|
|
.mkdir("spam/spam3")
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"main.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-07-29 10:57:10 +02:00
|
|
|
export use spam/spam.nu [ foo bar ]
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-07-29 10:57:10 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam/spam.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-07-29 10:57:10 +02:00
|
|
|
export use spam2/spam2.nu [ foo bar ]
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-07-29 10:57:10 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam/spam2/spam2.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-07-29 10:57:10 +02:00
|
|
|
export use ../spam3/spam3.nu [ foo bar ]
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-07-29 10:57:10 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam/spam3/spam3.nu",
|
|
|
|
r#"
|
|
|
|
export def foo [] { "foo" }
|
Re-implement aliases (#8123)
# Description
This PR adds an alternative alias implementation. Old aliases still work
but you need to use `old-alias` instead of `alias`.
Instead of replacing spans in the original code and re-parsing, which
proved to be extremely error-prone and a constant source of panics, the
new implementation creates a new command that references the old
command. Consider the new alias defined as `alias ll = ls -l`. The
parser creates a new command called `ll` and remembers that it is
actually a `ls` command called with the `-l` flag. Then, when the parser
sees the `ll` command, it will translate it to `ls -l` and passes to it
any parameters that were passed to the call to `ll`. It works quite
similar to how known externals defined with `extern` are implemented.
The new alias implementation should work the same way as the old
aliases, including exporting from modules, referencing both known and
unknown externals. It seems to preserve custom completions and pipeline
metadata. It is quite robust in most cases but there are some rough
edges (see later).
Fixes https://github.com/nushell/nushell/issues/7648,
https://github.com/nushell/nushell/issues/8026,
https://github.com/nushell/nushell/issues/7512,
https://github.com/nushell/nushell/issues/5780,
https://github.com/nushell/nushell/issues/7754
No effect: https://github.com/nushell/nushell/issues/8122 (we might
revisit the completions code after this PR)
Should use custom command instead:
https://github.com/nushell/nushell/issues/6048
# User-Facing Changes
Since aliases are now basically commands, it has some new implications:
1. `alias spam = "spam"` (requires command call)
* **workaround**: use `alias spam = echo "spam"`
2. `def foo [] { 'foo' }; alias foo = ls -l` (foo defined more than
once)
* **workaround**: use different name (commands also have this
limitation)
4. `alias ls = (ls | sort-by type name -i)`
* **workaround**: Use custom command. _The common issue with this is
that it is currently not easy to pass flags through custom commands and
command referencing itself will lead to stack overflow. Both of these
issues are meant to be addressed._
5. TODO: Help messages, `which` command, `$nu.scope.aliases`, etc.
* Should we treat the aliases as commands or should they be separated
from regular commands?
6. Needs better error message and syntax highlight for recursed alias
(`alias f = f`)
7. Can't create alias with the same name as existing command (`alias ls
= ls -a`)
* Might be possible to add support for it (not 100% sure)
8. Standalone `alias` doesn't list aliases anymore
9. Can't alias parser keywords (e.g., stuff like `alias ou = overlay
use` won't work)
* TODO: Needs a better error message when attempting to do so
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2023-02-27 08:44:05 +01:00
|
|
|
export alias bar = echo "bar"
|
2022-07-29 10:57:10 +02:00
|
|
|
"#,
|
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp1 = &["use main.nu foo", "foo"];
|
|
|
|
let inp2 = &["use main.nu bar", "bar"];
|
2022-07-29 10:57:10 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp1.join("; "));
|
2022-07-29 10:57:10 +02:00
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp2.join("; "));
|
2022-07-29 10:57:10 +02:00
|
|
|
assert_eq!(actual.out, "bar");
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_public_import_decl_prefixed() {
|
|
|
|
Playground::setup("module_public_import_decl", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"main.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-07-29 10:57:10 +02:00
|
|
|
export use spam.nu
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-07-29 10:57:10 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
|
|
|
r#"
|
|
|
|
def foo-helper [] { "foo" }
|
|
|
|
export def foo [] { foo-helper }
|
|
|
|
"#,
|
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["use main.nu", "main spam foo"];
|
2022-07-29 10:57:10 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp.join("; "));
|
2022-07-29 10:57:10 +02:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_nested_imports_in_dirs_prefixed() {
|
|
|
|
Playground::setup("module_nested_imports_in_dirs", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.mkdir("spam")
|
|
|
|
.mkdir("spam/spam2")
|
|
|
|
.mkdir("spam/spam3")
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"main.nu",
|
|
|
|
r#"
|
|
|
|
export use spam/spam.nu [ "spam2 foo" "spam2 spam3 bar" ]
|
|
|
|
"#,
|
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam/spam.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-07-29 10:57:10 +02:00
|
|
|
export use spam2/spam2.nu
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-07-29 10:57:10 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam/spam2/spam2.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-07-29 10:57:10 +02:00
|
|
|
export use ../spam3/spam3.nu
|
|
|
|
export use ../spam3/spam3.nu foo
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-07-29 10:57:10 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam/spam3/spam3.nu",
|
|
|
|
r#"
|
|
|
|
export def foo [] { "foo" }
|
Re-implement aliases (#8123)
# Description
This PR adds an alternative alias implementation. Old aliases still work
but you need to use `old-alias` instead of `alias`.
Instead of replacing spans in the original code and re-parsing, which
proved to be extremely error-prone and a constant source of panics, the
new implementation creates a new command that references the old
command. Consider the new alias defined as `alias ll = ls -l`. The
parser creates a new command called `ll` and remembers that it is
actually a `ls` command called with the `-l` flag. Then, when the parser
sees the `ll` command, it will translate it to `ls -l` and passes to it
any parameters that were passed to the call to `ll`. It works quite
similar to how known externals defined with `extern` are implemented.
The new alias implementation should work the same way as the old
aliases, including exporting from modules, referencing both known and
unknown externals. It seems to preserve custom completions and pipeline
metadata. It is quite robust in most cases but there are some rough
edges (see later).
Fixes https://github.com/nushell/nushell/issues/7648,
https://github.com/nushell/nushell/issues/8026,
https://github.com/nushell/nushell/issues/7512,
https://github.com/nushell/nushell/issues/5780,
https://github.com/nushell/nushell/issues/7754
No effect: https://github.com/nushell/nushell/issues/8122 (we might
revisit the completions code after this PR)
Should use custom command instead:
https://github.com/nushell/nushell/issues/6048
# User-Facing Changes
Since aliases are now basically commands, it has some new implications:
1. `alias spam = "spam"` (requires command call)
* **workaround**: use `alias spam = echo "spam"`
2. `def foo [] { 'foo' }; alias foo = ls -l` (foo defined more than
once)
* **workaround**: use different name (commands also have this
limitation)
4. `alias ls = (ls | sort-by type name -i)`
* **workaround**: Use custom command. _The common issue with this is
that it is currently not easy to pass flags through custom commands and
command referencing itself will lead to stack overflow. Both of these
issues are meant to be addressed._
5. TODO: Help messages, `which` command, `$nu.scope.aliases`, etc.
* Should we treat the aliases as commands or should they be separated
from regular commands?
6. Needs better error message and syntax highlight for recursed alias
(`alias f = f`)
7. Can't create alias with the same name as existing command (`alias ls
= ls -a`)
* Might be possible to add support for it (not 100% sure)
8. Standalone `alias` doesn't list aliases anymore
9. Can't alias parser keywords (e.g., stuff like `alias ou = overlay
use` won't work)
* TODO: Needs a better error message when attempting to do so
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2023-02-27 08:44:05 +01:00
|
|
|
export alias bar = echo "bar"
|
2022-07-29 10:57:10 +02:00
|
|
|
"#,
|
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp1 = &["use main.nu", "main spam2 foo"];
|
|
|
|
let inp2 = &[r#"use main.nu "spam2 spam3 bar""#, "spam2 spam3 bar"];
|
2022-07-29 10:57:10 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp1.join("; "));
|
2022-07-29 10:57:10 +02:00
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp2.join("; "));
|
2022-07-29 10:57:10 +02:00
|
|
|
assert_eq!(actual.out, "bar");
|
|
|
|
})
|
|
|
|
}
|
2022-08-23 09:45:17 +02:00
|
|
|
|
|
|
|
#[test]
|
2022-08-31 22:32:56 +02:00
|
|
|
fn module_import_env_1() {
|
2022-12-30 16:44:37 +01:00
|
|
|
Playground::setup("module_import_env_1", |dirs, sandbox| {
|
2022-08-31 22:32:56 +02:00
|
|
|
sandbox
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"main.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-08-31 22:32:56 +02:00
|
|
|
export-env { source-env spam.nu }
|
|
|
|
|
|
|
|
export def foo [] { $env.FOO_HELPER }
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-08-31 22:32:56 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
|
|
|
r#"
|
2023-06-30 21:57:51 +02:00
|
|
|
export-env { $env.FOO_HELPER = "foo" }
|
2022-08-31 22:32:56 +02:00
|
|
|
"#,
|
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["source-env main.nu", "use main.nu foo", "foo"];
|
2022-08-31 22:32:56 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp.join("; "));
|
2022-08-31 22:32:56 +02:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_import_env_2() {
|
|
|
|
Playground::setup("module_import_env_2", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"main.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-08-31 22:32:56 +02:00
|
|
|
export-env { source-env spam.nu }
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-08-31 22:32:56 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
|
|
|
r#"
|
2023-06-30 21:57:51 +02:00
|
|
|
export-env { $env.FOO = "foo" }
|
2022-08-31 22:32:56 +02:00
|
|
|
"#,
|
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["source-env main.nu", "$env.FOO"];
|
2022-08-23 09:45:17 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp.join("; "));
|
2022-08-23 09:45:17 +02:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
})
|
|
|
|
}
|
2022-09-04 22:19:20 +02:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_cyclical_imports_0() {
|
|
|
|
Playground::setup("module_cyclical_imports_0", |dirs, sandbox| {
|
|
|
|
sandbox.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-09-04 22:19:20 +02:00
|
|
|
use eggs.nu
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-09-04 22:19:20 +02:00
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["module eggs { use spam.nu }"];
|
2022-09-04 22:19:20 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp.join("; "));
|
2022-09-04 22:19:20 +02:00
|
|
|
|
|
|
|
assert!(actual.err.contains("module not found"));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_cyclical_imports_1() {
|
|
|
|
Playground::setup("module_cyclical_imports_1", |dirs, sandbox| {
|
|
|
|
sandbox.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-09-04 22:19:20 +02:00
|
|
|
use spam.nu
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-09-04 22:19:20 +02:00
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["use spam.nu"];
|
2022-09-04 22:19:20 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp.join("; "));
|
2022-09-04 22:19:20 +02:00
|
|
|
|
|
|
|
assert!(actual.err.contains("cyclical"));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_cyclical_imports_2() {
|
|
|
|
Playground::setup("module_cyclical_imports_2", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-09-04 22:19:20 +02:00
|
|
|
use eggs.nu
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-09-04 22:19:20 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"eggs.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-09-04 22:19:20 +02:00
|
|
|
use spam.nu
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-09-04 22:19:20 +02:00
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["use spam.nu"];
|
2022-09-04 22:19:20 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp.join("; "));
|
2022-09-04 22:19:20 +02:00
|
|
|
|
|
|
|
assert!(actual.err.contains("cyclical"));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_cyclical_imports_3() {
|
|
|
|
Playground::setup("module_cyclical_imports_3", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-09-04 22:19:20 +02:00
|
|
|
use eggs.nu
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-09-04 22:19:20 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"eggs.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-09-04 22:19:20 +02:00
|
|
|
use bacon.nu
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-09-04 22:19:20 +02:00
|
|
|
)])
|
|
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"bacon.nu",
|
2023-07-12 19:07:20 +02:00
|
|
|
"
|
2022-09-04 22:19:20 +02:00
|
|
|
use spam.nu
|
2023-07-12 19:07:20 +02:00
|
|
|
",
|
2022-09-04 22:19:20 +02:00
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["use spam.nu"];
|
2022-09-04 22:19:20 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp.join("; "));
|
2022-09-04 22:19:20 +02:00
|
|
|
|
|
|
|
assert!(actual.err.contains("cyclical"));
|
|
|
|
})
|
|
|
|
}
|
2022-12-21 23:21:03 +01:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_import_const_file() {
|
|
|
|
Playground::setup("module_import_const_file", |dirs, sandbox| {
|
|
|
|
sandbox.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
|
|
|
r#"
|
|
|
|
export def foo [] { "foo" }
|
|
|
|
"#,
|
|
|
|
)]);
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["const file = 'spam.nu'", "use $file foo", "foo"];
|
2022-12-21 23:21:03 +01:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp.join("; "));
|
2022-12-21 23:21:03 +01:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_import_const_module_name() {
|
|
|
|
Playground::setup("module_import_const_file", |dirs, sandbox| {
|
|
|
|
sandbox.with_files(vec![FileWithContentToBeTrimmed(
|
|
|
|
"spam.nu",
|
|
|
|
r#"
|
|
|
|
export def foo [] { "foo" }
|
|
|
|
"#,
|
|
|
|
)]);
|
|
|
|
|
|
|
|
let inp = &[
|
|
|
|
r#"module spam { export def foo [] { "foo" } }"#,
|
2023-07-12 19:07:20 +02:00
|
|
|
"const mod = 'spam'",
|
|
|
|
"use $mod foo",
|
|
|
|
"foo",
|
2022-12-21 23:21:03 +01:00
|
|
|
];
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: dirs.test(), &inp.join("; "));
|
2022-12-21 23:21:03 +01:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
})
|
|
|
|
}
|
2023-01-22 20:34:15 +01:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_valid_def_name() {
|
|
|
|
let inp = &[r#"module spam { def spam [] { "spam" } }"#];
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-01-22 20:34:15 +01:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_invalid_def_name() {
|
|
|
|
let inp = &[r#"module spam { export def spam [] { "spam" } }"#];
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-01-22 20:34:15 +01:00
|
|
|
|
|
|
|
assert!(actual.err.contains("named_as_module"));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_valid_alias_name_1() {
|
Re-implement aliases (#8123)
# Description
This PR adds an alternative alias implementation. Old aliases still work
but you need to use `old-alias` instead of `alias`.
Instead of replacing spans in the original code and re-parsing, which
proved to be extremely error-prone and a constant source of panics, the
new implementation creates a new command that references the old
command. Consider the new alias defined as `alias ll = ls -l`. The
parser creates a new command called `ll` and remembers that it is
actually a `ls` command called with the `-l` flag. Then, when the parser
sees the `ll` command, it will translate it to `ls -l` and passes to it
any parameters that were passed to the call to `ll`. It works quite
similar to how known externals defined with `extern` are implemented.
The new alias implementation should work the same way as the old
aliases, including exporting from modules, referencing both known and
unknown externals. It seems to preserve custom completions and pipeline
metadata. It is quite robust in most cases but there are some rough
edges (see later).
Fixes https://github.com/nushell/nushell/issues/7648,
https://github.com/nushell/nushell/issues/8026,
https://github.com/nushell/nushell/issues/7512,
https://github.com/nushell/nushell/issues/5780,
https://github.com/nushell/nushell/issues/7754
No effect: https://github.com/nushell/nushell/issues/8122 (we might
revisit the completions code after this PR)
Should use custom command instead:
https://github.com/nushell/nushell/issues/6048
# User-Facing Changes
Since aliases are now basically commands, it has some new implications:
1. `alias spam = "spam"` (requires command call)
* **workaround**: use `alias spam = echo "spam"`
2. `def foo [] { 'foo' }; alias foo = ls -l` (foo defined more than
once)
* **workaround**: use different name (commands also have this
limitation)
4. `alias ls = (ls | sort-by type name -i)`
* **workaround**: Use custom command. _The common issue with this is
that it is currently not easy to pass flags through custom commands and
command referencing itself will lead to stack overflow. Both of these
issues are meant to be addressed._
5. TODO: Help messages, `which` command, `$nu.scope.aliases`, etc.
* Should we treat the aliases as commands or should they be separated
from regular commands?
6. Needs better error message and syntax highlight for recursed alias
(`alias f = f`)
7. Can't create alias with the same name as existing command (`alias ls
= ls -a`)
* Might be possible to add support for it (not 100% sure)
8. Standalone `alias` doesn't list aliases anymore
9. Can't alias parser keywords (e.g., stuff like `alias ou = overlay
use` won't work)
* TODO: Needs a better error message when attempting to do so
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2023-02-27 08:44:05 +01:00
|
|
|
let inp = &[r#"module spam { alias spam = echo "spam" }"#];
|
2023-01-22 20:34:15 +01:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-01-22 20:34:15 +01:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_valid_alias_name_2() {
|
Re-implement aliases (#8123)
# Description
This PR adds an alternative alias implementation. Old aliases still work
but you need to use `old-alias` instead of `alias`.
Instead of replacing spans in the original code and re-parsing, which
proved to be extremely error-prone and a constant source of panics, the
new implementation creates a new command that references the old
command. Consider the new alias defined as `alias ll = ls -l`. The
parser creates a new command called `ll` and remembers that it is
actually a `ls` command called with the `-l` flag. Then, when the parser
sees the `ll` command, it will translate it to `ls -l` and passes to it
any parameters that were passed to the call to `ll`. It works quite
similar to how known externals defined with `extern` are implemented.
The new alias implementation should work the same way as the old
aliases, including exporting from modules, referencing both known and
unknown externals. It seems to preserve custom completions and pipeline
metadata. It is quite robust in most cases but there are some rough
edges (see later).
Fixes https://github.com/nushell/nushell/issues/7648,
https://github.com/nushell/nushell/issues/8026,
https://github.com/nushell/nushell/issues/7512,
https://github.com/nushell/nushell/issues/5780,
https://github.com/nushell/nushell/issues/7754
No effect: https://github.com/nushell/nushell/issues/8122 (we might
revisit the completions code after this PR)
Should use custom command instead:
https://github.com/nushell/nushell/issues/6048
# User-Facing Changes
Since aliases are now basically commands, it has some new implications:
1. `alias spam = "spam"` (requires command call)
* **workaround**: use `alias spam = echo "spam"`
2. `def foo [] { 'foo' }; alias foo = ls -l` (foo defined more than
once)
* **workaround**: use different name (commands also have this
limitation)
4. `alias ls = (ls | sort-by type name -i)`
* **workaround**: Use custom command. _The common issue with this is
that it is currently not easy to pass flags through custom commands and
command referencing itself will lead to stack overflow. Both of these
issues are meant to be addressed._
5. TODO: Help messages, `which` command, `$nu.scope.aliases`, etc.
* Should we treat the aliases as commands or should they be separated
from regular commands?
6. Needs better error message and syntax highlight for recursed alias
(`alias f = f`)
7. Can't create alias with the same name as existing command (`alias ls
= ls -a`)
* Might be possible to add support for it (not 100% sure)
8. Standalone `alias` doesn't list aliases anymore
9. Can't alias parser keywords (e.g., stuff like `alias ou = overlay
use` won't work)
* TODO: Needs a better error message when attempting to do so
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2023-02-27 08:44:05 +01:00
|
|
|
let inp = &[r#"module spam { alias main = echo "spam" }"#];
|
2023-01-22 20:34:15 +01:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-01-22 20:34:15 +01:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_invalid_alias_name() {
|
Re-implement aliases (#8123)
# Description
This PR adds an alternative alias implementation. Old aliases still work
but you need to use `old-alias` instead of `alias`.
Instead of replacing spans in the original code and re-parsing, which
proved to be extremely error-prone and a constant source of panics, the
new implementation creates a new command that references the old
command. Consider the new alias defined as `alias ll = ls -l`. The
parser creates a new command called `ll` and remembers that it is
actually a `ls` command called with the `-l` flag. Then, when the parser
sees the `ll` command, it will translate it to `ls -l` and passes to it
any parameters that were passed to the call to `ll`. It works quite
similar to how known externals defined with `extern` are implemented.
The new alias implementation should work the same way as the old
aliases, including exporting from modules, referencing both known and
unknown externals. It seems to preserve custom completions and pipeline
metadata. It is quite robust in most cases but there are some rough
edges (see later).
Fixes https://github.com/nushell/nushell/issues/7648,
https://github.com/nushell/nushell/issues/8026,
https://github.com/nushell/nushell/issues/7512,
https://github.com/nushell/nushell/issues/5780,
https://github.com/nushell/nushell/issues/7754
No effect: https://github.com/nushell/nushell/issues/8122 (we might
revisit the completions code after this PR)
Should use custom command instead:
https://github.com/nushell/nushell/issues/6048
# User-Facing Changes
Since aliases are now basically commands, it has some new implications:
1. `alias spam = "spam"` (requires command call)
* **workaround**: use `alias spam = echo "spam"`
2. `def foo [] { 'foo' }; alias foo = ls -l` (foo defined more than
once)
* **workaround**: use different name (commands also have this
limitation)
4. `alias ls = (ls | sort-by type name -i)`
* **workaround**: Use custom command. _The common issue with this is
that it is currently not easy to pass flags through custom commands and
command referencing itself will lead to stack overflow. Both of these
issues are meant to be addressed._
5. TODO: Help messages, `which` command, `$nu.scope.aliases`, etc.
* Should we treat the aliases as commands or should they be separated
from regular commands?
6. Needs better error message and syntax highlight for recursed alias
(`alias f = f`)
7. Can't create alias with the same name as existing command (`alias ls
= ls -a`)
* Might be possible to add support for it (not 100% sure)
8. Standalone `alias` doesn't list aliases anymore
9. Can't alias parser keywords (e.g., stuff like `alias ou = overlay
use` won't work)
* TODO: Needs a better error message when attempting to do so
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2023-02-27 08:44:05 +01:00
|
|
|
let inp = &[r#"module spam { export alias spam = echo "spam" }"#];
|
2023-01-22 20:34:15 +01:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-01-22 20:34:15 +01:00
|
|
|
|
|
|
|
assert!(actual.err.contains("named_as_module"));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_main_alias_not_allowed() {
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["module spam { export alias main = echo 'spam' }"];
|
2023-01-22 20:34:15 +01:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-01-22 20:34:15 +01:00
|
|
|
|
|
|
|
assert!(actual.err.contains("export_main_alias_not_allowed"));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_valid_known_external_name() {
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["module spam { extern spam [] }"];
|
2023-01-22 20:34:15 +01:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-01-22 20:34:15 +01:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_invalid_known_external_name() {
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["module spam { export extern spam [] }"];
|
2023-01-22 20:34:15 +01:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-01-22 20:34:15 +01:00
|
|
|
|
|
|
|
assert!(actual.err.contains("named_as_module"));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn main_inside_module_is_main() {
|
|
|
|
let inp = &[
|
2023-07-12 19:07:20 +02:00
|
|
|
"module spam {
|
2023-01-22 20:34:15 +01:00
|
|
|
export def main [] { 'foo' };
|
|
|
|
export def foo [] { main }
|
2023-07-12 19:07:20 +02:00
|
|
|
}",
|
2023-01-22 20:34:15 +01:00
|
|
|
"use spam foo",
|
|
|
|
"foo",
|
|
|
|
];
|
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-01-22 20:34:15 +01:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
}
|
2023-05-06 20:39:54 +02:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_as_file() {
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["module samples/spam.nu", "use spam foo", "foo"];
|
2023-05-06 20:39:54 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: "tests/modules", &inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn export_module_as_file() {
|
2023-07-12 19:07:20 +02:00
|
|
|
let inp = &["export module samples/spam.nu", "use spam foo", "foo"];
|
2023-05-06 20:39:54 +02:00
|
|
|
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: "tests/modules", &inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn deep_import_patterns() {
|
2023-07-12 19:07:20 +02:00
|
|
|
let module_decl = "
|
2023-05-06 20:39:54 +02:00
|
|
|
module spam {
|
|
|
|
export module eggs {
|
|
|
|
export module beans {
|
|
|
|
export def foo [] { 'foo' };
|
|
|
|
export def bar [] { 'bar' }
|
|
|
|
};
|
|
|
|
};
|
|
|
|
}
|
2023-07-12 19:07:20 +02:00
|
|
|
";
|
2023-05-06 20:39:54 +02:00
|
|
|
|
|
|
|
let inp = &[module_decl, "use spam", "spam eggs beans foo"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
|
|
|
|
let inp = &[module_decl, "use spam eggs", "eggs beans foo"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
|
|
|
|
let inp = &[module_decl, "use spam eggs beans", "beans foo"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
|
|
|
|
let inp = &[module_decl, "use spam eggs beans foo", "foo"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_dir() {
|
|
|
|
let import = "use samples/spam";
|
|
|
|
|
|
|
|
let inp = &[import, "spam"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: "tests/modules", &inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert_eq!(actual.out, "spam");
|
|
|
|
|
|
|
|
let inp = &[import, "spam foo"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: "tests/modules", &inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
|
|
|
|
let inp = &[import, "spam bar"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: "tests/modules", &inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert_eq!(actual.out, "bar");
|
|
|
|
|
|
|
|
let inp = &[import, "spam foo baz"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: "tests/modules", &inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert_eq!(actual.out, "foobaz");
|
|
|
|
|
|
|
|
let inp = &[import, "spam bar baz"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: "tests/modules", &inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert_eq!(actual.out, "barbaz");
|
|
|
|
|
|
|
|
let inp = &[import, "spam baz"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: "tests/modules", &inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert_eq!(actual.out, "spambaz");
|
|
|
|
}
|
|
|
|
|
2023-05-13 00:20:33 +02:00
|
|
|
#[test]
|
|
|
|
fn module_dir_deep() {
|
|
|
|
let import = "use samples/spam";
|
|
|
|
|
|
|
|
let inp = &[import, "spam bacon"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual_repl = nu!(cwd: "tests/modules", &inp.join("; "));
|
2023-05-13 00:20:33 +02:00
|
|
|
assert_eq!(actual_repl.out, "bacon");
|
|
|
|
|
|
|
|
let inp = &[import, "spam bacon foo"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual_repl = nu!(cwd: "tests/modules", &inp.join("; "));
|
2023-05-13 00:20:33 +02:00
|
|
|
assert_eq!(actual_repl.out, "bacon foo");
|
|
|
|
|
|
|
|
let inp = &[import, "spam bacon beans"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual_repl = nu!(cwd: "tests/modules", &inp.join("; "));
|
2023-05-13 00:20:33 +02:00
|
|
|
assert_eq!(actual_repl.out, "beans");
|
|
|
|
|
|
|
|
let inp = &[import, "spam bacon beans foo"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual_repl = nu!(cwd: "tests/modules", &inp.join("; "));
|
2023-05-13 00:20:33 +02:00
|
|
|
assert_eq!(actual_repl.out, "beans foo");
|
|
|
|
}
|
|
|
|
|
2023-05-07 13:41:40 +02:00
|
|
|
#[test]
|
|
|
|
fn module_dir_import_twice_no_panic() {
|
|
|
|
let import = "use samples/spam";
|
|
|
|
let inp = &[import, import, "spam"];
|
|
|
|
let actual_repl = nu!(cwd: "tests/modules", nu_repl_code(inp));
|
|
|
|
assert_eq!(actual_repl.out, "spam");
|
|
|
|
}
|
|
|
|
|
2023-05-06 20:39:54 +02:00
|
|
|
#[test]
|
|
|
|
fn not_allowed_submodule_file() {
|
|
|
|
let inp = &["use samples/not_allowed"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: "tests/modules", &inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert!(actual.err.contains("invalid_module_file_name"));
|
|
|
|
}
|
|
|
|
|
2023-05-13 00:20:33 +02:00
|
|
|
#[test]
|
|
|
|
fn module_dir_missing_mod_nu() {
|
|
|
|
let inp = &["use samples/missing_mod_nu"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(cwd: "tests/modules", &inp.join("; "));
|
2023-05-13 00:20:33 +02:00
|
|
|
assert!(actual.err.contains("module_missing_mod_nu_file"));
|
|
|
|
}
|
|
|
|
|
2023-05-06 20:39:54 +02:00
|
|
|
#[test]
|
|
|
|
fn allowed_local_module() {
|
|
|
|
let inp = &["module spam { module spam {} }"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert!(actual.err.is_empty());
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn not_allowed_submodule() {
|
|
|
|
let inp = &["module spam { export module spam {} }"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert!(actual.err.contains("named_as_module"));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_self_name() {
|
|
|
|
let inp = &[
|
|
|
|
"module spam { export module mod { export def main [] { 'spam' } } }",
|
|
|
|
"use spam",
|
|
|
|
"spam",
|
|
|
|
];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert_eq!(actual.out, "spam");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_self_name_main_not_allowed() {
|
|
|
|
let inp = &[
|
2023-07-12 19:07:20 +02:00
|
|
|
"module spam {
|
2023-05-06 20:39:54 +02:00
|
|
|
export def main [] { 'main spam' };
|
|
|
|
|
|
|
|
export module mod {
|
|
|
|
export def main [] { 'mod spam' }
|
|
|
|
}
|
2023-07-12 19:07:20 +02:00
|
|
|
}",
|
2023-05-06 20:39:54 +02:00
|
|
|
"use spam",
|
|
|
|
"spam",
|
|
|
|
];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert!(actual.err.contains("module_double_main"));
|
|
|
|
|
|
|
|
let inp = &[
|
2023-07-12 19:07:20 +02:00
|
|
|
"module spam {
|
2023-05-06 20:39:54 +02:00
|
|
|
export module mod {
|
|
|
|
export def main [] { 'mod spam' }
|
|
|
|
};
|
|
|
|
|
|
|
|
export def main [] { 'main spam' }
|
2023-07-12 19:07:20 +02:00
|
|
|
}",
|
2023-05-06 20:39:54 +02:00
|
|
|
"use spam",
|
|
|
|
"spam",
|
|
|
|
];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert!(actual.err.contains("module_double_main"));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn module_main_not_found() {
|
|
|
|
let inp = &["module spam {}", "use spam main"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert!(actual.err.contains("export_not_found"));
|
|
|
|
|
|
|
|
let inp = &["module spam {}", "use spam [ main ]"];
|
2023-07-12 19:07:20 +02:00
|
|
|
let actual = nu!(&inp.join("; "));
|
2023-05-06 20:39:54 +02:00
|
|
|
assert!(actual.err.contains("export_not_found"));
|
|
|
|
}
|