diff --git a/duckscript_sdk/src/sdk/std/alias/mod.rs b/duckscript_sdk/src/sdk/std/lib/alias/mod.rs similarity index 100% rename from duckscript_sdk/src/sdk/std/alias/mod.rs rename to duckscript_sdk/src/sdk/std/lib/alias/mod.rs diff --git a/duckscript_sdk/src/sdk/std/alias/set/help.md b/duckscript_sdk/src/sdk/std/lib/alias/set/help.md similarity index 100% rename from duckscript_sdk/src/sdk/std/alias/set/help.md rename to duckscript_sdk/src/sdk/std/lib/alias/set/help.md diff --git a/duckscript_sdk/src/sdk/std/alias/set/mod.rs b/duckscript_sdk/src/sdk/std/lib/alias/set/mod.rs similarity index 98% rename from duckscript_sdk/src/sdk/std/alias/set/mod.rs rename to duckscript_sdk/src/sdk/std/lib/alias/set/mod.rs index a8f908d..b93a048 100755 --- a/duckscript_sdk/src/sdk/std/alias/set/mod.rs +++ b/duckscript_sdk/src/sdk/std/lib/alias/set/mod.rs @@ -1,4 +1,4 @@ -use crate::sdk::std::alias::ALIAS_STATE_KEY; +use crate::sdk::std::lib::alias::ALIAS_STATE_KEY; use crate::utils::state::get_sub_state; use crate::utils::{eval, pckg}; use duckscript::types::command::{Command, CommandResult, Commands}; diff --git a/duckscript_sdk/src/sdk/std/alias/set/mod_test.rs b/duckscript_sdk/src/sdk/std/lib/alias/set/mod_test.rs similarity index 100% rename from duckscript_sdk/src/sdk/std/alias/set/mod_test.rs rename to duckscript_sdk/src/sdk/std/lib/alias/set/mod_test.rs diff --git a/duckscript_sdk/src/sdk/std/alias/unset/help.md b/duckscript_sdk/src/sdk/std/lib/alias/unset/help.md similarity index 100% rename from duckscript_sdk/src/sdk/std/alias/unset/help.md rename to duckscript_sdk/src/sdk/std/lib/alias/unset/help.md diff --git a/duckscript_sdk/src/sdk/std/alias/unset/mod.rs b/duckscript_sdk/src/sdk/std/lib/alias/unset/mod.rs similarity index 97% rename from duckscript_sdk/src/sdk/std/alias/unset/mod.rs rename to duckscript_sdk/src/sdk/std/lib/alias/unset/mod.rs index 7439b8c..decc1ff 100755 --- a/duckscript_sdk/src/sdk/std/alias/unset/mod.rs +++ b/duckscript_sdk/src/sdk/std/lib/alias/unset/mod.rs @@ -1,4 +1,4 @@ -use crate::sdk::std::alias::ALIAS_STATE_KEY; +use crate::sdk::std::lib::alias::ALIAS_STATE_KEY; use crate::utils::pckg; use crate::utils::state::get_sub_state; use duckscript::types::command::{Command, CommandResult, Commands}; diff --git a/duckscript_sdk/src/sdk/std/alias/unset/mod_test.rs b/duckscript_sdk/src/sdk/std/lib/alias/unset/mod_test.rs similarity index 97% rename from duckscript_sdk/src/sdk/std/alias/unset/mod_test.rs rename to duckscript_sdk/src/sdk/std/lib/alias/unset/mod_test.rs index 78c90c0..6dd3de3 100644 --- a/duckscript_sdk/src/sdk/std/alias/unset/mod_test.rs +++ b/duckscript_sdk/src/sdk/std/lib/alias/unset/mod_test.rs @@ -1,5 +1,5 @@ use super::*; -use crate::sdk::std::alias; +use crate::sdk::std::lib::alias; use crate::test; use crate::test::{CommandValidation, SetCommand}; diff --git a/duckscript_sdk/src/sdk/std/lib/mod.rs b/duckscript_sdk/src/sdk/std/lib/mod.rs new file mode 100755 index 0000000..d3be5d1 --- /dev/null +++ b/duckscript_sdk/src/sdk/std/lib/mod.rs @@ -0,0 +1,15 @@ +mod alias; + +use crate::utils::pckg; +use duckscript::types::command::Commands; +use duckscript::types::error::ScriptError; + +static PACKAGE: &str = "lib"; + +pub(crate) fn load(commands: &mut Commands, parent: &str) -> Result<(), ScriptError> { + let package = pckg::concat(parent, PACKAGE); + + alias::load(commands, &package)?; + + Ok(()) +} diff --git a/duckscript_sdk/src/sdk/std/man/mod_test.rs b/duckscript_sdk/src/sdk/std/man/mod_test.rs index ae9f3b1..037d614 100644 --- a/duckscript_sdk/src/sdk/std/man/mod_test.rs +++ b/duckscript_sdk/src/sdk/std/man/mod_test.rs @@ -1,5 +1,5 @@ use super::*; -use crate::sdk::std::alias; +use crate::sdk::std::release; use crate::test; use crate::test::{CommandValidation, SetCommand}; @@ -38,9 +38,9 @@ fn run_command_not_found() { #[test] fn run_command_found_with_docs() { test::run_script_and_validate( - vec![create(""), alias::set::create("")], - "out = man alias", - CommandValidation::Contains("out".to_string(), "alias ".to_string()), + vec![create(""), release::create("")], + "out = man release", + CommandValidation::Contains("out".to_string(), "release ".to_string()), ); } diff --git a/duckscript_sdk/src/sdk/std/mod.rs b/duckscript_sdk/src/sdk/std/mod.rs index 34de92f..d638b3a 100755 --- a/duckscript_sdk/src/sdk/std/mod.rs +++ b/duckscript_sdk/src/sdk/std/mod.rs @@ -1,4 +1,3 @@ -pub(crate) mod alias; pub(crate) mod collections; mod debug; mod echo; @@ -7,6 +6,7 @@ mod eval; mod flowcontrol; mod fs; mod is_defined; +mod lib; mod man; mod math; mod net; @@ -37,12 +37,12 @@ pub(crate) fn load(commands: &mut Commands) -> Result<(), ScriptError> { commands.set(release::create(PACKAGE))?; commands.set(set::create(PACKAGE))?; - alias::load(commands, PACKAGE)?; collections::load(commands, PACKAGE)?; debug::load(commands, PACKAGE)?; env::load(commands, PACKAGE)?; flowcontrol::load(commands, PACKAGE)?; fs::load(commands, PACKAGE)?; + lib::load(commands, PACKAGE)?; math::load(commands, PACKAGE)?; net::load(commands, PACKAGE)?; on_error::load(commands, PACKAGE)?;