fixup! lib: support returning Safe collections from C++

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
nodejs · Jan 19, 2021 · dd0b7a1 · dd0b7a1
1 parent ad9b5a5
commit dd0b7a1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/node_options.cc b/src/node_options.cc
@@ -1011,6 +1011,12 @@ void GetOptions(const FunctionCallbackInfo<Value>& args) {
   Local<Value> aliases;
   if (!ToV8Value(context, _ppop_instance.aliases_).ToLocal(&aliases)) return;
 
+  if (aliases.As<Object>()
+          ->SetPrototype(context, env->primordials_safe_map_prototype_object())
+          .IsNothing()) {
+    return;
+  }
+
   Local<Object> ret = Object::New(isolate);
   if (ret->Set(context, env->options_string(), options).IsNothing() ||
       ret->Set(context, env->aliases_string(), aliases).IsNothing()) {

diff --git a/test/parallel/test-options-binding.js b/test/parallel/test-options-binding.js
@@ -2,15 +2,20 @@
 'use strict';
 
 require('../common');
-const { internalBinding, primordials } = require('internal/test/binding');
+const { primordials } = require('internal/test/binding');
 const {
   SafeMap,
 } = primordials;
 
-const options = internalBinding('options');
+const { options, aliases } = require('internal/options');
 const assert = require('assert');
 
 assert(
-  options.getOptions() instanceof SafeMap,
-  "internalBinding('options').getOptions() returns SafeMap",
+  options instanceof SafeMap,
+  "require('internal/options').options is a SafeMap",
+);
+
+assert(
+  aliases instanceof SafeMap,
+  "require('internal/options').aliases is a SafeMap",
 );