From 9d3dc30b7488563db1bff0ef8d3263de70a0a8b3 Mon Sep 17 00:00:00 2001
From: Darshan Sen <darshan.sen@postman.com>
Date: Sun, 26 Dec 2021 17:30:56 +0530
Subject: [PATCH] src: add napi_create_symbol_for()

Fixes: https://github.com/nodejs/node/issues/41294

Signed-off-by: Darshan Sen <darshan.sen@postman.com>
---
 doc/api/n-api.md                              | 27 +++++++++++++++++++
 src/js_native_api.h                           |  3 +++
 src/js_native_api_v8.cc                       | 22 +++++++++++++++
 test/js-native-api/test_properties/test.js    | 14 +++++-----
 .../test_properties/test_properties.c         | 19 +++++++++++++
 test/js-native-api/test_reference/test.js     |  7 +++++
 .../test_reference/test_reference.c           | 15 +++++++++++
 7 files changed, 101 insertions(+), 6 deletions(-)

diff --git a/doc/api/n-api.md b/doc/api/n-api.md
index c146a6d661dddb..7ff884d93c8998 100644
--- a/doc/api/n-api.md
+++ b/doc/api/n-api.md
@@ -2492,6 +2492,33 @@ This API creates a JavaScript `symbol` value from a UTF8-encoded C string.
 The JavaScript `symbol` type is described in [Section 19.4][]
 of the ECMAScript Language Specification.
 
+#### `napi_create_symbol_for`
+
+<!-- YAML
+added: REPLACEME
+napiVersion: REPLACEME
+-->
+
+```c
+napi_status napi_create_symbol_for(napi_env env,
+                                   napi_value description,
+                                   napi_value* result)
+```
+
+* `[in] env`: The environment that the API is invoked under.
+* `[in] description`: Optional `napi_value` which refers to a JavaScript
+  `string` to be set as the description for the symbol.
+* `[out] result`: A `napi_value` representing a JavaScript `symbol`.
+
+Returns `napi_ok` if the API succeeded.
+
+This API searches in the global registry for an existing symbol with the given
+description. If the symbol already exists it will be returned, otherwise a new
+symbol will be created in the registry.
+
+The JavaScript `symbol` type is described in [Section 19.4][]
+of the ECMAScript Language Specification.
+
 #### `napi_create_typedarray`
 
 <!-- YAML
diff --git a/src/js_native_api.h b/src/js_native_api.h
index d72e7f4e997270..e5e9188b2d19e9 100644
--- a/src/js_native_api.h
+++ b/src/js_native_api.h
@@ -93,6 +93,9 @@ NAPI_EXTERN napi_status napi_create_string_utf16(napi_env env,
 NAPI_EXTERN napi_status napi_create_symbol(napi_env env,
                                            napi_value description,
                                            napi_value* result);
+NAPI_EXTERN napi_status napi_create_symbol_for(napi_env env,
+                                               napi_value description,
+                                               napi_value* result);
 NAPI_EXTERN napi_status napi_create_function(napi_env env,
                                              const char* utf8name,
                                              size_t length,
diff --git a/src/js_native_api_v8.cc b/src/js_native_api_v8.cc
index 72f911cab6c203..d2863f73763524 100644
--- a/src/js_native_api_v8.cc
+++ b/src/js_native_api_v8.cc
@@ -1662,6 +1662,28 @@ napi_status napi_create_symbol(napi_env env,
   return napi_clear_last_error(env);
 }
 
+napi_status napi_create_symbol_for(napi_env env,
+                                   napi_value description,
+                                   napi_value* result) {
+  CHECK_ENV(env);
+  CHECK_ARG(env, result);
+
+  v8::Isolate* isolate = env->isolate;
+
+  v8::Local<v8::Value> desc;
+  if (description == nullptr) {
+    CHECK_NEW_FROM_UTF8(env, desc, "undefined");
+  } else {
+    desc = v8impl::V8LocalValueFromJsValue(description);
+    RETURN_STATUS_IF_FALSE(env, desc->IsString(), napi_string_expected);
+  }
+
+  *result = v8impl::JsValueFromV8LocalValue(
+    v8::Symbol::For(isolate, desc.As<v8::String>()));
+
+  return napi_clear_last_error(env);
+}
+
 static inline napi_status set_error_code(napi_env env,
                                          v8::Local<v8::Value> error,
                                          napi_value code,
diff --git a/test/js-native-api/test_properties/test.js b/test/js-native-api/test_properties/test.js
index 704002dfc74f3a..e7c09803795432 100644
--- a/test/js-native-api/test_properties/test.js
+++ b/test/js-native-api/test_properties/test.js
@@ -35,12 +35,14 @@ assert.ok(!propertyNames.includes('readwriteAccessor2'));
 assert.ok(!propertyNames.includes('readonlyAccessor1'));
 assert.ok(!propertyNames.includes('readonlyAccessor2'));
 
-// Validate property created with symbol
-const start = 'Symbol('.length;
-const end = start + 'NameKeySymbol'.length;
-const symbolDescription =
-    String(Object.getOwnPropertySymbols(test_object)[0]).slice(start, end);
-assert.strictEqual(symbolDescription, 'NameKeySymbol');
+// Validate properties created with symbol
+const propertySymbols = Object.getOwnPropertySymbols(test_object);
+assert.strictEqual(String(propertySymbols[0]), 'Symbol(NameKeySymbol)');
+assert.strictEqual(String(propertySymbols[1]), 'Symbol()');
+assert.strictEqual(propertySymbols[2], Symbol.for('NameKeySymbolFor'));
+assert.strictEqual(propertySymbols[3], Symbol.for());
+assert.strictEqual(propertySymbols[3], Symbol.for(undefined));
+assert.strictEqual(propertySymbols[3], Symbol.for('undefined'));
 
 // The napi_writable attribute should be ignored for accessors.
 const readwriteAccessor1Descriptor =
diff --git a/test/js-native-api/test_properties/test_properties.c b/test/js-native-api/test_properties/test_properties.c
index c778601aa7489b..55dc7c7dddb106 100644
--- a/test/js-native-api/test_properties/test_properties.c
+++ b/test/js-native-api/test_properties/test_properties.c
@@ -77,6 +77,22 @@ napi_value Init(napi_env env, napi_value exports) {
   NODE_API_CALL(env,
       napi_create_symbol(env, symbol_description, &name_symbol));
 
+  napi_value name_symbol_undefined;
+  NODE_API_CALL(env,
+      napi_create_symbol(env, NULL, &name_symbol_undefined));
+
+  napi_value symbol_for_description;
+  napi_value name_symbol_for;
+  NODE_API_CALL(env,
+      napi_create_string_utf8(
+          env, "NameKeySymbolFor", NAPI_AUTO_LENGTH, &symbol_for_description));
+  NODE_API_CALL(env,
+      napi_create_symbol_for(env, symbol_for_description, &name_symbol_for));
+
+  napi_value name_symbol_for_undefined;
+  NODE_API_CALL(env,
+      napi_create_symbol_for(env, NULL, &name_symbol_for_undefined));
+
   napi_property_descriptor properties[] = {
     { "echo", 0, Echo, 0, 0, 0, napi_enumerable, 0 },
     { "readwriteValue", 0, 0, 0, 0, number, napi_enumerable | napi_writable, 0 },
@@ -84,6 +100,9 @@ napi_value Init(napi_env env, napi_value exports) {
     { "hiddenValue", 0, 0, 0, 0, number, napi_default, 0},
     { NULL, name_value, 0, 0, 0, number, napi_enumerable, 0},
     { NULL, name_symbol, 0, 0, 0, number, napi_enumerable, 0},
+    { NULL, name_symbol_undefined, 0, 0, 0, number, napi_enumerable, 0},
+    { NULL, name_symbol_for, 0, 0, 0, number, napi_enumerable, 0},
+    { NULL, name_symbol_for_undefined, 0, 0, 0, number, napi_enumerable, 0},
     { "readwriteAccessor1", 0, 0, GetValue, SetValue, 0, napi_default, 0},
     { "readwriteAccessor2", 0, 0, GetValue, SetValue, 0, napi_writable, 0},
     { "readonlyAccessor1", 0, 0, GetValue, NULL, 0, napi_default, 0},
diff --git a/test/js-native-api/test_reference/test.js b/test/js-native-api/test_reference/test.js
index 0dc9e553300060..3a5453562e357b 100644
--- a/test/js-native-api/test_reference/test.js
+++ b/test/js-native-api/test_reference/test.js
@@ -21,6 +21,13 @@ async function runTests() {
   })();
   test_reference.deleteReference();
 
+  (() => {
+    const symbol = test_reference.createSymbolFor('testSymFor');
+    test_reference.createReference(Symbol.for('testSymFor'), 0);
+    assert.strictEqual(test_reference.referenceValue, symbol);
+  })();
+  test_reference.deleteReference();
+
   (() => {
     const value = test_reference.createExternal();
     assert.strictEqual(test_reference.finalizeCount, 0);
diff --git a/test/js-native-api/test_reference/test_reference.c b/test/js-native-api/test_reference/test_reference.c
index 7b770cb8766775..820de163cce32d 100644
--- a/test/js-native-api/test_reference/test_reference.c
+++ b/test/js-native-api/test_reference/test_reference.c
@@ -49,6 +49,20 @@ static napi_value CreateSymbol(napi_env env, napi_callback_info info) {
     return result_symbol;
 }
 
+static napi_value CreateSymbolFor(napi_env env, napi_callback_info info) {
+    
+    size_t argc = 1;
+    napi_value args[1];
+    
+    NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL,NULL));
+    NODE_API_ASSERT(env, argc == 1, "Expect one argument only (symbol description)");
+    
+    napi_value result_symbol;
+    
+    NODE_API_CALL(env, napi_create_symbol_for(env, args[0], &result_symbol));
+    return result_symbol;
+}
+
 static napi_value
 CreateExternalWithFinalize(napi_env env, napi_callback_info info) {
   napi_value result;
@@ -190,6 +204,7 @@ napi_value Init(napi_env env, napi_value exports) {
     DECLARE_NODE_API_PROPERTY("checkExternal", CheckExternal),
     DECLARE_NODE_API_PROPERTY("createReference", CreateReference),
     DECLARE_NODE_API_PROPERTY("createSymbol", CreateSymbol),
+    DECLARE_NODE_API_PROPERTY("createSymbolFor", CreateSymbolFor),
     DECLARE_NODE_API_PROPERTY("deleteReference", DeleteReference),
     DECLARE_NODE_API_PROPERTY("incrementRefcount", IncrementRefcount),
     DECLARE_NODE_API_PROPERTY("decrementRefcount", DecrementRefcount),