Skip to content
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

Implement dynamic string size. #110

Merged
merged 2 commits into from
Dec 23, 2020
Merged

Implement dynamic string size. #110

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63b40ea
Implement dynamic string size.
mattcollier Dec 22, 2020
7630321
Add tests for string parameters.
mattcollier Dec 23, 2020
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
44 changes: 27 additions & 17 deletions nj-core/src/convert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use libc::size_t;
use std::ptr;

use crate::sys::napi_value;
use crate::val::JsEnv;
Expand All @@ -10,14 +11,14 @@ use crate::napi_call_result;
/// convert to JS object
pub trait TryIntoJs {

fn try_to_js(self,js_env: &JsEnv) -> Result<napi_value,NjError> ;
fn try_to_js(self,js_env: &JsEnv) -> Result<napi_value,NjError> ;

}

impl TryIntoJs for bool {
fn try_to_js(self, js_env: &JsEnv) -> Result<napi_value,NjError> {
js_env.create_boolean(self)
}
}
}

impl TryIntoJs for f64 {
Expand Down Expand Up @@ -81,15 +82,15 @@ impl TryIntoJs for napi_value {

impl <T>TryIntoJs for Vec<T> where T: TryIntoJs {
fn try_to_js(self, js_env: &JsEnv) -> Result<napi_value,NjError> {

let array = js_env.create_array_with_len(self.len())?;
for (i,element) in self.into_iter().enumerate() {
let js_element = element.try_to_js(js_env)?;
js_env.set_element(array, js_element, i)?;
}

Ok(array)
}
}
}


Expand All @@ -103,7 +104,7 @@ pub trait IntoJs {


/// Convert napi value to Rust value
///
///
pub trait JSValue<'a>: Sized {

fn label() -> &'static str {
Expand All @@ -130,7 +131,7 @@ impl JSValue<'_> for f64 {
}

impl JSValue<'_> for i32 {


fn convert_to_rust(env: &JsEnv,js_value: napi_value) -> Result<Self,NjError> {

Expand All @@ -147,7 +148,7 @@ impl JSValue<'_> for i32 {
}

impl JSValue<'_> for u32 {


fn convert_to_rust(env: &JsEnv,js_value: napi_value) -> Result<Self,NjError> {

Expand All @@ -165,7 +166,7 @@ impl JSValue<'_> for u32 {


impl JSValue<'_> for i64 {


fn convert_to_rust(env: &JsEnv,js_value: napi_value) -> Result<Self,NjError> {

Expand Down Expand Up @@ -208,14 +209,23 @@ impl JSValue<'_> for String {

use crate::sys::napi_get_value_string_utf8;

let mut chars: [u8; 1024] = [0;1024];
let mut size: size_t = 0;
let mut string_size: size_t = 0;

napi_call_result!(
napi_get_value_string_utf8(env.inner(),js_value,ptr::null_mut(),0,&mut string_size)
)?;

string_size += 1;

let chars_vec: Vec<u8> = vec![0; string_size];
let mut chars: Box<[u8]> = chars_vec.into_boxed_slice();
let mut read_size: size_t = 0;

napi_call_result!(
napi_get_value_string_utf8(env.inner(),js_value,chars.as_mut_ptr() as *mut i8,1024,&mut size)
napi_get_value_string_utf8(env.inner(),js_value,chars.as_mut_ptr() as *mut i8,string_size,&mut read_size)
)?;

let my_chars: Vec<u8> = chars[0..size].into();
let my_chars: Vec<u8> = chars[0..read_size].into();

String::from_utf8(my_chars).map_err(|err| err.into())
}
Expand All @@ -226,12 +236,12 @@ impl JSValue<'_> for String {
impl <'a,T>JSValue<'a> for Vec<T> where T: JSValue<'a> {

fn convert_to_rust(env: &'a JsEnv,js_value: napi_value) -> Result<Self,NjError> {

if !env.is_array(js_value)? {
return Err(NjError::Other("not array".to_owned()));
}


use crate::sys::napi_get_array_length;

let mut length: u32 = 0;
Expand All @@ -249,4 +259,4 @@ impl <'a,T>JSValue<'a> for Vec<T> where T: JSValue<'a> {

Ok(elements)
}
}
}