summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcjihrig <cjihrig@gmail.com>2015-11-23 14:58:18 -0500
committercjihrig <cjihrig@gmail.com>2015-11-24 15:49:50 -0500
commit5169311bf9f3ca0a601f9af2e3e732e250dd984b (patch)
tree2b9c33bb5d70a0824da1175cafddedd0f64d39ca
parent658842280dcbb91576fc0d568c49a9c9e3fb40c2 (diff)
downloadandroid-node-v8-5169311bf9f3ca0a601f9af2e3e732e250dd984b.tar.gz
android-node-v8-5169311bf9f3ca0a601f9af2e3e732e250dd984b.tar.bz2
android-node-v8-5169311bf9f3ca0a601f9af2e3e732e250dd984b.zip
util,src: allow lookup of hidden values
This commit adds an internal util method that makes hidden values in the C++ layer visible in JS. PR-URL: https://github.com/nodejs/node/pull/3988 Reviewed-By: Trevor Norris <trev.norris@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
-rw-r--r--lib/internal/util.js3
-rw-r--r--src/node_util.cc19
-rw-r--r--test/parallel/test-util-internal.js32
3 files changed, 54 insertions, 0 deletions
diff --git a/lib/internal/util.js b/lib/internal/util.js
index c49dbe93da..0604183848 100644
--- a/lib/internal/util.js
+++ b/lib/internal/util.js
@@ -1,7 +1,10 @@
'use strict';
+const binding = process.binding('util');
const prefix = `(${process.release.name}:${process.pid}) `;
+exports.getHiddenValue = binding.getHiddenValue;
+
// All the internal deprecations have to use this function only, as this will
// prepend the prefix to the actual message.
exports.deprecate = function(fn, msg) {
diff --git a/src/node_util.cc b/src/node_util.cc
index 19c3e3240a..a520b8d5f3 100644
--- a/src/node_util.cc
+++ b/src/node_util.cc
@@ -10,6 +10,7 @@ using v8::Context;
using v8::FunctionCallbackInfo;
using v8::Local;
using v8::Object;
+using v8::String;
using v8::Value;
static void IsMapIterator(const FunctionCallbackInfo<Value>& args) {
@@ -28,6 +29,23 @@ static void IsPromise(const FunctionCallbackInfo<Value>& args) {
args.GetReturnValue().Set(args[0]->IsPromise());
}
+
+static void GetHiddenValue(const FunctionCallbackInfo<Value>& args) {
+ Environment* env = Environment::GetCurrent(args);
+
+ if (!args[0]->IsObject())
+ return env->ThrowTypeError("obj must be an object");
+
+ if (!args[1]->IsString())
+ return env->ThrowTypeError("name must be a string");
+
+ Local<Object> obj = args[0].As<Object>();
+ Local<String> name = args[1].As<String>();
+
+ args.GetReturnValue().Set(obj->GetHiddenValue(name));
+}
+
+
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
@@ -35,6 +53,7 @@ void Initialize(Local<Object> target,
env->SetMethod(target, "isMapIterator", IsMapIterator);
env->SetMethod(target, "isSetIterator", IsSetIterator);
env->SetMethod(target, "isPromise", IsPromise);
+ env->SetMethod(target, "getHiddenValue", GetHiddenValue);
}
} // namespace util
diff --git a/test/parallel/test-util-internal.js b/test/parallel/test-util-internal.js
new file mode 100644
index 0000000000..9ab883ec8b
--- /dev/null
+++ b/test/parallel/test-util-internal.js
@@ -0,0 +1,32 @@
+'use strict';
+// Flags: --expose_internals
+
+const common = require('../common');
+const assert = require('assert');
+const internalUtil = require('internal/util');
+
+function getHiddenValue(obj, name) {
+ return function() {
+ internalUtil.getHiddenValue(obj, name);
+ };
+}
+
+assert.throws(getHiddenValue(), /obj must be an object/);
+assert.throws(getHiddenValue(null, 'foo'), /obj must be an object/);
+assert.throws(getHiddenValue(undefined, 'foo'), /obj must be an object/);
+assert.throws(getHiddenValue('bar', 'foo'), /obj must be an object/);
+assert.throws(getHiddenValue(85, 'foo'), /obj must be an object/);
+assert.throws(getHiddenValue({}), /name must be a string/);
+assert.throws(getHiddenValue({}, null), /name must be a string/);
+assert.throws(getHiddenValue({}, []), /name must be a string/);
+assert.deepEqual(internalUtil.getHiddenValue({}, 'foo'), undefined);
+
+let arrowMessage;
+
+try {
+ require('../fixtures/syntax/bad_syntax');
+} catch (err) {
+ arrowMessage = internalUtil.getHiddenValue(err, 'arrowMessage');
+}
+
+assert(/bad_syntax\.js:1/.test(arrowMessage));