Skip to content

Commit

Permalink
Merge pull request #330 from ahaoboy/char
Browse files Browse the repository at this point in the history
feat: add impl IntoJs and FromJs for char
  • Loading branch information
DelSkayn committed Jul 19, 2024
2 parents 4eaf5f9 + b254947 commit 1a398d9
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 0 deletions.
19 changes: 19 additions & 0 deletions core/src/value/convert/from.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,25 @@ impl<'js> FromJs<'js> for StdString {
}
}

impl<'js> FromJs<'js> for char {
fn from_js(_ctx: &Ctx<'js>, value: Value<'js>) -> Result<Self> {
let type_name = value.type_name();
let s = String::from_value(value)?.to_string()?;

let mut chars = s.chars();
let (c, more) = (chars.next(), chars.next());

match (c, more) {
(Some(c), None) => Ok(c),
_ => Err(Error::FromJs {
from: type_name,
to: "char",
message: Some("The length of the string converted to char must be 1".into()),
}),
}
}
}

/// Convert from JS as any
impl<'js> FromJs<'js> for () {
fn from_js(_: &Ctx<'js>, _: Value<'js>) -> Result<Self> {
Expand Down
30 changes: 30 additions & 0 deletions core/src/value/convert/into.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ impl<'js> IntoJs<'js> for &str {
}
}

impl<'js> IntoJs<'js> for char {
fn into_js(self, ctx: &Ctx<'js>) -> Result<Value<'js>> {
String::from_str(ctx.clone(), self.to_string().as_str()).map(|String(value)| value)
}
}

impl<'js, T> IntoJs<'js> for &[T]
where
for<'a> &'a T: IntoJs<'js>,
Expand Down Expand Up @@ -499,6 +505,30 @@ impl<'js, Tz: chrono::TimeZone> IntoJs<'js> for chrono::DateTime<Tz> {

#[cfg(test)]
mod test {

#[test]
fn char_to_js() {
use crate::{Context, IntoJs, Runtime};
let runtime = Runtime::new().unwrap();
let ctx = Context::full(&runtime).unwrap();

let c = 'a';

ctx.with(|ctx| {
let globs = ctx.globals();
globs.set("char", c.into_js(&ctx).unwrap()).unwrap();
let res: char = ctx.eval("globalThis.char").unwrap();
assert_eq!(c, res);

let rt = ctx.eval::<char, _>("''");
assert!(rt.is_err());
let rt = ctx.eval::<char, _>("'a'");
assert!(rt.is_ok());
let rt = ctx.eval::<char, _>("'ab'");
assert!(rt.is_err());
});
}

#[test]
fn system_time_to_js() {
use crate::{Context, IntoJs, Runtime};
Expand Down

0 comments on commit 1a398d9

Please sign in to comment.