Skip to content

Commit 4d2dc48

Browse files
committed
node-api: add node_api_symbol_for()
Fixes: #41294 Signed-off-by: Darshan Sen <[email protected]>
1 parent 587b167 commit 4d2dc48

File tree

7 files changed

+105
-6
lines changed

7 files changed

+105
-6
lines changed

doc/api/n-api.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2492,6 +2492,35 @@ This API creates a JavaScript `symbol` value from a UTF8-encoded C string.
24922492
The JavaScript `symbol` type is described in [Section 19.4][]
24932493
of the ECMAScript Language Specification.
24942494
2495+
#### `node_api_symbol_for`
2496+
2497+
<!-- YAML
2498+
added: REPLACEME
2499+
napiVersion: REPLACEME
2500+
-->
2501+
2502+
> Stability: 1 - Experimental
2503+
2504+
```c
2505+
napi_status node_api_symbol_for(napi_env env,
2506+
const char* description,
2507+
napi_value* result)
2508+
```
2509+
2510+
* `[in] env`: The environment that the API is invoked under.
2511+
* `[in] description`: C string representing the text to be used as the
2512+
description for the symbol.
2513+
* `[out] result`: A `napi_value` representing a JavaScript `symbol`.
2514+
2515+
Returns `napi_ok` if the API succeeded.
2516+
2517+
This API searches in the global registry for an existing symbol with the given
2518+
description. If the symbol already exists it will be returned, otherwise a new
2519+
symbol will be created in the registry.
2520+
2521+
The JavaScript `symbol` type is described in [Section 19.4][] of the ECMAScript
2522+
Language Specification.
2523+
24952524
#### `napi_create_typedarray`
24962525
24972526
<!-- YAML

src/js_native_api.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,11 @@ NAPI_EXTERN napi_status napi_create_string_utf16(napi_env env,
9393
NAPI_EXTERN napi_status napi_create_symbol(napi_env env,
9494
napi_value description,
9595
napi_value* result);
96+
#ifdef NAPI_EXPERIMENTAL
97+
NAPI_EXTERN napi_status node_api_symbol_for(napi_env env,
98+
const char* description,
99+
napi_value* result);
100+
#endif // NAPI_EXPERIMENTAL
96101
NAPI_EXTERN napi_status napi_create_function(napi_env env,
97102
const char* utf8name,
98103
size_t length,

src/js_native_api_v8.cc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1662,6 +1662,21 @@ napi_status napi_create_symbol(napi_env env,
16621662
return napi_clear_last_error(env);
16631663
}
16641664

1665+
napi_status node_api_symbol_for(napi_env env,
1666+
const char* description,
1667+
napi_value* result) {
1668+
CHECK_ENV(env);
1669+
CHECK_ARG(env, result);
1670+
1671+
v8::Local<v8::String> description_string;
1672+
CHECK_NEW_FROM_UTF8(env, description_string, description);
1673+
1674+
*result = v8impl::JsValueFromV8LocalValue(
1675+
v8::Symbol::For(env->isolate, description_string));
1676+
1677+
return napi_clear_last_error(env);
1678+
}
1679+
16651680
static inline napi_status set_error_code(napi_env env,
16661681
v8::Local<v8::Value> error,
16671682
napi_value code,

test/js-native-api/test_properties/test.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@ assert.ok(!propertyNames.includes('readwriteAccessor2'));
3535
assert.ok(!propertyNames.includes('readonlyAccessor1'));
3636
assert.ok(!propertyNames.includes('readonlyAccessor2'));
3737

38-
// Validate property created with symbol
39-
const start = 'Symbol('.length;
40-
const end = start + 'NameKeySymbol'.length;
41-
const symbolDescription =
42-
String(Object.getOwnPropertySymbols(test_object)[0]).slice(start, end);
43-
assert.strictEqual(symbolDescription, 'NameKeySymbol');
38+
// Validate properties created with symbol
39+
const propertySymbols = Object.getOwnPropertySymbols(test_object);
40+
assert.strictEqual(propertySymbols[0].toString(), 'Symbol(NameKeySymbol)');
41+
assert.strictEqual(propertySymbols[1].toString(), 'Symbol()');
42+
assert.strictEqual(propertySymbols[2], Symbol.for('NameKeySymbolFor'));
4443

4544
// The napi_writable attribute should be ignored for accessors.
4645
const readwriteAccessor1Descriptor =

test/js-native-api/test_properties/test_properties.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#define NAPI_EXPERIMENTAL
12
#include <js_native_api.h>
23
#include "../common.h"
34

@@ -77,13 +78,23 @@ napi_value Init(napi_env env, napi_value exports) {
7778
NODE_API_CALL(env,
7879
napi_create_symbol(env, symbol_description, &name_symbol));
7980

81+
napi_value name_symbol_descriptionless;
82+
NODE_API_CALL(env,
83+
napi_create_symbol(env, NULL, &name_symbol_descriptionless));
84+
85+
napi_value name_symbol_for;
86+
NODE_API_CALL(env,
87+
node_api_symbol_for(env, "NameKeySymbolFor", &name_symbol_for));
88+
8089
napi_property_descriptor properties[] = {
8190
{ "echo", 0, Echo, 0, 0, 0, napi_enumerable, 0 },
8291
{ "readwriteValue", 0, 0, 0, 0, number, napi_enumerable | napi_writable, 0 },
8392
{ "readonlyValue", 0, 0, 0, 0, number, napi_enumerable, 0},
8493
{ "hiddenValue", 0, 0, 0, 0, number, napi_default, 0},
8594
{ NULL, name_value, 0, 0, 0, number, napi_enumerable, 0},
8695
{ NULL, name_symbol, 0, 0, 0, number, napi_enumerable, 0},
96+
{ NULL, name_symbol_descriptionless, 0, 0, 0, number, napi_enumerable, 0},
97+
{ NULL, name_symbol_for, 0, 0, 0, number, napi_enumerable, 0},
8798
{ "readwriteAccessor1", 0, 0, GetValue, SetValue, 0, napi_default, 0},
8899
{ "readwriteAccessor2", 0, 0, GetValue, SetValue, 0, napi_writable, 0},
89100
{ "readonlyAccessor1", 0, 0, GetValue, NULL, 0, napi_default, 0},

test/js-native-api/test_reference/test.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,17 @@ async function runTests() {
2121
})();
2222
test_reference.deleteReference();
2323

24+
(() => {
25+
const symbol = test_reference.createSymbolFor('testSymFor');
26+
test_reference.createReference(symbol, 0);
27+
assert.strictEqual(test_reference.referenceValue, symbol);
28+
assert.strictEqual(test_reference.referenceValue, Symbol.for('testSymFor'));
29+
})();
30+
test_reference.deleteReference();
31+
32+
assert.throws(() => test_reference.createSymbolForDescriptionless(),
33+
/Invalid argument/);
34+
2435
(() => {
2536
const value = test_reference.createExternal();
2637
assert.strictEqual(test_reference.finalizeCount, 0);

test/js-native-api/test_reference/test_reference.c

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#define NAPI_EXPERIMENTAL
12
#include <stdlib.h>
23
#include <assert.h>
34
#include <js_native_api.h>
@@ -49,6 +50,32 @@ static napi_value CreateSymbol(napi_env env, napi_callback_info info) {
4950
return result_symbol;
5051
}
5152

53+
static napi_value CreateSymbolFor(napi_env env, napi_callback_info info) {
54+
55+
size_t argc = 1;
56+
napi_value args[1];
57+
58+
char description[256];
59+
size_t description_length;
60+
61+
NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL,NULL));
62+
NODE_API_ASSERT(env, argc == 1, "Expect one argument only (symbol description)");
63+
64+
NODE_API_CALL(env, napi_get_value_string_utf8(env, args[0], description, sizeof(description), &description_length));
65+
NODE_API_ASSERT(env, description_length <= 255, "Cannot accommodate descriptions longer than 255 bytes");
66+
67+
napi_value result_symbol;
68+
69+
NODE_API_CALL(env, node_api_symbol_for(env, description, &result_symbol));
70+
return result_symbol;
71+
}
72+
73+
static napi_value CreateSymbolForDescriptionless(napi_env env, napi_callback_info info) {
74+
napi_value result_symbol;
75+
NODE_API_CALL(env, node_api_symbol_for(env, NULL, &result_symbol));
76+
return result_symbol;
77+
}
78+
5279
static napi_value
5380
CreateExternalWithFinalize(napi_env env, napi_callback_info info) {
5481
napi_value result;
@@ -190,6 +217,8 @@ napi_value Init(napi_env env, napi_value exports) {
190217
DECLARE_NODE_API_PROPERTY("checkExternal", CheckExternal),
191218
DECLARE_NODE_API_PROPERTY("createReference", CreateReference),
192219
DECLARE_NODE_API_PROPERTY("createSymbol", CreateSymbol),
220+
DECLARE_NODE_API_PROPERTY("createSymbolFor", CreateSymbolFor),
221+
DECLARE_NODE_API_PROPERTY("createSymbolForDescriptionless", CreateSymbolForDescriptionless),
193222
DECLARE_NODE_API_PROPERTY("deleteReference", DeleteReference),
194223
DECLARE_NODE_API_PROPERTY("incrementRefcount", IncrementRefcount),
195224
DECLARE_NODE_API_PROPERTY("decrementRefcount", DecrementRefcount),

0 commit comments

Comments
 (0)