fix: Migrate neon to 1.0.0

Author: MikuroXina

index.js

@@ -14,15 +14,9 @@ StateConstructor.prototype.run = function run() {
 
 module.exports = {
     doStringSync: native.doStringSync,
-    doString(program) {
-        return new Promise((resolve) => native.doStringAsync(program, resolve));
-    },
-
+    doString: native.doStringAsync,
     doFileSync: native.doFileSync,
-    doFile(filename) {
-        return new Promise((resolve) => native.doFileAsync(filename, resolve));
-    },
-
+    doFile: native.doFileAsync,
     loadProgram(program) {
         return new StateConstructor(program);
     }

native/Cargo.toml

@@ -14,8 +14,5 @@ crate-type = ["cdylib"]
 
 [dependencies]
 lua = { version = "0.0.10" }
-neon = { version = "0.10.1", default-features = false, features = [
-    "napi-6",
-    "channel-api",
-] }
+neon = { version = "1.1.1", default-features = false, features = ["napi-6"] }
 static_assertions = "1.1.0"

native/src/do_file.rs

@@ -13,24 +13,13 @@ pub fn do_file_sync(mut cx: FunctionContext) -> JsResult<JsValue> {
 
 pub fn do_file_async(mut cx: FunctionContext) -> JsResult<JsValue> {
     let program = cx.argument::<JsString>(0)?.value(&mut cx);
-    let callback = cx.argument::<JsFunction>(1)?.root(&mut cx);
-    let mut channel = cx.channel();
-    channel.unref(&mut cx);
-
-    std::thread::spawn(move || {
-        let mut state = State::new();
-        state.open_libs();
-        let status = state.do_file(&program);
-
-        channel.send(move |mut cx| {
-            let callback = callback.into_inner(&mut cx);
-            let this = cx.undefined();
-            let args = [convert_err(status, &mut state, &mut cx)?];
-
-            callback.call(&mut cx, this, args)?;
-
-            Ok(())
-        });
-    });
-    Ok(cx.undefined().as_value(&mut cx))
+    let promise = cx
+        .task(move || {
+            let mut state = State::new();
+            state.open_libs();
+            let status = state.do_file(&program);
+            (state, status)
+        })
+        .promise(|mut cx, (mut state, status)| convert_err(status, &mut state, &mut cx));
+    Ok(promise.as_value(&mut cx))
 }

native/src/do_string.rs

@@ -13,24 +13,13 @@ pub fn do_string_sync(mut cx: FunctionContext) -> JsResult<JsValue> {
 
 pub fn do_string_async(mut cx: FunctionContext) -> JsResult<JsValue> {
     let program = cx.argument::<JsString>(0)?.value(&mut cx);
-    let callback = cx.argument::<JsFunction>(1)?.root(&mut cx);
-    let mut channel = cx.channel();
-    channel.unref(&mut cx);
-
-    std::thread::spawn(move || {
-        let mut state = State::new();
-        state.open_libs();
-        let status = state.do_string(&program);
-
-        channel.send(move |mut cx| {
-            let callback = callback.into_inner(&mut cx);
-            let this = cx.undefined();
-            let args = [convert_err(status, &mut state, &mut cx)?];
-
-            callback.call(&mut cx, this, args)?;
-
-            Ok(())
-        });
-    });
-    Ok(cx.undefined().as_value(&mut cx))
+    let promise = cx
+        .task(move || {
+            let mut state = State::new();
+            state.open_libs();
+            let status = state.do_string(&program);
+            (state, status)
+        })
+        .promise(|mut cx, (mut state, status)| convert_err(status, &mut state, &mut cx));
+    Ok(promise.as_value(&mut cx))
 }

native/src/program/entry.rs

@@ -65,7 +65,7 @@ impl Entry {
             } else if let Ok(o) = value.downcast::<JsObject, _>(cx) {
                 Entry::Table(Table::from_js(cx, o)?)
             } else {
-                return cx.throw_type_error(&format!(
+                return cx.throw_type_error(format!(
                     "found value of unsupported type on the key: {:?}",
                     key
                 ));