mirror of
https://github.com/nodejs/node.git
synced 2025-05-22 22:11:41 +00:00
ca786c3734
Change `napi_callback` to return `napi_value` directly instead of requiring `napi_set_return_value`. When we invoke the callback, we will check the return value and call `SetReturnValue` ourselves. If the callback returns `NULL`, we don't set the return value in v8 which would have the same effect as previously if the callback didn't call `napi_set_return_value`. Seems to be a more natural way to handle return values from callbacks. As a consequence, remove `napi_set_return_value`. Add a `napi_value` to `napi_property_descriptor` to support string values which couldn't be passed in the `utf8name` parameter or symbols as property names. Class names, however, cannot be symbols so this `napi_value` must be a string type in that case. Remove all of the `napi_callback_info` helpers except for `napi_get_cb_info` and make all the parameters to `napi_get_cb_info` optional except for argc. Update all the test collateral according to these changes. Also add `test/addons-napi/common.h` to house some common macros for wrapping N-API calls and error handling. PR-URL: https://github.com/nodejs/node/pull/12248 Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
53 lines
2.8 KiB
C
53 lines
2.8 KiB
C
// Empty value so that macros here are able to return NULL or void
|
|
#define NAPI_RETVAL_NOTHING // Intentionally blank #define
|
|
|
|
#define GET_AND_THROW_LAST_ERROR(env) \
|
|
do { \
|
|
bool is_pending; \
|
|
napi_is_exception_pending((env), &is_pending); \
|
|
/* If an exception is already pending, don't rethrow it */ \
|
|
if (!is_pending) { \
|
|
const napi_extended_error_info* error_info; \
|
|
napi_get_last_error_info((env), &error_info); \
|
|
const char* error_message = error_info->error_message != NULL ? \
|
|
error_info->error_message : \
|
|
"empty error message"; \
|
|
napi_throw_error((env), error_message); \
|
|
} \
|
|
} while(0);
|
|
|
|
#define NAPI_ASSERT_BASE(env, assertion, message, ret_val) \
|
|
if (!(assertion)) { \
|
|
napi_throw_error( \
|
|
(env), \
|
|
"assertion (" #assertion ") failed: " message); \
|
|
return ret_val; \
|
|
}
|
|
|
|
// Returns NULL on failed assertion.
|
|
// This is meant to be used inside napi_callback methods.
|
|
#define NAPI_ASSERT(env, assertion, message) \
|
|
NAPI_ASSERT_BASE(env, assertion, message, NULL)
|
|
|
|
// Returns empty on failed assertion.
|
|
// This is meant to be used inside functions with void return type.
|
|
#define NAPI_ASSERT_RETURN_VOID(env, assertion, message) \
|
|
NAPI_ASSERT_BASE(env, assertion, message, NAPI_RETVAL_NOTHING)
|
|
|
|
#define NAPI_CALL_BASE(env, the_call, ret_val) \
|
|
if ((the_call) != napi_ok) { \
|
|
GET_AND_THROW_LAST_ERROR((env)); \
|
|
return ret_val; \
|
|
}
|
|
|
|
// Returns NULL if the_call doesn't return napi_ok.
|
|
#define NAPI_CALL(env, the_call) \
|
|
NAPI_CALL_BASE(env, the_call, NULL)
|
|
|
|
// Returns empty if the_call doesn't return napi_ok.
|
|
#define NAPI_CALL_RETURN_VOID(env, the_call) \
|
|
NAPI_CALL_BASE(env, the_call, NAPI_RETVAL_NOTHING)
|
|
|
|
#define DECLARE_NAPI_PROPERTY(name, func) \
|
|
{ (name), 0, (func), 0, 0, 0, napi_default, 0 }
|