Skip to content
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

define version 9 #67

Merged
merged 1 commit into from
Jun 2, 2023
Merged

define version 9 #67

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
12 changes: 6 additions & 6 deletions packages/emnapi/include/js_native_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,13 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_create_string_utf16(napi_env env,
NAPI_EXTERN napi_status NAPI_CDECL napi_create_symbol(napi_env env,
napi_value description,
napi_value* result);
#ifdef NAPI_EXPERIMENTAL
#if NAPI_VERSION >= 9
NAPI_EXTERN napi_status NAPI_CDECL
node_api_symbol_for(napi_env env,
const char* utf8description,
size_t length,
napi_value* result);
#endif // NAPI_EXPERIMENTAL
#endif // NAPI_VERSION >= 9
NAPI_EXTERN napi_status NAPI_CDECL napi_create_function(napi_env env,
const char* utf8name,
size_t length,
Expand All @@ -126,10 +126,10 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_create_range_error(napi_env env,
napi_value code,
napi_value msg,
napi_value* result);
#ifdef NAPI_EXPERIMENTAL
#if NAPI_VERSION >= 9
NAPI_EXTERN napi_status NAPI_CDECL node_api_create_syntax_error(
napi_env env, napi_value code, napi_value msg, napi_value* result);
#endif // NAPI_EXPERIMENTAL
#endif // NAPI_VERSION >= 9

// Methods to get the native napi_value from Primitive type
NAPI_EXTERN napi_status NAPI_CDECL napi_typeof(napi_env env,
Expand Down Expand Up @@ -384,11 +384,11 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_throw_type_error(napi_env env,
NAPI_EXTERN napi_status NAPI_CDECL napi_throw_range_error(napi_env env,
const char* code,
const char* msg);
#ifdef NAPI_EXPERIMENTAL
#if NAPI_VERSION >= 9
NAPI_EXTERN napi_status NAPI_CDECL node_api_throw_syntax_error(napi_env env,
const char* code,
const char* msg);
#endif // NAPI_EXPERIMENTAL
#endif // NAPI_VERSION >= 9
NAPI_EXTERN napi_status NAPI_CDECL napi_is_error(napi_env env,
napi_value value,
bool* result);
Expand Down
4 changes: 2 additions & 2 deletions packages/emnapi/include/node_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,12 +265,12 @@ napi_remove_async_cleanup_hook(napi_async_cleanup_hook_handle remove_handle);

#endif // NAPI_VERSION >= 8

#ifdef NAPI_EXPERIMENTAL
#if NAPI_VERSION >= 9

NAPI_EXTERN napi_status NAPI_CDECL
node_api_get_module_file_name(napi_env env, const char** result);

#endif // NAPI_EXPERIMENTAL
#endif // NAPI_VERSION >= 9

EXTERN_C_END

Expand Down
7 changes: 0 additions & 7 deletions packages/emnapi/src/js_native_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,4 @@ napi_status napi_adjust_external_memory(napi_env env,
return napi_clear_last_error(env);
}

napi_status napi_get_version(napi_env env, uint32_t* result) {
CHECK_ENV(env);
CHECK_ARG(env, result);
*result = NAPI_VERSION;
return napi_clear_last_error(env);
}

EXTERN_C_END
11 changes: 11 additions & 0 deletions packages/emnapi/src/version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
function _napi_get_version (env: napi_env, result: Pointer<uint32_t>): napi_status {
$CHECK_ENV!(env)
const envObject = emnapiCtx.envStore.get(env)!
$CHECK_ARG!(envObject, result)
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const NAPI_VERSION = Version.NAPI_VERSION
$makeSetValue('result', 0, 'NAPI_VERSION', 'u32')
return envObject.clearLastError()
}

emnapiImplement('napi_get_version', 'ipp', _napi_get_version, [])
2 changes: 1 addition & 1 deletion packages/runtime/src/typings/common.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ declare const enum Ownership {
}

declare const enum Version {
NAPI_VERSION = 8,
NODE_API_DEFAULT_MODULE_API_VERSION = 8,
NAPI_VERSION = 9,
NAPI_VERSION_EXPERIMENTAL = 2147483647 // INT_MAX
}
2 changes: 1 addition & 1 deletion packages/test/error/binding.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define NAPI_EXPERIMENTAL
#define NAPI_VERSION 9
#include <js_native_api.h>
#include "../common.h"

Expand Down
2 changes: 1 addition & 1 deletion packages/test/general/general.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module.exports = load('general').then(async test_general => {
test_general.testGetPrototype(extendedObject))

// Test version management functions
assert.strictEqual(test_general.testGetVersion(), 8);
assert.strictEqual(test_general.testGetVersion(), 9);

[
123,
Expand Down
2 changes: 1 addition & 1 deletion packages/test/property/binding.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define NAPI_EXPERIMENTAL
#define NAPI_VERSION 9
#include <js_native_api.h>
#include "../common.h"

Expand Down
2 changes: 1 addition & 1 deletion packages/test/ref/binding.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define NAPI_EXPERIMENTAL
#define NAPI_VERSION 9
#include <js_native_api.h>
#include "../common.h"

Expand Down