Skip to content

chore: upgrade napi-rs to 0.3 #13

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

Merged
merged 1 commit into from
May 9, 2020
Merged

chore: upgrade napi-rs to 0.3 #13

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions packages/crc32/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ edition = "2018"
crate-type = ["cdylib"]

[dependencies]
napi-rs = { version = "0.2" }
napi-rs-derive = { version = "0.1" }
napi-rs = { version = "0.3" }
napi-rs-derive = { version = "0.2" }
crc32fast = "1.2"

[target.'cfg(unix)'.dependencies]
Expand Down
7 changes: 2 additions & 5 deletions packages/crc32/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,10 @@ mod crc32_table;

register_module!(test_module, init);

fn init<'env>(
env: &'env Env,
exports: &'env mut Value<'env, Object>,
) -> Result<Option<Value<'env, Object>>> {
fn init(env: &Env, exports: &mut Value<Object>) -> Result<()> {
exports.set_named_property("crc32c", env.create_function("crc32c", crc32c)?)?;
exports.set_named_property("crc32", env.create_function("crc32", crc32)?)?;
Ok(None)
Ok(())
}

#[js_function(2)]
Expand Down
4 changes: 2 additions & 2 deletions packages/jieba/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ crate-type = ["cdylib"]

[dependencies]
jieba-rs = { version = "0.4", features = ["default-dict", "tfidf", "textrank"] }
napi-rs = { version = "0.2" }
napi-rs-derive = { version = "0.1" }
napi-rs = { version = "0.3" }
napi-rs-derive = { version = "0.2" }
once_cell = "1.3"

[target.'cfg(unix)'.dependencies]
Expand Down
21 changes: 9 additions & 12 deletions packages/jieba/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ register_module!(test_module, init);

static JIEBA: OnceCell<Jieba> = OnceCell::new();

fn init<'env>(
env: &'env Env,
exports: &'env mut Value<'env, Object>,
) -> Result<Option<Value<'env, Object>>> {
fn init(env: &Env, exports: &mut Value<Object>) -> Result<()> {
exports.set_property(
env.create_string("load")?,
env.create_function("load", load)?,
Expand Down Expand Up @@ -53,19 +50,19 @@ fn init<'env>(
env.create_function("extract", extract)?,
)?;

Ok(None)
Ok(())
}

#[js_function]
fn load(ctx: CallContext) -> Result<Value<Undefined>> {
assert_not_init(ctx.env)?;
assert_not_init(&ctx.env)?;
let _ = JIEBA.get_or_init(|| Jieba::new());
ctx.env.get_undefined()
}

#[js_function(1)]
fn load_dict(ctx: CallContext) -> Result<Value<Undefined>> {
assert_not_init(ctx.env)?;
assert_not_init(&ctx.env)?;
let dict = ctx.get::<Buffer>(0)?;
let mut readable_dict: &[u8] = &dict;
JIEBA.get_or_init(|| {
Expand Down Expand Up @@ -98,7 +95,7 @@ fn cut(ctx: CallContext) -> Result<Value<JsString>> {
.or_else(|_| ctx.env.get_boolean(false))?;
let jieba = JIEBA.get_or_init(|| Jieba::new());
let cutted = jieba.cut(
str::from_utf8(&sentence).map_err(|_| Error::new(Status::InvalidArg))?,
str::from_utf8(&sentence).map_err(|_| Error::from_status(Status::InvalidArg))?,
hmm.get_value(),
);

Expand All @@ -112,7 +109,7 @@ fn cut_all(ctx: CallContext) -> Result<Value<JsString>> {
let sentence = ctx.get::<Buffer>(0)?;
let jieba = JIEBA.get_or_init(|| Jieba::new());
let cutted =
jieba.cut_all(str::from_utf8(&sentence).map_err(|_| Error::new(Status::InvalidArg))?);
jieba.cut_all(str::from_utf8(&sentence).map_err(|_| Error::from_status(Status::InvalidArg))?);

let output = cutted.join(",");

Expand All @@ -127,7 +124,7 @@ fn cut_for_search(ctx: CallContext) -> Result<Value<JsString>> {
.or_else(|_| ctx.env.get_boolean(false))?;
let jieba = JIEBA.get_or_init(|| Jieba::new());
let cutted = jieba.cut_for_search(
str::from_utf8(&sentence).map_err(|_| Error::new(Status::InvalidArg))?,
str::from_utf8(&sentence).map_err(|_| Error::from_status(Status::InvalidArg))?,
hmm.get_value(),
);

Expand All @@ -144,7 +141,7 @@ fn tag(ctx: CallContext) -> Result<Value<JsString>> {
.or_else(|_| ctx.env.get_boolean(false))?;
let jieba = JIEBA.get_or_init(|| Jieba::new());
let tagged = jieba.tag(
str::from_utf8(&sentence).map_err(|_| Error::new(Status::InvalidArg))?,
str::from_utf8(&sentence).map_err(|_| Error::from_status(Status::InvalidArg))?,
hmm.get_value(),
);

Expand Down Expand Up @@ -180,7 +177,7 @@ fn extract(ctx: CallContext) -> Result<Value<JsString>> {
let topn: usize = topn.try_into()?;

let tags = keyword_extractor.extract_tags(
str::from_utf8(&sentence).map_err(|_| Error::new(Status::InvalidArg))?,
str::from_utf8(&sentence).map_err(|_| Error::from_status(Status::InvalidArg))?,
topn,
allowed_pos,
);
Expand Down