Skip to content

🧹 refactor register_yaml by extracting parse and stringify functions #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Tcode-Motion wants to merge 1 commit into from
Closed

🧹 refactor register_yaml by extracting parse and stringify functions #345

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 65 additions & 29 deletions stdlib/src/yaml.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,37 @@ use std::fmt::Write;
use std::rc::Rc;
use techscript_runtime::{error::RuntimeError, value::RuntimeValue};

fn parse_yaml(args: &[RuntimeValue]) -> Result<RuntimeValue, RuntimeError> {
let yaml = args[0].try_into_string()?;
let mut map = IndexMap::new();
for line in yaml.lines() {
let line = line.trim();
if line.starts_with('#') || line.is_empty() {
continue;
}
if let Some(pos) = line.find(':') {
let k = line[..pos].trim().to_string();
let v = line[pos + 1..].trim().to_string();
map.insert(k, RuntimeValue::Str(v));
}
}
Ok(RuntimeValue::Map {
entries: Rc::new(RefCell::new(map)),
is_const: false,
})
}

fn stringify_yaml(args: &[RuntimeValue]) -> Result<RuntimeValue, RuntimeError> {
let mut result = String::new();
if let RuntimeValue::Map { entries, .. } = &args[0] {
for (k, v) in entries.borrow().iter() {
let val_str = v.try_into_string().unwrap_or_default();
let _ = write!(result, "{}: {}\n", k, val_str);
}
}
Ok(RuntimeValue::Str(result))
}

impl StdlibRegistry {
pub fn register_yaml(&mut self) {
let mut exports: HashMap<String, Rc<dyn techscript_runtime::function::Callable>> =
Expand All @@ -16,25 +47,7 @@ impl StdlibRegistry {
Rc::new(StdFunction {
name: "parse".to_string(),
arity: 1,
callback: |_ctx, args| {
let yaml = args[0].try_into_string()?;
let mut map = IndexMap::new();
for line in yaml.lines() {
let line = line.trim();
if line.starts_with('#') || line.is_empty() {
continue;
}
if let Some(pos) = line.find(':') {
let k = line[..pos].trim().to_string();
let v = line[pos + 1..].trim().to_string();
map.insert(k, RuntimeValue::Str(v));
}
}
Ok(RuntimeValue::Map {
entries: Rc::new(RefCell::new(map)),
is_const: false,
})
},
callback: |_ctx, args| parse_yaml(&args),
}),
);

Expand All @@ -43,16 +56,7 @@ impl StdlibRegistry {
Rc::new(StdFunction {
name: "stringify".to_string(),
arity: 1,
callback: |_ctx, args| {
let mut result = String::new();
if let RuntimeValue::Map { entries, .. } = &args[0] {
for (k, v) in entries.borrow().iter() {
let val_str = v.try_into_string().unwrap_or_default();
let _ = write!(result, "{}: {}\n", k, val_str);
}
}
Ok(RuntimeValue::Str(result))
},
callback: |_ctx, args| stringify_yaml(&args),
}),
);

Expand All @@ -67,3 +71,35 @@ impl StdlibRegistry {
);
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_parse_yaml() {
let input = vec![RuntimeValue::Str(
"foo: bar\n# comment\nbaz: qux".to_string(),
)];
let res = parse_yaml(&input).unwrap();
if let RuntimeValue::Map { entries, .. } = res {
let map = entries.borrow();
assert_eq!(map.get("foo"), Some(&RuntimeValue::Str("bar".to_string())));
assert_eq!(map.get("baz"), Some(&RuntimeValue::Str("qux".to_string())));
} else {
panic!("Expected map value");
}
}

#[test]
fn test_stringify_yaml() {
let mut map = IndexMap::new();
map.insert("key1".to_string(), RuntimeValue::Str("val1".to_string()));
let val = RuntimeValue::Map {
entries: Rc::new(RefCell::new(map)),
is_const: false,
};
let res = stringify_yaml(&[val]).unwrap();
assert_eq!(res, RuntimeValue::Str("key1: val1\n".to_string()));
}
}
Loading