Skip to content

Commit 1165480

Browse files
toyobayashitoyobayashi
authored
test: rename n-api to node-api (#79)
1 parent d7cc080 commit 1165480

File tree

57 files changed

+1414
-1414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1414
-1414
lines changed

‎packages/bench/src/lib.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ static napi_value js_fib(napi_env env, napi_callback_info info) {
6767
#define EXPORT_FUNCTION(env, exports, name, f) \
6868
do { \
6969
napi_value f##_fn; \
70-
NAPI_CALL((env), napi_create_function((env), NULL, NAPI_AUTO_LENGTH, (f), NULL, &(f##_fn))); \
71-
NAPI_CALL((env), napi_set_named_property((env), (exports), (name), (f##_fn))); \
70+
NODE_API_CALL((env), napi_create_function((env), NULL, NAPI_AUTO_LENGTH, (f), NULL, &(f##_fn))); \
71+
NODE_API_CALL((env), napi_set_named_property((env), (exports), (name), (f##_fn))); \
7272
} while (0)
7373

7474
NAPI_MODULE_INIT() {

‎packages/emnapi/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Create `hello.c`.
109109
```c
110110
#include <node_api.h>
111111

112-
#define NAPI_CALL(env, the_call) \
112+
#define NODE_API_CALL(env, the_call) \
113113
do { \
114114
if ((the_call) != napi_ok) { \
115115
const napi_extended_error_info *error_info; \
@@ -130,15 +130,15 @@ Create `hello.c`.
130130
static napi_value js_hello(napi_env env, napi_callback_info info) {
131131
napi_value world;
132132
const char* str = "world";
133-
NAPI_CALL(env, napi_create_string_utf8(env, str, NAPI_AUTO_LENGTH, &world));
133+
NODE_API_CALL(env, napi_create_string_utf8(env, str, NAPI_AUTO_LENGTH, &world));
134134
return world;
135135
}
136136

137137
NAPI_MODULE_INIT() {
138138
napi_value hello;
139-
NAPI_CALL(env, napi_create_function(env, "hello", NAPI_AUTO_LENGTH,
139+
NODE_API_CALL(env, napi_create_function(env, "hello", NAPI_AUTO_LENGTH,
140140
js_hello, NULL, &hello));
141-
NAPI_CALL(env, napi_set_named_property(env, exports, "hello", hello));
141+
NODE_API_CALL(env, napi_set_named_property(env, exports, "hello", hello));
142142
return exports;
143143
}
144144
```

‎packages/test/arg/binding.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,35 @@
44
static napi_value Add(napi_env env, napi_callback_info info) {
55
size_t argc = 2;
66
napi_value args[2];
7-
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
7+
NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
88

9-
NAPI_ASSERT(env, argc >= 2, "Wrong number of arguments");
9+
NODE_API_ASSERT(env, argc >= 2, "Wrong number of arguments");
1010

1111
napi_valuetype valuetype0;
12-
NAPI_CALL(env, napi_typeof(env, args[0], &valuetype0));
12+
NODE_API_CALL(env, napi_typeof(env, args[0], &valuetype0));
1313

1414
napi_valuetype valuetype1;
15-
NAPI_CALL(env, napi_typeof(env, args[1], &valuetype1));
15+
NODE_API_CALL(env, napi_typeof(env, args[1], &valuetype1));
1616

17-
NAPI_ASSERT(env, valuetype0 == napi_number && valuetype1 == napi_number,
17+
NODE_API_ASSERT(env, valuetype0 == napi_number && valuetype1 == napi_number,
1818
"Wrong argument type. Numbers expected.");
1919

2020
double value0;
21-
NAPI_CALL(env, napi_get_value_double(env, args[0], &value0));
21+
NODE_API_CALL(env, napi_get_value_double(env, args[0], &value0));
2222

2323
double value1;
24-
NAPI_CALL(env, napi_get_value_double(env, args[1], &value1));
24+
NODE_API_CALL(env, napi_get_value_double(env, args[1], &value1));
2525

2626
napi_value sum;
27-
NAPI_CALL(env, napi_create_double(env, value0 + value1, &sum));
27+
NODE_API_CALL(env, napi_create_double(env, value0 + value1, &sum));
2828

2929
return sum;
3030
}
3131

3232
EXTERN_C_START
3333
napi_value Init(napi_env env, napi_value exports) {
34-
napi_property_descriptor desc = DECLARE_NAPI_PROPERTY("add", Add);
35-
NAPI_CALL(env, napi_define_properties(env, exports, 1, &desc));
34+
napi_property_descriptor desc = DECLARE_NODE_API_PROPERTY("add", Add);
35+
NODE_API_CALL(env, napi_define_properties(env, exports, 1, &desc));
3636
return exports;
3737
}
3838
EXTERN_C_END

‎packages/test/array/binding.c

+52-52
Original file line numberDiff line numberDiff line change
@@ -5,81 +5,81 @@
55
static napi_value TestGetElement(napi_env env, napi_callback_info info) {
66
size_t argc = 2;
77
napi_value args[2];
8-
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
8+
NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
99

10-
NAPI_ASSERT(env, argc >= 2, "Wrong number of arguments");
10+
NODE_API_ASSERT(env, argc >= 2, "Wrong number of arguments");
1111

1212
napi_valuetype valuetype0;
13-
NAPI_CALL(env, napi_typeof(env, args[0], &valuetype0));
13+
NODE_API_CALL(env, napi_typeof(env, args[0], &valuetype0));
1414

15-
NAPI_ASSERT(env, valuetype0 == napi_object,
15+
NODE_API_ASSERT(env, valuetype0 == napi_object,
1616
"Wrong type of arguments. Expects an array as first argument.");
1717

1818
napi_valuetype valuetype1;
19-
NAPI_CALL(env, napi_typeof(env, args[1], &valuetype1));
19+
NODE_API_CALL(env, napi_typeof(env, args[1], &valuetype1));
2020

21-
NAPI_ASSERT(env, valuetype1 == napi_number,
21+
NODE_API_ASSERT(env, valuetype1 == napi_number,
2222
"Wrong type of arguments. Expects an integer as second argument.");
2323

2424
napi_value array = args[0];
2525
int32_t index;
26-
NAPI_CALL(env, napi_get_value_int32(env, args[1], &index));
26+
NODE_API_CALL(env, napi_get_value_int32(env, args[1], &index));
2727

28-
NAPI_ASSERT(env, index >= 0, "Invalid index. Expects a positive integer.");
28+
NODE_API_ASSERT(env, index >= 0, "Invalid index. Expects a positive integer.");
2929

3030
bool isarray;
31-
NAPI_CALL(env, napi_is_array(env, array, &isarray));
31+
NODE_API_CALL(env, napi_is_array(env, array, &isarray));
3232

3333
if (!isarray) {
3434
return NULL;
3535
}
3636

3737
uint32_t length;
38-
NAPI_CALL(env, napi_get_array_length(env, array, &length));
38+
NODE_API_CALL(env, napi_get_array_length(env, array, &length));
3939

40-
NAPI_ASSERT(env, ((uint32_t)index < length), "Index out of bounds!");
40+
NODE_API_ASSERT(env, ((uint32_t)index < length), "Index out of bounds!");
4141

4242
napi_value ret;
43-
NAPI_CALL(env, napi_get_element(env, array, index, &ret));
43+
NODE_API_CALL(env, napi_get_element(env, array, index, &ret));
4444

4545
return ret;
4646
}
4747

4848
static napi_value TestHasElement(napi_env env, napi_callback_info info) {
4949
size_t argc = 2;
5050
napi_value args[2];
51-
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
51+
NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
5252

53-
NAPI_ASSERT(env, argc >= 2, "Wrong number of arguments");
53+
NODE_API_ASSERT(env, argc >= 2, "Wrong number of arguments");
5454

5555
napi_valuetype valuetype0;
56-
NAPI_CALL(env, napi_typeof(env, args[0], &valuetype0));
56+
NODE_API_CALL(env, napi_typeof(env, args[0], &valuetype0));
5757

58-
NAPI_ASSERT(env, valuetype0 == napi_object,
58+
NODE_API_ASSERT(env, valuetype0 == napi_object,
5959
"Wrong type of arguments. Expects an array as first argument.");
6060

6161
napi_valuetype valuetype1;
62-
NAPI_CALL(env, napi_typeof(env, args[1], &valuetype1));
62+
NODE_API_CALL(env, napi_typeof(env, args[1], &valuetype1));
6363

64-
NAPI_ASSERT(env, valuetype1 == napi_number,
64+
NODE_API_ASSERT(env, valuetype1 == napi_number,
6565
"Wrong type of arguments. Expects an integer as second argument.");
6666

6767
napi_value array = args[0];
6868
int32_t index;
69-
NAPI_CALL(env, napi_get_value_int32(env, args[1], &index));
69+
NODE_API_CALL(env, napi_get_value_int32(env, args[1], &index));
7070

7171
bool isarray;
72-
NAPI_CALL(env, napi_is_array(env, array, &isarray));
72+
NODE_API_CALL(env, napi_is_array(env, array, &isarray));
7373

7474
if (!isarray) {
7575
return NULL;
7676
}
7777

7878
bool has_element;
79-
NAPI_CALL(env, napi_has_element(env, array, index, &has_element));
79+
NODE_API_CALL(env, napi_has_element(env, array, index, &has_element));
8080

8181
napi_value ret;
82-
NAPI_CALL(env, napi_get_boolean(env, has_element, &ret));
82+
NODE_API_CALL(env, napi_get_boolean(env, has_element, &ret));
8383

8484
return ret;
8585
}
@@ -88,60 +88,60 @@ static napi_value TestDeleteElement(napi_env env, napi_callback_info info) {
8888
size_t argc = 2;
8989
napi_value args[2];
9090

91-
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
92-
NAPI_ASSERT(env, argc == 2, "Wrong number of arguments");
91+
NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
92+
NODE_API_ASSERT(env, argc == 2, "Wrong number of arguments");
9393

9494
napi_valuetype valuetype0;
95-
NAPI_CALL(env, napi_typeof(env, args[0], &valuetype0));
96-
NAPI_ASSERT(env, valuetype0 == napi_object,
95+
NODE_API_CALL(env, napi_typeof(env, args[0], &valuetype0));
96+
NODE_API_ASSERT(env, valuetype0 == napi_object,
9797
"Wrong type of arguments. Expects an array as first argument.");
9898

9999
napi_valuetype valuetype1;
100-
NAPI_CALL(env, napi_typeof(env, args[1], &valuetype1));
101-
NAPI_ASSERT(env, valuetype1 == napi_number,
100+
NODE_API_CALL(env, napi_typeof(env, args[1], &valuetype1));
101+
NODE_API_ASSERT(env, valuetype1 == napi_number,
102102
"Wrong type of arguments. Expects an integer as second argument.");
103103

104104
napi_value array = args[0];
105105
int32_t index;
106106
bool result;
107107
napi_value ret;
108108

109-
NAPI_CALL(env, napi_get_value_int32(env, args[1], &index));
110-
NAPI_CALL(env, napi_is_array(env, array, &result));
109+
NODE_API_CALL(env, napi_get_value_int32(env, args[1], &index));
110+
NODE_API_CALL(env, napi_is_array(env, array, &result));
111111

112112
if (!result) {
113113
return NULL;
114114
}
115115

116-
NAPI_CALL(env, napi_delete_element(env, array, index, &result));
117-
NAPI_CALL(env, napi_get_boolean(env, result, &ret));
116+
NODE_API_CALL(env, napi_delete_element(env, array, index, &result));
117+
NODE_API_CALL(env, napi_get_boolean(env, result, &ret));
118118

119119
return ret;
120120
}
121121

122122
static napi_value New(napi_env env, napi_callback_info info) {
123123
size_t argc = 1;
124124
napi_value args[1];
125-
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
125+
NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
126126

127-
NAPI_ASSERT(env, argc >= 1, "Wrong number of arguments");
127+
NODE_API_ASSERT(env, argc >= 1, "Wrong number of arguments");
128128

129129
napi_valuetype valuetype0;
130-
NAPI_CALL(env, napi_typeof(env, args[0], &valuetype0));
130+
NODE_API_CALL(env, napi_typeof(env, args[0], &valuetype0));
131131

132-
NAPI_ASSERT(env, valuetype0 == napi_object,
132+
NODE_API_ASSERT(env, valuetype0 == napi_object,
133133
"Wrong type of arguments. Expects an array as first argument.");
134134

135135
napi_value ret;
136-
NAPI_CALL(env, napi_create_array(env, &ret));
136+
NODE_API_CALL(env, napi_create_array(env, &ret));
137137

138138
uint32_t i, length;
139-
NAPI_CALL(env, napi_get_array_length(env, args[0], &length));
139+
NODE_API_CALL(env, napi_get_array_length(env, args[0], &length));
140140

141141
for (i = 0; i < length; i++) {
142142
napi_value e;
143-
NAPI_CALL(env, napi_get_element(env, args[0], i, &e));
144-
NAPI_CALL(env, napi_set_element(env, ret, i, e));
143+
NODE_API_CALL(env, napi_get_element(env, args[0], i, &e));
144+
NODE_API_CALL(env, napi_set_element(env, ret, i, e));
145145
}
146146

147147
return ret;
@@ -150,36 +150,36 @@ static napi_value New(napi_env env, napi_callback_info info) {
150150
static napi_value NewWithLength(napi_env env, napi_callback_info info) {
151151
size_t argc = 1;
152152
napi_value args[1];
153-
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
153+
NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
154154

155-
NAPI_ASSERT(env, argc >= 1, "Wrong number of arguments");
155+
NODE_API_ASSERT(env, argc >= 1, "Wrong number of arguments");
156156

157157
napi_valuetype valuetype0;
158-
NAPI_CALL(env, napi_typeof(env, args[0], &valuetype0));
158+
NODE_API_CALL(env, napi_typeof(env, args[0], &valuetype0));
159159

160-
NAPI_ASSERT(env, valuetype0 == napi_number,
160+
NODE_API_ASSERT(env, valuetype0 == napi_number,
161161
"Wrong type of arguments. Expects an integer the first argument.");
162162

163163
int32_t array_length;
164-
NAPI_CALL(env, napi_get_value_int32(env, args[0], &array_length));
164+
NODE_API_CALL(env, napi_get_value_int32(env, args[0], &array_length));
165165

166166
napi_value ret;
167-
NAPI_CALL(env, napi_create_array_with_length(env, array_length, &ret));
167+
NODE_API_CALL(env, napi_create_array_with_length(env, array_length, &ret));
168168

169169
return ret;
170170
}
171171

172172
EXTERN_C_START
173173
napi_value Init(napi_env env, napi_value exports) {
174174
napi_property_descriptor descriptors[] = {
175-
DECLARE_NAPI_PROPERTY("TestGetElement", TestGetElement),
176-
DECLARE_NAPI_PROPERTY("TestHasElement", TestHasElement),
177-
DECLARE_NAPI_PROPERTY("TestDeleteElement", TestDeleteElement),
178-
DECLARE_NAPI_PROPERTY("New", New),
179-
DECLARE_NAPI_PROPERTY("NewWithLength", NewWithLength),
175+
DECLARE_NODE_API_PROPERTY("TestGetElement", TestGetElement),
176+
DECLARE_NODE_API_PROPERTY("TestHasElement", TestHasElement),
177+
DECLARE_NODE_API_PROPERTY("TestDeleteElement", TestDeleteElement),
178+
DECLARE_NODE_API_PROPERTY("New", New),
179+
DECLARE_NODE_API_PROPERTY("NewWithLength", NewWithLength),
180180
};
181181

182-
NAPI_CALL(env, napi_define_properties(
182+
NODE_API_CALL(env, napi_define_properties(
183183
env, exports, sizeof(descriptors) / sizeof(*descriptors), descriptors));
184184

185185
return exports;

0 commit comments

Comments
 (0)