github-starred/yaak
2
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-11 17:46:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

cli: use explicit flag for workspace plugin dir

Browse Source
This commit is contained in:
Gregory Schier
2026-02-26 09:17:11 -08:00
parent e34301ccab
commit a2f12aef35
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
crates-cli/yaak-cli/src/context.rs
View File

@@ -38,14 +38,9 @@ impl CliContext {
let encryption_manager = Arc::new(EncryptionManager::new(query_manager.clone(), app_id));
let plugin_manager = if with_plugins {
let dev_mode = cfg!(debug_assertions);
let embedded_vendored_plugin_dir = data_dir.join("vendored-plugins");
let vendored_plugin_dir = if dev_mode {
resolve_workspace_plugins_dir()
.unwrap_or_else(|| embedded_vendored_plugin_dir.clone())
} else {
embedded_vendored_plugin_dir.clone()
};
let vendored_plugin_dir =
resolve_bundled_plugin_dir_for_cli(&embedded_vendored_plugin_dir);
let installed_plugin_dir = data_dir.join("installed-plugins");
let node_bin_path = PathBuf::from("node");
@@ -147,3 +142,28 @@ fn resolve_workspace_plugins_dir() -> Option<PathBuf> {
.canonicalize()
.ok()
}
fn resolve_bundled_plugin_dir_for_cli(embedded_vendored_plugin_dir: &Path) -> PathBuf {
if !use_workspace_plugins_for_cli_dev() {
return embedded_vendored_plugin_dir.to_path_buf();
}
resolve_workspace_plugins_dir().unwrap_or_else(|| {
panic!(
"YAAK_USE_WORKSPACE_PLUGINS is enabled, but ROOT/plugins could not be resolved"
)
})
}
fn use_workspace_plugins_for_cli_dev() -> bool {
std::env::var("YAAK_USE_WORKSPACE_PLUGINS")
.ok()
.map(|v| {
let v = v.trim();
v.eq_ignore_ascii_case("1")
|| v.eq_ignore_ascii_case("true")
|| v.eq_ignore_ascii_case("yes")
|| v.eq_ignore_ascii_case("on")
})
.unwrap_or(false)
}