mirror of
https://github.com/nushell/nushell.git
synced 2025-01-24 23:29:52 +01:00
2595f31541
# Description - Plugin signatures are now saved to `plugin.msgpackz`, which is brotli-compressed MessagePack. - The file is updated incrementally, rather than writing all plugin commands in the engine every time. - The file always contains the result of the `Signature` call to the plugin, even if commands were removed. - Invalid data for a particular plugin just causes an error to be reported, but the rest of the plugins can still be parsed # User-Facing Changes - The plugin file has a different filename, and it's not a nushell script. - The default `plugin.nu` file will be automatically migrated the first time, but not other plugin config files. - We don't currently provide any utilities that could help edit this file, beyond `plugin add` and `plugin rm` - `from msgpackz`, `to msgpackz` could also help - New commands: `plugin add`, `plugin rm` # Tests + Formatting Tests added for the format and for the invalid handling. - 🟢 `toolkit fmt` - 🟢 `toolkit clippy` - 🟢 `toolkit test` - 🟢 `toolkit test stdlib` # After Submitting - [ ] Check for documentation changes - [ ] Definitely needs release notes
298 lines
8.7 KiB
Rust
298 lines
8.7 KiB
Rust
#[cfg(feature = "plugin")]
|
|
use crate::config_files::NUSHELL_FOLDER;
|
|
use crate::{
|
|
command,
|
|
config_files::{self, setup_config},
|
|
};
|
|
use log::trace;
|
|
#[cfg(feature = "plugin")]
|
|
use nu_cli::read_plugin_file;
|
|
use nu_cli::{evaluate_commands, evaluate_file, evaluate_repl};
|
|
use nu_protocol::{eval_const::create_nu_constant, PipelineData, Span, NU_VARIABLE_ID};
|
|
use nu_utils::utils::perf;
|
|
|
|
pub(crate) fn run_commands(
|
|
engine_state: &mut nu_protocol::engine::EngineState,
|
|
parsed_nu_cli_args: command::NushellCliArgs,
|
|
use_color: bool,
|
|
commands: &nu_protocol::Spanned<String>,
|
|
input: PipelineData,
|
|
entire_start_time: std::time::Instant,
|
|
) -> Result<(), miette::ErrReport> {
|
|
trace!("run_commands");
|
|
let mut stack = nu_protocol::engine::Stack::new();
|
|
let start_time = std::time::Instant::now();
|
|
|
|
// if the --no-config-file(-n) option is NOT passed, load the plugin file,
|
|
// load the default env file or custom (depending on parsed_nu_cli_args.env_file),
|
|
// and maybe a custom config file (depending on parsed_nu_cli_args.config_file)
|
|
//
|
|
// if the --no-config-file(-n) flag is passed, do not load plugin, env, or config files
|
|
if parsed_nu_cli_args.no_config_file.is_none() {
|
|
#[cfg(feature = "plugin")]
|
|
read_plugin_file(engine_state, parsed_nu_cli_args.plugin_file, NUSHELL_FOLDER);
|
|
|
|
perf(
|
|
"read plugins",
|
|
start_time,
|
|
file!(),
|
|
line!(),
|
|
column!(),
|
|
use_color,
|
|
);
|
|
|
|
let start_time = std::time::Instant::now();
|
|
// If we have a env file parameter *OR* we have a login shell parameter, read the env file
|
|
if parsed_nu_cli_args.env_file.is_some() || parsed_nu_cli_args.login_shell.is_some() {
|
|
config_files::read_config_file(
|
|
engine_state,
|
|
&mut stack,
|
|
parsed_nu_cli_args.env_file,
|
|
true,
|
|
);
|
|
} else {
|
|
config_files::read_default_env_file(engine_state, &mut stack)
|
|
}
|
|
|
|
perf(
|
|
"read env.nu",
|
|
start_time,
|
|
file!(),
|
|
line!(),
|
|
column!(),
|
|
use_color,
|
|
);
|
|
|
|
let start_time = std::time::Instant::now();
|
|
// If we have a config file parameter *OR* we have a login shell parameter, read the config file
|
|
if parsed_nu_cli_args.config_file.is_some() || parsed_nu_cli_args.login_shell.is_some() {
|
|
config_files::read_config_file(
|
|
engine_state,
|
|
&mut stack,
|
|
parsed_nu_cli_args.config_file,
|
|
false,
|
|
);
|
|
}
|
|
|
|
perf(
|
|
"read config.nu",
|
|
start_time,
|
|
file!(),
|
|
line!(),
|
|
column!(),
|
|
use_color,
|
|
);
|
|
|
|
// If we have a login shell parameter, read the login file
|
|
let start_time = std::time::Instant::now();
|
|
if parsed_nu_cli_args.login_shell.is_some() {
|
|
config_files::read_loginshell_file(engine_state, &mut stack);
|
|
}
|
|
|
|
perf(
|
|
"read login.nu",
|
|
start_time,
|
|
file!(),
|
|
line!(),
|
|
column!(),
|
|
use_color,
|
|
);
|
|
}
|
|
|
|
// Before running commands, set up the startup time
|
|
engine_state.set_startup_time(entire_start_time.elapsed().as_nanos() as i64);
|
|
|
|
// Regenerate the $nu constant to contain the startup time and any other potential updates
|
|
let nu_const = create_nu_constant(engine_state, commands.span)?;
|
|
engine_state.set_variable_const_val(NU_VARIABLE_ID, nu_const);
|
|
|
|
let start_time = std::time::Instant::now();
|
|
let ret_val = evaluate_commands(
|
|
commands,
|
|
engine_state,
|
|
&mut stack,
|
|
input,
|
|
parsed_nu_cli_args.table_mode,
|
|
parsed_nu_cli_args.no_newline.is_some(),
|
|
);
|
|
perf(
|
|
"evaluate_commands",
|
|
start_time,
|
|
file!(),
|
|
line!(),
|
|
column!(),
|
|
use_color,
|
|
);
|
|
|
|
match ret_val {
|
|
Ok(Some(exit_code)) => std::process::exit(exit_code as i32),
|
|
Ok(None) => Ok(()),
|
|
Err(e) => Err(e),
|
|
}
|
|
}
|
|
|
|
pub(crate) fn run_file(
|
|
engine_state: &mut nu_protocol::engine::EngineState,
|
|
parsed_nu_cli_args: command::NushellCliArgs,
|
|
use_color: bool,
|
|
script_name: String,
|
|
args_to_script: Vec<String>,
|
|
input: PipelineData,
|
|
) -> Result<(), miette::ErrReport> {
|
|
trace!("run_file");
|
|
let mut stack = nu_protocol::engine::Stack::new();
|
|
|
|
// if the --no-config-file(-n) option is NOT passed, load the plugin file,
|
|
// load the default env file or custom (depending on parsed_nu_cli_args.env_file),
|
|
// and maybe a custom config file (depending on parsed_nu_cli_args.config_file)
|
|
//
|
|
// if the --no-config-file(-n) flag is passed, do not load plugin, env, or config files
|
|
if parsed_nu_cli_args.no_config_file.is_none() {
|
|
let start_time = std::time::Instant::now();
|
|
#[cfg(feature = "plugin")]
|
|
read_plugin_file(engine_state, parsed_nu_cli_args.plugin_file, NUSHELL_FOLDER);
|
|
perf(
|
|
"read plugins",
|
|
start_time,
|
|
file!(),
|
|
line!(),
|
|
column!(),
|
|
use_color,
|
|
);
|
|
|
|
let start_time = std::time::Instant::now();
|
|
// only want to load config and env if relative argument is provided.
|
|
if parsed_nu_cli_args.env_file.is_some() {
|
|
config_files::read_config_file(
|
|
engine_state,
|
|
&mut stack,
|
|
parsed_nu_cli_args.env_file,
|
|
true,
|
|
);
|
|
} else {
|
|
config_files::read_default_env_file(engine_state, &mut stack)
|
|
}
|
|
perf(
|
|
"read env.nu",
|
|
start_time,
|
|
file!(),
|
|
line!(),
|
|
column!(),
|
|
use_color,
|
|
);
|
|
|
|
let start_time = std::time::Instant::now();
|
|
if parsed_nu_cli_args.config_file.is_some() {
|
|
config_files::read_config_file(
|
|
engine_state,
|
|
&mut stack,
|
|
parsed_nu_cli_args.config_file,
|
|
false,
|
|
);
|
|
}
|
|
perf(
|
|
"read config.nu",
|
|
start_time,
|
|
file!(),
|
|
line!(),
|
|
column!(),
|
|
use_color,
|
|
);
|
|
}
|
|
|
|
// Regenerate the $nu constant to contain the startup time and any other potential updates
|
|
let nu_const = create_nu_constant(engine_state, input.span().unwrap_or_else(Span::unknown))?;
|
|
engine_state.set_variable_const_val(NU_VARIABLE_ID, nu_const);
|
|
|
|
let start_time = std::time::Instant::now();
|
|
let ret_val = evaluate_file(
|
|
script_name,
|
|
&args_to_script,
|
|
engine_state,
|
|
&mut stack,
|
|
input,
|
|
);
|
|
perf(
|
|
"evaluate_file",
|
|
start_time,
|
|
file!(),
|
|
line!(),
|
|
column!(),
|
|
use_color,
|
|
);
|
|
|
|
let start_time = std::time::Instant::now();
|
|
let last_exit_code = stack.get_env_var(&*engine_state, "LAST_EXIT_CODE");
|
|
if let Some(last_exit_code) = last_exit_code {
|
|
let value = last_exit_code.as_int();
|
|
if let Ok(value) = value {
|
|
if value != 0 {
|
|
std::process::exit(value as i32);
|
|
}
|
|
}
|
|
}
|
|
perf(
|
|
"get exit code",
|
|
start_time,
|
|
file!(),
|
|
line!(),
|
|
column!(),
|
|
use_color,
|
|
);
|
|
|
|
ret_val
|
|
}
|
|
|
|
pub(crate) fn run_repl(
|
|
engine_state: &mut nu_protocol::engine::EngineState,
|
|
parsed_nu_cli_args: command::NushellCliArgs,
|
|
entire_start_time: std::time::Instant,
|
|
) -> Result<(), miette::ErrReport> {
|
|
trace!("run_repl");
|
|
let mut stack = nu_protocol::engine::Stack::new();
|
|
let start_time = std::time::Instant::now();
|
|
|
|
if parsed_nu_cli_args.no_config_file.is_none() {
|
|
setup_config(
|
|
engine_state,
|
|
&mut stack,
|
|
#[cfg(feature = "plugin")]
|
|
parsed_nu_cli_args.plugin_file,
|
|
parsed_nu_cli_args.config_file,
|
|
parsed_nu_cli_args.env_file,
|
|
parsed_nu_cli_args.login_shell.is_some(),
|
|
);
|
|
}
|
|
|
|
// Reload use_color from config in case it's different from the default value
|
|
let use_color = engine_state.get_config().use_ansi_coloring;
|
|
perf(
|
|
"setup_config",
|
|
start_time,
|
|
file!(),
|
|
line!(),
|
|
column!(),
|
|
use_color,
|
|
);
|
|
|
|
let start_time = std::time::Instant::now();
|
|
let ret_val = evaluate_repl(
|
|
engine_state,
|
|
stack,
|
|
config_files::NUSHELL_FOLDER,
|
|
parsed_nu_cli_args.execute,
|
|
parsed_nu_cli_args.no_std_lib,
|
|
entire_start_time,
|
|
);
|
|
perf(
|
|
"evaluate_repl",
|
|
start_time,
|
|
file!(),
|
|
line!(),
|
|
column!(),
|
|
use_color,
|
|
);
|
|
|
|
ret_val
|
|
}
|