separate parser ast and code generation: issue #9 (#21)

add unit tests for syntax checking
remove special handling for Jscallback in the code generator
use unified trait to handle cb argument extraction
update version
add support for optional argument

Cargo.toml

@@ -1,16 +1,13 @@
 [package]
 name = "node-bindgen"
-version = "1.3.0"
+version = "2.0.0"
 authors = ["Fluvio Contributors <team@fluvio.io>"]
 edition = "2018"
 description = "easy way to write nodejs module using rust"
 repository = "https://github.com/infinyon/node-bindgen"
 readme = "README.md"
 license = "Apache-2.0"
 
-[lib]
-test = false
-
 #[patch.crates-io]
 #flv-future-aio = { path = "../flv-future/src/future-aio"}
 
@@ -21,6 +18,6 @@ build = ["nj-build"]
 
 [dependencies]
 nj-sys = { path = "nj-sys", version = "1.0.0", optional = true }
-nj-core = { path = "nj-core", version = "1.2.1", optional = true  }
+nj-core = { path = "nj-core", version = "2.0.0", optional = true  }
 nj-build = { path = "nj-build", version = "0.2.0", optional = true }
-nj-derive = { path = "nj-derive", version = "1.0.0", optional = true}
+nj-derive = { path = "nj-derive", version = "2.0.0", optional = true}

Makefile

@@ -7,5 +7,12 @@ build-windows:
 	cargo build --target=x86_64-pc-windows-gnu
 
 
-test:
-	make -C examples test
+test:	test-derive
+	make -C examples test
+
+
+test-derive:
+	cd nj-derive; RUST_LOG=debug cargo test derive_ui -- --nocapture
+
+test-try:
+	cd nj-derive; RUST_LOG=debug cargo test derive_try -- --nocapture

examples/Cargo.toml

@@ -1,11 +1,15 @@
 [workspace]
 members = [
-    "class",
     "function",
     "cb",
     "promise",
     "async-cb",
-    "stream"
+    "json",
+    "js-env",
+    "class-simple",
+    "class-wrapper",
+    "class-async",
+    "stream",
 ]
 
 #[patch.crates-io]

examples/Makefile

@@ -1,12 +1,17 @@
 clean:
+	cargo clean
 	make -C function clean
 	make -C async-cb clean
 	make -C cb clean
 	make -C promise clean
-	make -C class clean
 	make -C stream clean
+	make -C json clean
+	make -C class-simple clean
+	make -C class-wrapper clean
+	make -C class-async clean
 
-test: test-function test-cb test-class test-promise test-stream
+
+test: test-function test-cb test-async-cb test-promise test-json test-class-simple test-class-wrapper test-class-async test-stream
 
 test-function:
 	make -C function test
@@ -20,8 +25,17 @@ test-cb:
 test-promise:
 	make -C promise test
 
-test-class:
-	make -C class test
+test-json:
+	make -C json test
 
 test-stream:
-	make -C stream test	
+	make -C stream test
+
+test-class-simple:
+	make -C class-simple test
+
+test-class-wrapper:
+	make -C class-wrapper test
+
+test-class-async:
+	make -C class-async test	

examples/async-cb/Makefile

@@ -1,9 +1,5 @@
-
-DYLIB = ../target/debug/libnj_example_async_cb.dylib
-
 all:	build
 
-
 build:	
 	nj-cli build
 

examples/async-cb/README.md

@@ -1 +1 @@
-simple hello world callback
+callback inside async fn

examples/async-cb/build.rs

@@ -1,4 +1,3 @@
 fn main() {
-
     node_bindgen::build::configure();
-}
+}

examples/async-cb/src/lib.rs

@@ -1,20 +1,25 @@
-
 use std::time::Duration;
 
 use flv_future_aio::timer::sleep;
 use node_bindgen::derive::node_bindgen;
 
 
+#[node_bindgen]
+async fn basic<F: Fn(f64,f64)>( seconds: i32, cb: F) {
+
+    sleep(Duration::from_secs(1)).await;
+    cb(seconds as f64,(seconds*2) as f64);
+
+}
+
+
 #[node_bindgen]
 async fn hello<F: Fn(f64,String)>( seconds: i32, cb: F) {
-        
+
   //  println!("sleeping");
     sleep(Duration::from_secs(seconds as u64)).await;
 //    println!("woke from time");
 
     cb(10.0,"hello world".to_string());
 
 }
-
-
-

examples/async-cb/test_cb.js

@@ -1,9 +1,17 @@
 let addon = require('./dist');
 const assert = require('assert');
 
+
 addon.hello(1,function(val,msg){
   assert.equal(val,10);
   assert.equal(msg,"hello world");
   console.log("callback test succeed");
 });
 
+
+addon.basic(10,function(val,val2){
+  assert.equal(val,10);
+  assert.equal(val2,20);
+  console.log("callback test succeed");
+});
+

examples/cb/Makefile

@@ -1,6 +1,3 @@
-
-DYLIB = ../target/debug/libnj_example_cb.dylib
-
 all:	build
 
 build:	

examples/cb/src/lib.rs

@@ -5,4 +5,12 @@ fn hello<F: Fn(String)>(first: f64, second: F) {
     let msg = format!("argument is: {}", first);
 
     second(msg);
-}
+}
+
+
+#[node_bindgen]
+fn example<F: Fn(i32)>(cb: F,second: i32) {        
+    cb(second*2)
+}
+
+

examples/cb/test.js

@@ -7,5 +7,9 @@ addon.hello(2,function(msg){
 });
 
 assert.throws( () => addon.hello(2),{
-  message: '2 args expected but 1 is present'
-}); 
+  message: 'expected argument of type: callback'
+}); 
+
+addon.example(function(val){
+  assert.equal(val,20);
+},10);

examples/class/Cargo.toml → examples/class-async/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "nj-example-class"
+name = "nj-example-class-async"
 version = "0.1.0"
 authors = ["fluvio.io"]
 edition = "2018"