pogmommy/eww
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: fix jq (#1044)

Browse source 
* fix: fix jq

* feat: add basic jq test case
This commit is contained in:
Wölfchen 2024-03-16 12:33:12 +00:00 • committed by GitHub
parent 7bfd47eb81
commit 4ce42455a4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -7,6 +7,7 @@ All notable changes to eww will be listed here, starting at changes since versio
### Fixes ### Fixes
- The `shell-completions` subcommand is now run before anything is set up - The `shell-completions` subcommand is now run before anything is set up
- Fix nix flake - Fix nix flake
- Fix `jq` (By: w-lfchen)
## [0.5.0] (17.02.2024) ## [0.5.0] (17.02.2024)

2
crates/simplexpr/src/eval.rs
View file

@ -467,6 +467,7 @@ fn prepare_jaq_filter(code: String) -> Result<Arc<jaq_interpret::Filter>, EvalEr
None => return Err(EvalError::JaqParseError(Box::new(JaqParseError(errors.pop())))), None => return Err(EvalError::JaqParseError(Box::new(JaqParseError(errors.pop())))),
}; };
let mut defs = jaq_interpret::ParseCtx::new(Vec::new()); let mut defs = jaq_interpret::ParseCtx::new(Vec::new());
defs.insert_natives(jaq_core::core());
defs.insert_defs(jaq_std::std()); defs.insert_defs(jaq_std::std());
let filter = defs.compile(filter); let filter = defs.compile(filter);
@ -544,5 +545,6 @@ mod tests {
lazy_evaluation_and(r#"false && "null".test"#) => Ok(DynVal::from(false)), lazy_evaluation_and(r#"false && "null".test"#) => Ok(DynVal::from(false)),
lazy_evaluation_or(r#"true || "null".test"#) => Ok(DynVal::from(true)), lazy_evaluation_or(r#"true || "null".test"#) => Ok(DynVal::from(true)),
lazy_evaluation_elvis(r#""test"?: "null".test"#) => Ok(DynVal::from("test")), lazy_evaluation_elvis(r#""test"?: "null".test"#) => Ok(DynVal::from("test")),
jq_basic_index(r#"jq("[7,8,9]", ".[0]")"#) => Ok(DynVal::from(7)),
} }
} }