Skip to content

node-api: fix node_api_create_object_with_properties name #61319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vmoroz wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −25
Open

node-api: fix node_api_create_object_with_properties name #61319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmark/napi/create_object_with_properties/binding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static napi_value CreateObjectWithPropertiesNew(napi_env env,

for (uint32_t i = 0; i < params.count; i++) {
napi_value obj;
napi_create_object_with_properties(
node_api_create_object_with_properties(
env, null_prototype, global_names, global_values, 20, &obj);
}

Expand Down
14 changes: 7 additions & 7 deletions doc/api/n-api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2645,7 +2645,7 @@ It is the equivalent of doing `new Object()` in JavaScript.
The JavaScript `Object` type is described in [Section object type][] of the
ECMAScript Language Specification.

#### `napi_create_object_with_properties`
#### `node_api_create_object_with_properties`

<!-- YAML
added:
Expand All @@ -2656,12 +2656,12 @@ added:
> Stability: 1 - Experimental

```cpp
napi_status napi_create_object_with_properties(napi_env env,
napi_value prototype_or_null,
const napi_value* property_names,
const napi_value* property_values,
size_t property_count,
napi_value* result)
napi_status node_api_create_object_with_properties(napi_env env,
napi_value prototype_or_null,
const napi_value* property_names,
const napi_value* property_values,
size_t property_count,
napi_value* result)
```

* `[in] env`: The environment that the API is invoked under.
Expand Down
12 changes: 6 additions & 6 deletions src/js_native_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_create_object(napi_env env,
#ifdef NAPI_EXPERIMENTAL
#define NODE_API_EXPERIMENTAL_HAS_CREATE_OBJECT_WITH_PROPERTIES
NAPI_EXTERN napi_status NAPI_CDECL
napi_create_object_with_properties(napi_env env,
napi_value prototype_or_null,
napi_value* property_names,
napi_value* property_values,
size_t property_count,
napi_value* result);
node_api_create_object_with_properties(napi_env env,
napi_value prototype_or_null,
napi_value* property_names,
napi_value* property_values,
size_t property_count,
napi_value* result);
#endif // NAPI_EXPERIMENTAL

NAPI_EXTERN napi_status NAPI_CDECL napi_create_array(napi_env env,
Expand Down
12 changes: 6 additions & 6 deletions src/js_native_api_v8.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1614,12 +1614,12 @@ napi_status NAPI_CDECL napi_create_object(napi_env env, napi_value* result) {
}

napi_status NAPI_CDECL
napi_create_object_with_properties(napi_env env,
napi_value prototype_or_null,
napi_value* property_names,
napi_value* property_values,
size_t property_count,
napi_value* result) {
node_api_create_object_with_properties(napi_env env,
napi_value prototype_or_null,
napi_value* property_names,
napi_value* property_values,
size_t property_count,
napi_value* result) {
CHECK_ENV_NOT_IN_GC(env);
CHECK_ARG(env, result);

Expand Down
10 changes: 5 additions & 5 deletions test/js-native-api/test_object/test_object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ static napi_value TestCreateObjectWithProperties(napi_env env,
napi_value null_prototype;
NODE_API_CALL(env, napi_get_null(env, &null_prototype));
NODE_API_CALL(env,
napi_create_object_with_properties(
node_api_create_object_with_properties(
env, null_prototype, names, values, 3, &result));

return result;
Expand All @@ -742,9 +742,9 @@ static napi_value TestCreateObjectWithPropertiesEmpty(napi_env env,
napi_callback_info info) {
napi_value result;

NODE_API_CALL(
env,
napi_create_object_with_properties(env, NULL, NULL, NULL, 0, &result));
NODE_API_CALL(env,
node_api_create_object_with_properties(
env, NULL, NULL, NULL, 0, &result));

return result;
}
Expand Down Expand Up @@ -777,7 +777,7 @@ static napi_value TestCreateObjectWithCustomPrototype(napi_env env,
NODE_API_CALL(env, napi_create_int32(env, 42, &values[0]));

NODE_API_CALL(env,
napi_create_object_with_properties(
node_api_create_object_with_properties(
env, prototype, names, values, 1, &result));

return result;
Expand Down
Loading