0.2.0 (#21)

Cargo.toml

@@ -1,12 +1,7 @@
-[package]
-name = "deno_bindgen"
-version = "0.2.0"
-description = "This tool aims to simplify glue code generation for Deno FFI libraries written in Rust."
-license = "MIT"
-edition = "2018"
-
-[dependencies]
-deno_bindgen_macro = { path = "./macro/" }
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+[workspace]
+members = [
+  "deno_bindgen_macro",
+  "deno_bindgen",
+]
+exclude = ["example/"]
 

README.md

@@ -12,12 +12,13 @@ deno install -Afq -n deno_bindgen https://deno.land/x/deno_bindgen/cli.ts
 ```toml
 # Cargo.toml
 [dependencies]
-deno_bindgen = "0.1"
+deno_bindgen = "0.2"
+serde = { version = "1", features = ["derive"] }
 ```
 
 ```rust
 // add.rs
-use deno_bindgen::*;
+use deno_bindgen::deno_bindgen;
 
 #[deno_bindgen]
 pub struct Input {

cli.ts

@@ -27,7 +27,6 @@ async function generate() {
     // Nothing to update.
     return;
   }
-  console.log(conf);
 
   const pkgName = conf.name;
 

deno_bindgen/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "deno_bindgen"
+version = "0.2.0"
+description = "This tool aims to simplify glue code generation for Deno FFI libraries written in Rust."
+license = "MIT"
+edition = "2018"
+
+[lib]
+path = "./lib.rs"
+
+[dependencies]
+deno_bindgen_macro = { path = "../deno_bindgen_macro", version = "0.2.0" }
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+

macro/Cargo.toml → deno_bindgen_macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deno_bindgen_macro"
-version = "0.1.1"
+version = "0.2.0"
 description = "This tool aims to simplify glue code generation for Deno FFI libraries written in Rust."
 license = "MIT"
 edition = "2018"

example/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-deno_bindgen = { path = "../" }
+deno_bindgen = { path = "../deno_bindgen/" }
 serde = { version = "1", features = ["derive"] }
 
 [lib]

example/bindings/bindings.ts

@@ -9,35 +9,38 @@ const opts = {
   url: "target/debug",
 }
 const _lib = await Plug.prepare(opts, {
+  test_buf: {
+    parameters: ["buffer", "usize"],
+    result: "u8",
+    nonblocking: false,
+  },
+  add2: { parameters: ["buffer", "usize"], result: "i32", nonblocking: false },
   test_mixed_order: {
     parameters: ["i32", "buffer", "usize", "i32"],
     result: "i32",
     nonblocking: false,
   },
-  test_serde: {
-    parameters: ["buffer", "usize"],
-    result: "u8",
+  test_mixed: {
+    parameters: ["isize", "buffer", "usize"],
+    result: "i32",
     nonblocking: false,
   },
+  sleep: { parameters: ["u64"], result: "void", nonblocking: true },
   test_str: {
     parameters: ["buffer", "usize"],
     result: "void",
     nonblocking: false,
   },
-  add: { parameters: ["i32", "i32"], result: "i32", nonblocking: false },
-  sleep: { parameters: ["u64"], result: "void", nonblocking: true },
-  add2: { parameters: ["buffer", "usize"], result: "i32", nonblocking: false },
-  test_buf: {
+  test_serde: {
     parameters: ["buffer", "usize"],
     result: "u8",
     nonblocking: false,
   },
-  test_mixed: {
-    parameters: ["isize", "buffer", "usize"],
-    result: "i32",
-    nonblocking: false,
-  },
+  add: { parameters: ["i32", "i32"], result: "i32", nonblocking: false },
 })
+export type OptionStruct = {
+  maybe: string | undefined | null
+}
 export type MyStruct = {
   arr: Array<string>
 }
@@ -62,8 +65,13 @@ export type Input = {
   a: number
   b: number
 }
-export type OptionStruct = {
-  maybe: string | undefined | null
+export function test_buf(a0: Uint8Array) {
+  const a0_buf = encode(a0)
+  return _lib.symbols.test_buf(a0_buf, a0_buf.byteLength) as number
+}
+export function add2(a0: Input) {
+  const a0_buf = encode(JSON.stringify(a0))
+  return _lib.symbols.add2(a0_buf, a0_buf.byteLength) as number
 }
 export function test_mixed_order(a0: number, a1: Input, a2: number) {
   const a1_buf = encode(JSON.stringify(a1))
@@ -74,29 +82,21 @@ export function test_mixed_order(a0: number, a1: Input, a2: number) {
     a2,
   ) as number
 }
-export function test_serde(a0: MyStruct) {
-  const a0_buf = encode(JSON.stringify(a0))
-  return _lib.symbols.test_serde(a0_buf, a0_buf.byteLength) as number
+export function test_mixed(a0: number, a1: Input) {
+  const a1_buf = encode(JSON.stringify(a1))
+  return _lib.symbols.test_mixed(a0, a1_buf, a1_buf.byteLength) as number
+}
+export function sleep(a0: number) {
+  return _lib.symbols.sleep(a0) as Promise<null>
 }
 export function test_str(a0: string) {
   const a0_buf = encode(a0)
   return _lib.symbols.test_str(a0_buf, a0_buf.byteLength) as null
 }
-export function add(a0: number, a1: number) {
-  return _lib.symbols.add(a0, a1) as number
-}
-export function sleep(a0: number) {
-  return _lib.symbols.sleep(a0) as Promise<null>
-}
-export function add2(a0: Input) {
+export function test_serde(a0: MyStruct) {
   const a0_buf = encode(JSON.stringify(a0))
-  return _lib.symbols.add2(a0_buf, a0_buf.byteLength) as number
-}
-export function test_buf(a0: Uint8Array) {
-  const a0_buf = encode(a0)
-  return _lib.symbols.test_buf(a0_buf, a0_buf.byteLength) as number
+  return _lib.symbols.test_serde(a0_buf, a0_buf.byteLength) as number
 }
-export function test_mixed(a0: number, a1: Input) {
-  const a1_buf = encode(JSON.stringify(a1))
-  return _lib.symbols.test_mixed(a0, a1_buf, a1_buf.byteLength) as number
+export function add(a0: number, a1: number) {
+  return _lib.symbols.add(a0, a1) as number
 }