feat: support DataType.u32

Author: zhangyuang

.github/workflows/CI.yml

@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         settings:
-          - host: macos-latest
+          - host: macos-13
             target: x86_64-apple-darwin
             build: |
               rustup -V
@@ -50,7 +50,7 @@ jobs:
               target=x86_64-unknown-linux-gnu yarn build &&
               strip *.node && yarn test &&
               ls
-          - host: macos-latest
+          - host: macos-13
             target: aarch64-apple-darwin
             build: |
               uname -a &&

Cargo.toml

@@ -19,7 +19,7 @@ dlopen = "0.1.8"
 libffi = { version = "3.2.0" }
 libffi-sys = { version = "^2.3.0" }
 libc = "0.2"
-indexmap = "2.7.0"
+indexmap = "=2.7.0"
 widestring = "1.1.0"
 strum = "0.26"
 strum_macros = "0.26"

README.md

@@ -90,6 +90,7 @@ Currently, ffi-rs only supports these types of parameters and return values. How
 * [i64](#basic-types)
 * [bigInt](#basic-types)
 * [u64](#basic-types)
+* [u32](#basic-types)
 * [void](#basic-types) (like js undefined)
 * [float](#basic-types) (can only be used as paramsType instead of retType)
 * [double](#basic-types)
@@ -159,6 +160,7 @@ extern "C" const char *concatenateStrings(const char *str1, const char *str2) {
 
 extern "C" void noRet() { printf("%s", "hello world"); }
 extern "C" bool return_opposite(bool input) { return !input; }
+extern "C" uint32_t testU32(uint32_t a, uint32_t b) { return a + b; }
 ```
 
 ### Compile C Code into a Dynamic Library
@@ -288,6 +290,15 @@ equal(!bool_val, load({
     paramsType: [DataType.Boolean],
     paramsValue: [bool_val],
 }))
+
+// U32 type usage
+equal(3147483647, load({
+    library: 'libsum',
+    funcName: 'testU32',
+    retType: DataType.U32,
+    paramsType: [DataType.U32, DataType.U32],
+    paramsValue: [2147483647, 1000000000],
+}))
 ```
 
 ### Buffer

README_Zh.md

@@ -77,6 +77,7 @@ $ npm i ffi-rs
 * [i64](#基本类型)
 * [bigInt](#基本类型)
 * [u64](#基本类型)
+* [u32](#基本类型)
 * [void](#基本类型)(类似js的undefined)
 * [float](#基本类型)
 * [double](#基本类型)
@@ -156,6 +157,7 @@ extern "C" const char *concatenateStrings(const char *str1, const char *str2) {
 
 extern "C" void noRet() { printf("%s", "hello world"); }
 extern "C" bool return_opposite(bool input) { return !input; }
+extern "C" uint32_t testU32(uint32_t a, uint32_t b) { return a + b; }
 
 ```
 
@@ -287,6 +289,15 @@ equal(!bool_val, load({
     paramsType: [DataType.Boolean],
     paramsValue: [bool_val],
 }))
+
+// U32 类型用法
+equal(3147483647, load({
+    library: 'libsum',
+    funcName: 'testU32',
+    retType: DataType.U32,
+    paramsType: [DataType.U32, DataType.U32],
+    paramsValue: [2147483647, 1000000000],
+}))
 ```
 
 ### 缓冲区

build.rs

@@ -1,9 +1,4 @@
 extern crate napi_build;
-macro_rules! p {
-  ($($tokens: tt)*) => {
-      println!("cargo:warning={}", format!($($tokens)*))
-  }
-}
 
 fn main() {
   napi_build::setup();

cpp/sum.cpp

@@ -294,6 +294,16 @@ typedef struct {
 {
     return 0;
 }
+
+extern "C" uint32_t testU32(uint32_t a, uint32_t b)
+{
+    return a + b;
+}
+
+extern "C" uint32_t doubleU32(uint32_t input)
+{
+    return input * 2;
+}
 // typedef void (*CallbackType)(const char *);
 // extern "C" void call_callback_async() {
 //   dispatch_async(dispatch_get_main_queue(), ^{

cpp/sum.h

@@ -1,6 +1,7 @@
 #ifndef EXAMPLE_H
 #define EXAMPLE_H
 #include <stdbool.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,6 +43,8 @@ typedef struct Person {
 } Person;
 
 extern  Person *getStruct(Person *person) { return person; };
+extern uint32_t testU32(uint32_t a, uint32_t b);
+extern uint32_t doubleU32(uint32_t input);
 #ifdef __cplusplus
 }
 #endif