Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion def/js_native_api.def
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,9 @@ napi_object_seal
napi_type_tag_object
node_api_create_syntax_error
node_api_symbol_for
node_api_throw_syntax_error
node_api_throw_syntax_error
node_api_create_external_string_latin1
node_api_create_external_string_utf16
node_api_create_property_key_latin1
node_api_create_property_key_utf16
node_api_create_property_key_utf8
8 changes: 7 additions & 1 deletion def/node_api.def
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,10 @@ napi_type_tag_object
node_api_get_module_file_name
node_api_create_syntax_error
node_api_symbol_for
node_api_throw_syntax_error
node_api_throw_syntax_error
node_api_create_buffer_from_arraybuffer
node_api_create_external_string_latin1
node_api_create_external_string_utf16
node_api_create_property_key_latin1
node_api_create_property_key_utf16
node_api_create_property_key_utf8
26 changes: 25 additions & 1 deletion include/js_native_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,31 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_create_string_utf16(napi_env env,
const char16_t* str,
size_t length,
napi_value* result);

#if NAPI_VERSION >= 10
NAPI_EXTERN napi_status NAPI_CDECL node_api_create_external_string_latin1(
napi_env env,
char* str,
size_t length,
node_api_basic_finalize finalize_callback,
void* finalize_hint,
napi_value* result,
bool* copied);
NAPI_EXTERN napi_status NAPI_CDECL
node_api_create_external_string_utf16(napi_env env,
char16_t* str,
size_t length,
node_api_basic_finalize finalize_callback,
void* finalize_hint,
napi_value* result,
bool* copied);

NAPI_EXTERN napi_status NAPI_CDECL node_api_create_property_key_latin1(
napi_env env, const char* str, size_t length, napi_value* result);
NAPI_EXTERN napi_status NAPI_CDECL node_api_create_property_key_utf8(
napi_env env, const char* str, size_t length, napi_value* result);
NAPI_EXTERN napi_status NAPI_CDECL node_api_create_property_key_utf16(
napi_env env, const char16_t* str, size_t length, napi_value* result);
#endif // NAPI_VERSION >= 10

NAPI_EXTERN napi_status NAPI_CDECL napi_create_symbol(napi_env env,
napi_value description,
Expand Down
16 changes: 0 additions & 16 deletions include/js_native_api_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,7 @@ typedef struct napi_env__* napi_env;
// basic APIs (unless the user explicitly casts the environment), we achieve
// the ability to ensure at compile time that we do not call APIs that affect
// the state of the JS engine from a synchronous (basic) finalizer.
#if !defined(NAPI_EXPERIMENTAL) || \
(defined(NAPI_EXPERIMENTAL) && \
(defined(NODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT) || \
defined(NODE_API_EXPERIMENTAL_BASIC_ENV_OPT_OUT)))
typedef struct napi_env__* node_api_nogc_env;
#else
typedef const struct napi_env__* node_api_nogc_env;
#endif
typedef node_api_nogc_env node_api_basic_env;

typedef struct napi_value__* napi_value;
Expand Down Expand Up @@ -147,16 +140,7 @@ typedef void(NAPI_CDECL* napi_finalize)(napi_env env,
void* finalize_data,
void* finalize_hint);

#if !defined(NAPI_EXPERIMENTAL) || \
(defined(NAPI_EXPERIMENTAL) && \
(defined(NODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT) || \
defined(NODE_API_EXPERIMENTAL_BASIC_ENV_OPT_OUT)))
typedef napi_finalize node_api_nogc_finalize;
#else
typedef void(NAPI_CDECL* node_api_nogc_finalize)(node_api_nogc_env env,
void* finalize_data,
void* finalize_hint);
#endif
typedef node_api_nogc_finalize node_api_basic_finalize;

typedef struct {
Expand Down
14 changes: 11 additions & 3 deletions include/node_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@ EXTERN_C_START

// Deprecated. Replaced by symbol-based registration defined by NAPI_MODULE
// and NAPI_MODULE_INIT macros.
#if defined(__cplusplus) && __cplusplus >= 201402L
[[deprecated]]
#endif
NAPI_EXTERN void NAPI_CDECL
napi_module_register(napi_module* mod);

Expand Down Expand Up @@ -135,6 +132,17 @@ napi_create_external_buffer(napi_env env,
void* finalize_hint,
napi_value* result);
#endif // NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED

#if NAPI_VERSION >= 10

NAPI_EXTERN napi_status NAPI_CDECL
node_api_create_buffer_from_arraybuffer(napi_env env,
napi_value arraybuffer,
size_t byte_offset,
size_t byte_length,
napi_value* result);
#endif // NAPI_VERSION >= 10

NAPI_EXTERN napi_status NAPI_CDECL napi_create_buffer_copy(napi_env env,
size_t length,
const void* data,
Expand Down
18 changes: 17 additions & 1 deletion symbols.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,21 @@ const v9 = {
]
}

const v10 = {
js_native_api_symbols: [
...v9.js_native_api_symbols,
'node_api_create_external_string_latin1',
'node_api_create_external_string_utf16',
'node_api_create_property_key_latin1',
'node_api_create_property_key_utf16',
'node_api_create_property_key_utf8'
],
node_api_symbols: [
...v9.node_api_symbols,
'node_api_create_buffer_from_arraybuffer'
]
}

module.exports = {
v1,
v2,
Expand All @@ -237,5 +252,6 @@ module.exports = {
v6,
v7,
v8,
v9
v9,
v10
}