Add command_prelude module (#12291)

# Description
When implementing a `Command`, one must also import all the types
present in the function signatures for `Command`. This makes it so that
we often import the same set of types in each command implementation
file. E.g., something like this:
```rust
use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{
    record, Category, Example, IntoInterruptiblePipelineData, IntoPipelineData, PipelineData,
    ShellError, Signature, Span, Type, Value,
};
```

This PR adds the `nu_engine::command_prelude` module which contains the
necessary and commonly used types to implement a `Command`:
```rust
// command_prelude.rs
pub use crate::CallExt;
pub use nu_protocol::{
    ast::{Call, CellPath},
    engine::{Command, EngineState, Stack},
    record, Category, Example, IntoInterruptiblePipelineData, IntoPipelineData, IntoSpanned,
    PipelineData, Record, ShellError, Signature, Span, Spanned, SyntaxShape, Type, Value,
};
```

This should reduce the boilerplate needed to implement a command and
also gives us a place to track the breadth of the `Command` API. I tried
to be conservative with what went into the prelude modules, since it
might be hard/annoying to remove items from the prelude in the future.
Let me know if something should be included or excluded.

crates/nu-cli/src/commands/commandline/commandline_.rs

@@ -1,9 +1,4 @@
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, IntoPipelineData, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
-};
 use unicode_segmentation::UnicodeSegmentation;
 
 #[derive(Clone)]

crates/nu-cli/src/commands/commandline/edit.rs

@@ -1,9 +1,4 @@
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, IntoPipelineData, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct SubCommand;

crates/nu-cli/src/commands/commandline/get_cursor.rs

@@ -1,8 +1,4 @@
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, IntoPipelineData, PipelineData, ShellError, Signature, Type, Value,
-};
 use unicode_segmentation::UnicodeSegmentation;
 
 #[derive(Clone)]

crates/nu-cli/src/commands/commandline/set_cursor.rs

@@ -1,9 +1,5 @@
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
+
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, IntoPipelineData, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
-};
 use unicode_segmentation::UnicodeSegmentation;
 
 #[derive(Clone)]

crates/nu-cli/src/commands/default_context.rs

@@ -1,6 +1,5 @@
-use nu_protocol::engine::{EngineState, StateWorkingSet};
-
 use crate::commands::*;
+use nu_protocol::engine::{EngineState, StateWorkingSet};
 
 pub fn add_cli_context(mut engine_state: EngineState) -> EngineState {
     let delta = {

crates/nu-cli/src/commands/history/history_.rs

@@ -1,10 +1,5 @@
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::ast::Call;
+use nu_protocol::HistoryFileFormat;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    record, Category, Example, HistoryFileFormat, IntoInterruptiblePipelineData, PipelineData,
-    ShellError, Signature, Span, Type, Value,
-};
 use reedline::{
     FileBackedHistory, History as ReedlineHistory, HistoryItem, SearchDirection, SearchQuery,
     SqliteBackedHistory,

crates/nu-cli/src/commands/history/history_session.rs

@@ -1,8 +1,4 @@
-use nu_protocol::ast::Call;
+use nu_engine::command_prelude::*;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct HistorySession;

crates/nu-cli/src/commands/keybindings.rs

@@ -1,9 +1,4 @@
-use nu_engine::get_full_help;
+use nu_engine::{command_prelude::*, get_full_help};
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, IntoPipelineData, PipelineData, ShellError, Signature, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct Keybindings;

crates/nu-cli/src/commands/keybindings_default.rs

@@ -1,8 +1,4 @@
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    record, Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Type, Value,
-};
 use reedline::get_reedline_default_keybindings;
 
 #[derive(Clone)]

crates/nu-cli/src/commands/keybindings_list.rs

@@ -1,9 +1,4 @@
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    record, Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, Type,
-    Value,
-};
 use reedline::{
     get_reedline_edit_commands, get_reedline_keybinding_modifiers, get_reedline_keycodes,
     get_reedline_prompt_edit_modes, get_reedline_reedline_events,

crates/nu-cli/src/commands/keybindings_listen.rs

@@ -1,12 +1,7 @@
-use crossterm::execute;
+use crossterm::{
-use crossterm::QueueableCommand;
+    event::Event, event::KeyCode, event::KeyEvent, execute, terminal, QueueableCommand,
-use crossterm::{event::Event, event::KeyCode, event::KeyEvent, terminal};
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    record, Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, Type,
-    Value,
 };
+use nu_engine::command_prelude::*;
 use std::io::{stdout, Write};
 
 #[derive(Clone)]

crates/nu-cli/src/completions/completer.rs

@@ -5,14 +5,13 @@ use crate::completions::{
 use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
 use nu_engine::eval_block;
 use nu_parser::{flatten_pipeline_element, parse, FlatShape};
-use nu_protocol::debugger::WithoutDebug;
 use nu_protocol::{
+    debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
     BlockId, PipelineData, Span, Value,
 };
 use reedline::{Completer as ReedlineCompleter, Suggestion};
-use std::str;
+use std::{str, sync::Arc};
-use std::sync::Arc;
 
 use super::base::{SemanticSuggestion, SuggestionKind};
 

crates/nu-cli/src/completions/completion_common.rs

@@ -2,11 +2,15 @@ use crate::completions::{matches, CompletionOptions};
 use nu_ansi_term::Style;
 use nu_engine::env_to_string;
 use nu_path::home_dir;
-use nu_protocol::engine::{EngineState, Stack};
+use nu_protocol::{
-use nu_protocol::{engine::StateWorkingSet, Span};
+    engine::{EngineState, Stack, StateWorkingSet},
+    Span,
+};
 use nu_utils::get_ls_colors;
-use std::ffi::OsStr;
+use std::{
-use std::path::{is_separator, Component, Path, PathBuf, MAIN_SEPARATOR as SEP};
+    ffi::OsStr,
+    path::{is_separator, Component, Path, PathBuf, MAIN_SEPARATOR as SEP},
+};
 
 fn complete_rec(
     partial: &[String],

crates/nu-cli/src/completions/completion_options.rs

@@ -1,8 +1,7 @@
-use std::fmt::Display;
-
 use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
 use nu_parser::trim_quotes_str;
 use nu_protocol::CompletionAlgorithm;
+use std::fmt::Display;
 
 #[derive(Copy, Clone)]
 pub enum SortBy {

crates/nu-cli/src/completions/custom_completions.rs

@@ -1,17 +1,16 @@
-use crate::completions::{Completer, CompletionOptions, MatchAlgorithm, SortBy};
+use crate::completions::{
+    completer::map_value_completions, Completer, CompletionOptions, MatchAlgorithm,
+    SemanticSuggestion, SortBy,
+};
 use nu_engine::eval_call;
-use nu_protocol::debugger::WithoutDebug;
 use nu_protocol::{
     ast::{Argument, Call, Expr, Expression},
+    debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
     PipelineData, Span, Type, Value,
 };
 use nu_utils::IgnoreCaseExt;
-use std::collections::HashMap;
+use std::{collections::HashMap, sync::Arc};
-use std::sync::Arc;
-
-use super::base::SemanticSuggestion;
-use super::completer::map_value_completions;
 
 pub struct CustomCompletion {
     engine_state: Arc<EngineState>,

crates/nu-cli/src/completions/directory_completions.rs

@@ -8,8 +8,10 @@ use nu_protocol::{
     levenshtein_distance, Span,
 };
 use reedline::Suggestion;
-use std::path::{Path, MAIN_SEPARATOR as SEP};
+use std::{
-use std::sync::Arc;
+    path::{Path, MAIN_SEPARATOR as SEP},
+    sync::Arc,
+};
 
 use super::SemanticSuggestion;
 

crates/nu-cli/src/completions/file_completions.rs

@@ -9,8 +9,10 @@ use nu_protocol::{
 };
 use nu_utils::IgnoreCaseExt;
 use reedline::Suggestion;
-use std::path::{Path, MAIN_SEPARATOR as SEP};
+use std::{
-use std::sync::Arc;
+    path::{Path, MAIN_SEPARATOR as SEP},
+    sync::Arc,
+};
 
 use super::SemanticSuggestion;
 

crates/nu-cli/src/completions/flag_completions.rs

@@ -4,7 +4,6 @@ use nu_protocol::{
     engine::StateWorkingSet,
     Span,
 };
-
 use reedline::Suggestion;
 
 use super::SemanticSuggestion;

crates/nu-cli/src/completions/variable_completions.rs

@@ -1,15 +1,13 @@
-use crate::completions::{Completer, CompletionOptions};
+use crate::completions::{
+    Completer, CompletionOptions, MatchAlgorithm, SemanticSuggestion, SuggestionKind,
+};
 use nu_engine::{column::get_columns, eval_variable};
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
     Span, Value,
 };
-
 use reedline::Suggestion;
-use std::str;
+use std::{str, sync::Arc};
-use std::sync::Arc;
-
-use super::{MatchAlgorithm, SemanticSuggestion, SuggestionKind};
 
 #[derive(Clone)]
 pub struct VariableCompletion {

crates/nu-cli/src/config_files.rs

@@ -1,9 +1,10 @@
 use crate::util::eval_source;
 #[cfg(feature = "plugin")]
 use nu_path::canonicalize_with;
-use nu_protocol::engine::{EngineState, Stack, StateWorkingSet};
+use nu_protocol::{
-use nu_protocol::report_error;
+    engine::{EngineState, Stack, StateWorkingSet},
-use nu_protocol::{HistoryFileFormat, PipelineData};
+    report_error, HistoryFileFormat, PipelineData,
+};
 #[cfg(feature = "plugin")]
 use nu_protocol::{ParseError, Spanned};
 #[cfg(feature = "plugin")]

crates/nu-cli/src/eval_cmds.rs

@@ -2,12 +2,10 @@ use log::info;
 use miette::Result;
 use nu_engine::{convert_env_values, eval_block};
 use nu_parser::parse;
-use nu_protocol::debugger::WithoutDebug;
-use nu_protocol::engine::Stack;
-use nu_protocol::report_error;
 use nu_protocol::{
-    engine::{EngineState, StateWorkingSet},
+    debugger::WithoutDebug,
-    PipelineData, Spanned, Value,
+    engine::{EngineState, Stack, StateWorkingSet},
+    report_error, PipelineData, Spanned, Value,
 };
 
 /// Run a command (or commands) given to us by the user

crates/nu-cli/src/eval_file.rs

@@ -1,21 +1,17 @@
-use std::sync::Arc;
-
 use crate::util::eval_source;
-use log::info;
+use log::{info, trace};
-use log::trace;
 use miette::{IntoDiagnostic, Result};
-use nu_engine::eval_block;
+use nu_engine::{convert_env_values, current_dir, eval_block};
-use nu_engine::{convert_env_values, current_dir};
 use nu_parser::parse;
 use nu_path::canonicalize_with;
-use nu_protocol::debugger::WithoutDebug;
-use nu_protocol::report_error;
 use nu_protocol::{
     ast::Call,
+    debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    Config, PipelineData, ShellError, Span, Value,
+    report_error, Config, PipelineData, ShellError, Span, Value,
 };
 use nu_utils::stdout_write_all_and_flush;
+use std::sync::Arc;
 
 /// Main function used when a file path is found as argument for nu
 pub fn evaluate_file(

crates/nu-cli/src/menus/help_completions.rs

@@ -2,8 +2,7 @@ use nu_engine::documentation::get_flags_section;
 use nu_protocol::{engine::EngineState, levenshtein_distance};
 use nu_utils::IgnoreCaseExt;
 use reedline::{Completer, Suggestion};
-use std::fmt::Write;
+use std::{fmt::Write, sync::Arc};
-use std::sync::Arc;
 
 pub struct NuHelpCompleter(Arc<EngineState>);
 

crates/nu-cli/src/menus/menu_completions.rs

@@ -1,6 +1,6 @@
 use nu_engine::eval_block;
-use nu_protocol::debugger::WithoutDebug;
 use nu_protocol::{
+    debugger::WithoutDebug,
     engine::{EngineState, Stack},
     IntoPipelineData, Span, Value,
 };

crates/nu-cli/src/nu_highlight.rs

@@ -1,6 +1,4 @@
-use nu_protocol::ast::Call;
+use nu_engine::command_prelude::*;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, Type, Value};
 use reedline::{Highlighter, StyledText};
 
 #[derive(Clone)]

crates/nu-cli/src/print.rs

@@ -1,10 +1,4 @@
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, SyntaxShape, Type,
-    Value,
-};
 
 #[derive(Clone)]
 pub struct Print;

crates/nu-cli/src/prompt.rs

@@ -1,13 +1,11 @@
 use crate::prompt_update::{POST_PROMPT_MARKER, PRE_PROMPT_MARKER};
 #[cfg(windows)]
 use nu_utils::enable_vt_processing;
-use reedline::DefaultPrompt;
+use reedline::{
-use {
+    DefaultPrompt, Prompt, PromptEditMode, PromptHistorySearch, PromptHistorySearchStatus,
-    reedline::{
+    PromptViMode,
-        Prompt, PromptEditMode, PromptHistorySearch, PromptHistorySearchStatus, PromptViMode,
-    },
-    std::borrow::Cow,
 };
+use std::borrow::Cow;
 
 /// Nushell prompt definition
 #[derive(Clone)]

crates/nu-cli/src/prompt_update.rs

@@ -1,11 +1,9 @@
 use crate::NushellPrompt;
 use log::trace;
 use nu_engine::get_eval_subexpression;
-
-use nu_protocol::report_error;
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
-    Config, PipelineData, Value,
+    report_error, Config, PipelineData, Value,
 };
 use reedline::Prompt;
 

crates/nu-cli/src/reedline_config.rs

@@ -3,9 +3,9 @@ use crossterm::event::{KeyCode, KeyModifiers};
 use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
 use nu_engine::eval_block;
 use nu_parser::parse;
-use nu_protocol::debugger::WithoutDebug;
 use nu_protocol::{
     create_menus,
+    debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
     extract_value, Config, EditBindings, ParsedKeybinding, ParsedMenu, PipelineData, Record,
     ShellError, Span, Value,
@@ -1311,9 +1311,8 @@ fn extract_char(value: &Value, config: &Config) -> Result<char, ShellError> {
 
 #[cfg(test)]
 mod test {
-    use nu_protocol::record;
-
     use super::*;
+    use nu_protocol::record;
 
     #[test]
     fn test_send_event() {

crates/nu-cli/src/repl.rs

@@ -9,8 +9,10 @@ use crate::{
 use crossterm::cursor::SetCursorStyle;
 use log::{error, trace, warn};
 use miette::{ErrReport, IntoDiagnostic, Result};
-use nu_cmd_base::util::get_guaranteed_cwd;
+use nu_cmd_base::{
-use nu_cmd_base::{hook::eval_hook, util::get_editor};
+    hook::eval_hook,
+    util::{get_editor, get_guaranteed_cwd},
+};
 use nu_color_config::StyleComputer;
 use nu_engine::{convert_env_values, env_to_strings};
 use nu_parser::{lex, parse, trim_quotes_str};
@@ -31,8 +33,7 @@ use std::{
     env::temp_dir,
     io::{self, IsTerminal, Write},
     panic::{catch_unwind, AssertUnwindSafe},
-    path::Path,
+    path::{Path, PathBuf},
-    path::PathBuf,
     sync::{atomic::Ordering, Arc},
     time::{Duration, Instant},
 };

crates/nu-cli/src/syntax_highlight.rs

@@ -3,9 +3,11 @@ use nu_ansi_term::Style;
 use nu_color_config::{get_matching_brackets_style, get_shape_color};
 use nu_engine::env;
 use nu_parser::{flatten_block, parse, FlatShape};
-use nu_protocol::ast::{Argument, Block, Expr, Expression, PipelineRedirection, RecordItem};
+use nu_protocol::{
-use nu_protocol::engine::{EngineState, Stack, StateWorkingSet};
+    ast::{Argument, Block, Expr, Expression, PipelineRedirection, RecordItem},
-use nu_protocol::{Config, Span};
+    engine::{EngineState, Stack, StateWorkingSet},
+    Config, Span,
+};
 use reedline::{Highlighter, StyledText};
 use std::sync::Arc;
 

crates/nu-cli/src/util.rs

@@ -1,13 +1,11 @@
 use nu_cmd_base::hook::eval_hook;
 use nu_engine::{eval_block, eval_block_with_early_return};
 use nu_parser::{escape_quote_string, lex, parse, unescape_unquote_string, Token, TokenContents};
-use nu_protocol::debugger::WithoutDebug;
-use nu_protocol::engine::StateWorkingSet;
 use nu_protocol::{
-    engine::{EngineState, Stack},
+    debugger::WithoutDebug,
-    print_if_stream, PipelineData, ShellError, Span, Value,
+    engine::{EngineState, Stack, StateWorkingSet},
+    print_if_stream, report_error, report_error_new, PipelineData, ShellError, Span, Value,
 };
-use nu_protocol::{report_error, report_error_new};
 #[cfg(windows)]
 use nu_utils::enable_vt_processing;
 use nu_utils::utils::perf;

crates/nu-cli/tests/completions.rs

@@ -1,12 +1,11 @@
 pub mod support;
 
-use std::path::PathBuf;
-
 use nu_cli::NuCompleter;
 use nu_parser::parse;
 use nu_protocol::engine::StateWorkingSet;
 use reedline::{Completer, Suggestion};
 use rstest::{fixture, rstest};
+use std::path::PathBuf;
 use support::{
     completions_helpers::{new_partial_engine, new_quote_engine},
     file, folder, match_suggestions, new_engine,

crates/nu-cli/tests/support/completions_helpers.rs

@@ -1,15 +1,14 @@
-use std::path::PathBuf;
-
 use nu_engine::eval_block;
 use nu_parser::parse;
-use nu_protocol::debugger::WithoutDebug;
 use nu_protocol::{
+    debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
     eval_const::create_nu_constant,
     PipelineData, ShellError, Span, Value, NU_VARIABLE_ID,
 };
 use nu_test_support::fs;
 use reedline::Suggestion;
+use std::path::PathBuf;
 
 const SEP: char = std::path::MAIN_SEPARATOR;
 

crates/nu-cmd-base/src/hook.rs

@@ -1,13 +1,14 @@
-use std::sync::Arc;
-
 use crate::util::get_guaranteed_cwd;
 use miette::Result;
 use nu_engine::{eval_block, eval_block_with_early_return};
 use nu_parser::parse;
-use nu_protocol::cli_error::{report_error, report_error_new};
+use nu_protocol::{
-use nu_protocol::debugger::WithoutDebug;
+    cli_error::{report_error, report_error_new},
-use nu_protocol::engine::{EngineState, Stack, StateWorkingSet};
+    debugger::WithoutDebug,
-use nu_protocol::{BlockId, PipelineData, PositionalArg, ShellError, Span, Type, Value, VarId};
+    engine::{EngineState, Stack, StateWorkingSet},
+    BlockId, PipelineData, PositionalArg, ShellError, Span, Type, Value, VarId,
+};
+use std::sync::Arc;
 
 pub fn eval_env_change_hook(
     env_change_hook: Option<Value>,

crates/nu-cmd-base/src/input_handler.rs

@@ -1,7 +1,5 @@
-use nu_protocol::ast::CellPath;
+use nu_protocol::{ast::CellPath, PipelineData, ShellError, Span, Value};
-use nu_protocol::{PipelineData, ShellError, Span, Value};
+use std::sync::{atomic::AtomicBool, Arc};
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
 
 pub trait CmdArgument {
     fn take_cell_paths(&mut self) -> Option<Vec<CellPath>>;

crates/nu-cmd-base/src/util.rs

@@ -1,8 +1,7 @@
-use nu_protocol::report_error;
 use nu_protocol::{
     ast::RangeInclusion,
     engine::{EngineState, Stack, StateWorkingSet},
-    Range, ShellError, Span, Value,
+    report_error, Range, ShellError, Span, Value,
 };
 use std::path::PathBuf;
 

crates/nu-cmd-dataframe/src/dataframe/eager/append.rs

@@ -1,11 +1,5 @@
-use nu_engine::CallExt;
+use crate::dataframe::values::{Axis, Column, NuDataFrame};
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
-
-use super::super::values::{Axis, Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct AppendDF;

crates/nu-cmd-dataframe/src/dataframe/eager/cast.rs

@@ -1,12 +1,6 @@
-use crate::dataframe::values::{str_to_dtype, NuExpression, NuLazyFrame};
+use crate::dataframe::values::{str_to_dtype, NuDataFrame, NuExpression, NuLazyFrame};
+use nu_engine::command_prelude::*;
 
-use super::super::values::NuDataFrame;
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    record, Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 use polars::prelude::*;
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/eager/columns.rs

@@ -1,9 +1,5 @@
-use super::super::values::NuDataFrame;
+use crate::dataframe::values::NuDataFrame;
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct ColumnsDF;

crates/nu-cmd-dataframe/src/dataframe/eager/drop.rs

@@ -1,12 +1,5 @@
-use nu_engine::CallExt;
+use crate::dataframe::values::{utils::convert_columns, Column, NuDataFrame};
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
-
-use super::super::values::utils::convert_columns;
-use super::super::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct DropDF;

crates/nu-cmd-dataframe/src/dataframe/eager/drop_duplicates.rs

@@ -1,13 +1,7 @@
-use nu_engine::CallExt;
+use crate::dataframe::values::{utils::convert_columns_string, Column, NuDataFrame};
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
-use polars::prelude::UniqueKeepStrategy;
 
-use super::super::values::utils::convert_columns_string;
+use polars::prelude::UniqueKeepStrategy;
-use super::super::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct DropDuplicates;

crates/nu-cmd-dataframe/src/dataframe/eager/drop_nulls.rs

@@ -1,12 +1,5 @@
-use nu_engine::CallExt;
+use crate::dataframe::values::{utils::convert_columns_string, Column, NuDataFrame};
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
-
-use super::super::values::utils::convert_columns_string;
-use super::super::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct DropNulls;

crates/nu-cmd-dataframe/src/dataframe/eager/dtypes.rs

@@ -1,9 +1,5 @@
-use super::super::values::{Column, NuDataFrame};
+use crate::dataframe::values::{Column, NuDataFrame};
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct DataTypes;

crates/nu-cmd-dataframe/src/dataframe/eager/dummies.rs

@@ -1,10 +1,6 @@
-use super::super::values::NuDataFrame;
+use crate::dataframe::values::NuDataFrame;
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
+
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, Type,
-};
 use polars::{prelude::*, series::Series};
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/eager/filter_with.rs

@@ -1,15 +1,8 @@
-use nu_engine::CallExt;
+use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
+
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 use polars::prelude::LazyFrame;
 
-use crate::dataframe::values::{NuExpression, NuLazyFrame};
-
-use super::super::values::{Column, NuDataFrame};
-
 #[derive(Clone)]
 pub struct FilterWith;
 

crates/nu-cmd-dataframe/src/dataframe/eager/first.rs

@@ -1,10 +1,5 @@
-use super::super::values::{Column, NuDataFrame, NuExpression};
+use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct FirstDF;

crates/nu-cmd-dataframe/src/dataframe/eager/get.rs

@@ -1,13 +1,5 @@
-use nu_engine::CallExt;
+use crate::dataframe::values::{utils::convert_columns_string, Column, NuDataFrame};
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
-
-use crate::dataframe::values::utils::convert_columns_string;
-
-use super::super::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct GetDF;

crates/nu-cmd-dataframe/src/dataframe/eager/last.rs

@@ -1,10 +1,5 @@
-use super::super::values::{utils::DEFAULT_ROWS, Column, NuDataFrame, NuExpression};
+use crate::dataframe::values::{utils::DEFAULT_ROWS, Column, NuDataFrame, NuExpression};
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct LastDF;

crates/nu-cmd-dataframe/src/dataframe/eager/list.rs

@@ -1,10 +1,5 @@
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    record, Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Value,
-};
-
 use crate::dataframe::values::NuDataFrame;
+use nu_engine::command_prelude::*;
 
 #[derive(Clone)]
 pub struct ListDF;

crates/nu-cmd-dataframe/src/dataframe/eager/melt.rs

@@ -1,14 +1,5 @@
-use nu_engine::CallExt;
+use crate::dataframe::values::{utils::convert_columns_string, Column, NuDataFrame};
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape, Type,
-    Value,
-};
-
-use crate::dataframe::values::utils::convert_columns_string;
-
-use super::super::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct MeltDF;

crates/nu-cmd-dataframe/src/dataframe/eager/open.rs

@@ -1,21 +1,12 @@
-use crate::dataframe::values::NuSchema;
+use crate::dataframe::values::{NuDataFrame, NuLazyFrame, NuSchema};
-
+use nu_engine::command_prelude::*;
-use super::super::values::{NuDataFrame, NuLazyFrame};
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Type, Value,
-};
-
-use std::{fs::File, io::BufReader, path::PathBuf};
 
 use polars::prelude::{
     CsvEncoding, CsvReader, IpcReader, JsonFormat, JsonReader, LazyCsvReader, LazyFileListReader,
     LazyFrame, ParallelStrategy, ParquetReader, ScanArgsIpc, ScanArgsParquet, SerReader,
 };
-
 use polars_io::avro::AvroReader;
+use std::{fs::File, io::BufReader, path::PathBuf};
 
 #[derive(Clone)]
 pub struct OpenDataFrame;

crates/nu-cmd-dataframe/src/dataframe/eager/query_df.rs

@@ -1,12 +1,8 @@
-use super::super::values::NuDataFrame;
+use crate::dataframe::{
-use crate::dataframe::values::Column;
+    eager::SQLContext,
-use crate::dataframe::{eager::SQLContext, values::NuLazyFrame};
+    values::{Column, NuDataFrame, NuLazyFrame},
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
 };
+use nu_engine::command_prelude::*;
 
 // attribution:
 // sql_context.rs, and sql_expr.rs were copied from polars-sql. thank you.

crates/nu-cmd-dataframe/src/dataframe/eager/rename.rs

@@ -1,13 +1,8 @@
-use nu_engine::CallExt;
+use crate::dataframe::{
-use nu_protocol::{
+    utils::extract_strings,
-    ast::Call,
+    values::{Column, NuDataFrame, NuLazyFrame},
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
 };
-
+use nu_engine::command_prelude::*;
-use crate::dataframe::{utils::extract_strings, values::NuLazyFrame};
-
-use super::super::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct RenameDF;

crates/nu-cmd-dataframe/src/dataframe/eager/sample.rs

@@ -1,13 +1,7 @@
-use nu_engine::CallExt;
+use crate::dataframe::values::NuDataFrame;
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Type,
-};
-use polars::prelude::NamedFrom;
-use polars::series::Series;
 
-use super::super::values::NuDataFrame;
+use polars::{prelude::NamedFrom, series::Series};
 
 #[derive(Clone)]
 pub struct SampleDF;

crates/nu-cmd-dataframe/src/dataframe/eager/schema.rs

@@ -1,10 +1,5 @@
-use super::super::values::NuDataFrame;
+use crate::dataframe::values::NuDataFrame;
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    record, Category, Example, PipelineData, ShellError, Signature, Span, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct SchemaDF;

crates/nu-cmd-dataframe/src/dataframe/eager/shape.rs

@@ -1,12 +1,5 @@
-use nu_protocol::{
+use crate::dataframe::values::{Column, NuDataFrame};
-    ast::Call,
+use nu_engine::command_prelude::*;
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, Type, Value,
-};
-
-use crate::dataframe::values::Column;
-
-use super::super::values::NuDataFrame;
 
 #[derive(Clone)]
 pub struct ShapeDF;

crates/nu-cmd-dataframe/src/dataframe/eager/slice.rs

@@ -1,13 +1,5 @@
-use nu_engine::CallExt;
+use crate::dataframe::values::{Column, NuDataFrame};
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
-
-use crate::dataframe::values::Column;
-
-use super::super::values::NuDataFrame;
 
 #[derive(Clone)]
 pub struct SliceDF;

crates/nu-cmd-dataframe/src/dataframe/eager/summary.rs

@@ -1,11 +1,6 @@
-use super::super::values::{Column, NuDataFrame};
+use crate::dataframe::values::{Column, NuDataFrame};
+use nu_engine::command_prelude::*;
 
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 use polars::{
     chunked_array::ChunkedArray,
     prelude::{

crates/nu-cmd-dataframe/src/dataframe/eager/take.rs

@@ -1,15 +1,8 @@
-use nu_engine::CallExt;
+use crate::dataframe::values::{Column, NuDataFrame};
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
+
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 use polars::prelude::DataType;
 
-use crate::dataframe::values::Column;
-
-use super::super::values::NuDataFrame;
-
 #[derive(Clone)]
 pub struct TakeDF;
 

crates/nu-cmd-dataframe/src/dataframe/eager/to_arrow.rs

@@ -1,14 +1,8 @@
-use std::{fs::File, path::PathBuf};
+use crate::dataframe::values::NuDataFrame;
+use nu_engine::command_prelude::*;
 
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Type, Value,
-};
 use polars::prelude::{IpcWriter, SerWriter};
-
+use std::{fs::File, path::PathBuf};
-use super::super::values::NuDataFrame;
 
 #[derive(Clone)]
 pub struct ToArrow;

crates/nu-cmd-dataframe/src/dataframe/eager/to_avro.rs

@@ -1,15 +1,11 @@
-use std::{fs::File, path::PathBuf};
+use crate::dataframe::values::NuDataFrame;
+use nu_engine::command_prelude::*;
 
-use nu_engine::CallExt;
+use polars_io::{
-use nu_protocol::{
+    avro::{AvroCompression, AvroWriter},
-    ast::Call,
+    SerWriter,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Type, Value,
 };
-use polars_io::avro::{AvroCompression, AvroWriter};
+use std::{fs::File, path::PathBuf};
-use polars_io::SerWriter;
-
-use super::super::values::NuDataFrame;
 
 #[derive(Clone)]
 pub struct ToAvro;

crates/nu-cmd-dataframe/src/dataframe/eager/to_csv.rs

@@ -1,14 +1,8 @@
-use std::{fs::File, path::PathBuf};
+use crate::dataframe::values::NuDataFrame;
+use nu_engine::command_prelude::*;
 
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Type, Value,
-};
 use polars::prelude::{CsvWriter, SerWriter};
-
+use std::{fs::File, path::PathBuf};
-use super::super::values::NuDataFrame;
 
 #[derive(Clone)]
 pub struct ToCSV;

crates/nu-cmd-dataframe/src/dataframe/eager/to_df.rs

@@ -1,13 +1,6 @@
-use crate::dataframe::values::NuSchema;
+use crate::dataframe::values::{Column, NuDataFrame, NuSchema};
+use nu_engine::command_prelude::*;
 
-use super::super::values::{Column, NuDataFrame};
-
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 use polars::prelude::*;
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/eager/to_json_lines.rs

@@ -1,14 +1,8 @@
-use std::{fs::File, io::BufWriter, path::PathBuf};
+use crate::dataframe::values::NuDataFrame;
+use nu_engine::command_prelude::*;
 
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Type, Value,
-};
 use polars::prelude::{JsonWriter, SerWriter};
-
+use std::{fs::File, io::BufWriter, path::PathBuf};
-use super::super::values::NuDataFrame;
 
 #[derive(Clone)]
 pub struct ToJsonLines;

crates/nu-cmd-dataframe/src/dataframe/eager/to_nu.rs

@@ -1,13 +1,5 @@
-use nu_engine::CallExt;
+use crate::dataframe::values::{NuDataFrame, NuExpression};
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    record, Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
-
-use crate::dataframe::values::NuExpression;
-
-use super::super::values::NuDataFrame;
 
 #[derive(Clone)]
 pub struct ToNu;

crates/nu-cmd-dataframe/src/dataframe/eager/to_parquet.rs

@@ -1,14 +1,8 @@
-use std::{fs::File, path::PathBuf};
+use crate::dataframe::values::NuDataFrame;
+use nu_engine::command_prelude::*;
 
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Type, Value,
-};
 use polars::prelude::ParquetWriter;
-
+use std::{fs::File, path::PathBuf};
-use super::super::values::NuDataFrame;
 
 #[derive(Clone)]
 pub struct ToParquet;

crates/nu-cmd-dataframe/src/dataframe/eager/with_column.rs

@@ -1,11 +1,5 @@
-use super::super::values::{Column, NuDataFrame};
+use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use crate::dataframe::values::{NuExpression, NuLazyFrame};
+use nu_engine::command_prelude::*;
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct WithColumn;

crates/nu-cmd-dataframe/src/dataframe/expressions/alias.rs

@@ -1,11 +1,5 @@
-use super::super::values::NuExpression;
+use crate::dataframe::values::NuExpression;
-
+use nu_engine::command_prelude::*;
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    record, Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct ExprAlias;

crates/nu-cmd-dataframe/src/dataframe/expressions/arg_where.rs

@@ -1,10 +1,6 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
+
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 use polars::prelude::arg_where;
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/expressions/col.rs

@@ -1,10 +1,6 @@
 use crate::dataframe::values::NuExpression;
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
+
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    record, Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
-};
 use polars::prelude::col;
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/expressions/concat_str.rs

@@ -1,10 +1,6 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
+
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 use polars::prelude::concat_str;
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/expressions/datepart.rs

@@ -1,14 +1,7 @@
-use super::super::values::NuExpression;
+use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-
-use crate::dataframe::values::{Column, NuDataFrame};
 use chrono::{DateTime, FixedOffset};
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
+
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape, Type,
-    Value,
-};
 use polars::{
     datatypes::{DataType, TimeUnit},
     prelude::NamedFrom,

crates/nu-cmd-dataframe/src/dataframe/expressions/expressions_macro.rs

@@ -2,11 +2,7 @@
 /// All of these expressions have an identical body and only require
 /// to have a change in the name, description and expression function
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, Type, Value,
-};
 
 // The structs defined in this file are structs that form part of other commands
 // since they share a similar name

crates/nu-cmd-dataframe/src/dataframe/expressions/is_in.rs

@@ -1,10 +1,6 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
+
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 use polars::prelude::{lit, DataType};
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/expressions/lit.rs

@@ -1,10 +1,5 @@
 use crate::dataframe::values::NuExpression;
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    record, Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct ExprLit;

crates/nu-cmd-dataframe/src/dataframe/expressions/otherwise.rs

@@ -1,10 +1,5 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuWhen};
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct ExprOtherwise;

crates/nu-cmd-dataframe/src/dataframe/expressions/quantile.rs

@@ -1,10 +1,6 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
+
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 use polars::prelude::{lit, QuantileInterpolOptions};
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/expressions/when.rs

@@ -1,10 +1,6 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuWhen};
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
+
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 use polars::prelude::when;
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/lazy/aggregate.rs

@@ -1,11 +1,6 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame, NuLazyGroupBy};
+use nu_engine::command_prelude::*;
 
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 use polars::{datatypes::DataType, prelude::Expr};
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/lazy/collect.rs

@@ -1,11 +1,5 @@
-use crate::dataframe::values::{Column, NuDataFrame};
+use crate::dataframe::values::{Column, NuDataFrame, NuLazyFrame};
-
+use nu_engine::command_prelude::*;
-use super::super::values::NuLazyFrame;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct LazyCollect;

crates/nu-cmd-dataframe/src/dataframe/lazy/explode.rs

@@ -1,10 +1,5 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-
+use nu_engine::command_prelude::*;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct LazyExplode;
@@ -46,7 +41,7 @@ impl Command for LazyExplode {
                 result: Some(
                    NuDataFrame::try_from_columns(vec![
                     Column::new(
-                        "id".to_string(), 
+                        "id".to_string(),
                         vec![
                             Value::test_int(1),
                             Value::test_int(1),
@@ -54,7 +49,7 @@ impl Command for LazyExplode {
                             Value::test_int(2),
                         ]),
                     Column::new(
-                        "name".to_string(), 
+                        "name".to_string(),
                         vec![
                             Value::test_string("Mercy"),
                             Value::test_string("Mercy"),
@@ -62,7 +57,7 @@ impl Command for LazyExplode {
                             Value::test_string("Bob"),
                         ]),
                     Column::new(
-                        "hobbies".to_string(), 
+                        "hobbies".to_string(),
                         vec![
                             Value::test_string("Cycling"),
                             Value::test_string("Knitting"),
@@ -79,7 +74,7 @@ impl Command for LazyExplode {
                 result: Some(
                    NuDataFrame::try_from_columns(vec![
                     Column::new(
-                        "hobbies".to_string(), 
+                        "hobbies".to_string(),
                         vec![
                             Value::test_string("Cycling"),
                             Value::test_string("Knitting"),

crates/nu-cmd-dataframe/src/dataframe/lazy/fetch.rs

@@ -1,11 +1,5 @@
-use super::super::values::NuLazyFrame;
+use crate::dataframe::values::{Column, NuDataFrame, NuLazyFrame};
-use crate::dataframe::values::{Column, NuDataFrame};
+use nu_engine::command_prelude::*;
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct LazyFetch;

crates/nu-cmd-dataframe/src/dataframe/lazy/fill_nan.rs

@@ -1,10 +1,5 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct LazyFillNA;

crates/nu-cmd-dataframe/src/dataframe/lazy/fill_null.rs

@@ -1,10 +1,5 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct LazyFillNull;

crates/nu-cmd-dataframe/src/dataframe/lazy/filter.rs

@@ -1,11 +1,5 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-
+use nu_engine::command_prelude::*;
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct LazyFilter;

crates/nu-cmd-dataframe/src/dataframe/lazy/flatten.rs

@@ -1,12 +1,6 @@
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
-
-use crate::dataframe::values::{Column, NuDataFrame};
-
 use super::explode::explode;
+use crate::dataframe::values::{Column, NuDataFrame};
+use nu_engine::command_prelude::*;
 
 #[derive(Clone)]
 pub struct LazyFlatten;
@@ -48,7 +42,7 @@ Example {
                 result: Some(
                    NuDataFrame::try_from_columns(vec![
                     Column::new(
-                        "id".to_string(), 
+                        "id".to_string(),
                         vec![
                             Value::test_int(1),
                             Value::test_int(1),
@@ -56,7 +50,7 @@ Example {
                             Value::test_int(2),
                         ]),
                     Column::new(
-                        "name".to_string(), 
+                        "name".to_string(),
                         vec![
                             Value::test_string("Mercy"),
                             Value::test_string("Mercy"),
@@ -64,7 +58,7 @@ Example {
                             Value::test_string("Bob"),
                         ]),
                     Column::new(
-                        "hobbies".to_string(), 
+                        "hobbies".to_string(),
                         vec![
                             Value::test_string("Cycling"),
                             Value::test_string("Knitting"),
@@ -81,7 +75,7 @@ Example {
                 result: Some(
                    NuDataFrame::try_from_columns(vec![
                     Column::new(
-                        "hobbies".to_string(), 
+                        "hobbies".to_string(),
                         vec![
                             Value::test_string("Cycling"),
                             Value::test_string("Knitting"),

crates/nu-cmd-dataframe/src/dataframe/lazy/groupby.rs

@@ -1,10 +1,6 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame, NuLazyGroupBy};
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
+
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 use polars::prelude::Expr;
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/lazy/join.rs

@@ -1,10 +1,6 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
+
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 use polars::prelude::{Expr, JoinType};
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/lazy/macro_commands.rs

@@ -2,11 +2,7 @@
 /// All of these commands have an identical body and only require
 /// to have a change in the name, description and function
 use crate::dataframe::values::{Column, NuDataFrame, NuLazyFrame};
-use nu_protocol::{
+use nu_engine::command_prelude::*;
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, Type, Value,
-};
 
 macro_rules! lazy_command {
     ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident) => {

crates/nu-cmd-dataframe/src/dataframe/lazy/quantile.rs

@@ -1,10 +1,6 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuLazyFrame};
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
-use nu_protocol::{
+
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 use polars::prelude::{lit, QuantileInterpolOptions};
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/lazy/select.rs

@@ -1,11 +1,6 @@
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
+use nu_engine::command_prelude::*;
 
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 #[derive(Clone)]
 pub struct LazySelect;
 

crates/nu-cmd-dataframe/src/dataframe/lazy/sort_by_expr.rs

@@ -1,11 +1,5 @@
-use super::super::values::NuLazyFrame;
+use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
+use nu_engine::command_prelude::*;
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct LazySortBy;

crates/nu-cmd-dataframe/src/dataframe/lazy/to_lazy.rs

@@ -1,13 +1,5 @@
-use crate::dataframe::values::NuSchema;
+use crate::dataframe::values::{NuDataFrame, NuLazyFrame, NuSchema};
-
+use nu_engine::command_prelude::*;
-use super::super::values::{NuDataFrame, NuLazyFrame};
-
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct ToLazyFrame;

crates/nu-cmd-dataframe/src/dataframe/series/all_false.rs

@@ -1,10 +1,5 @@
-use super::super::values::{Column, NuDataFrame};
+use crate::dataframe::values::{Column, NuDataFrame};
-
+use nu_engine::command_prelude::*;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct AllFalse;

crates/nu-cmd-dataframe/src/dataframe/series/all_true.rs

@@ -1,10 +1,5 @@
-use super::super::values::{Column, NuDataFrame};
+use crate::dataframe::values::{Column, NuDataFrame};
-
+use nu_engine::command_prelude::*;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, Type, Value,
-};
 
 #[derive(Clone)]
 pub struct AllTrue;

crates/nu-cmd-dataframe/src/dataframe/series/arg_max.rs

@@ -1,10 +1,5 @@
-use super::super::values::{Column, NuDataFrame};
+use crate::dataframe::values::{Column, NuDataFrame};
-
+use nu_engine::command_prelude::*;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, Type, Value,
-};
 use polars::prelude::{ArgAgg, IntoSeries, NewChunkedArray, UInt32Chunked};
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/series/arg_min.rs

@@ -1,10 +1,5 @@
-use super::super::values::{Column, NuDataFrame};
+use crate::dataframe::values::{Column, NuDataFrame};
-
+use nu_engine::command_prelude::*;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, Type, Value,
-};
 use polars::prelude::{ArgAgg, IntoSeries, NewChunkedArray, UInt32Chunked};
 
 #[derive(Clone)]

crates/nu-cmd-dataframe/src/dataframe/series/cumulative.rs

@@ -1,12 +1,6 @@
-use super::super::values::{Column, NuDataFrame};
+use crate::dataframe::values::{Column, NuDataFrame};
+use nu_engine::command_prelude::*;
 
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape, Type,
-    Value,
-};
 use polars::prelude::{DataType, IntoSeries};
 use polars_ops::prelude::{cum_max, cum_min, cum_sum};
 

crates/nu-cmd-dataframe/src/dataframe/series/date/as_date.rs

@@ -1,11 +1,6 @@
-use super::super::super::values::NuDataFrame;
+use crate::dataframe::values::NuDataFrame;
+use nu_engine::command_prelude::*;
 
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type,
-};
 use polars::prelude::{IntoSeries, StringMethods};
 
 #[derive(Clone)]