From 44daa9836b5bb4cfb8434b35bb1a12fc324223aa Mon Sep 17 00:00:00 2001 From: isaacs Date: Mon, 27 Feb 2012 17:19:12 -0800 Subject: [PATCH] Wrap NodeScript binding class in JavaScript layer This makes it easy to prevent errors where Script methods are called on non-script objects, resulting in Assertion failures. --- lib/vm.js | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/lib/vm.js b/lib/vm.js index d3348afac50..75049e51851 100644 --- a/lib/vm.js +++ b/lib/vm.js @@ -21,12 +21,34 @@ var binding = process.binding('evals'); -exports.Script = binding.NodeScript; -exports.createScript = function(code, ctx, name) { - return new exports.Script(code, ctx, name); +module.exports = Script; +Script.Script = Script; + +function Script(code, ctx, filename) { + if (!(this instanceof Script)) { + return new Script(code, ctx, filename); + } + + var ns = new binding.NodeScript(code, ctx, filename); + + // bind all methods to this Script object + Object.keys(binding.NodeScript.prototype).forEach(function(f) { + if (typeof binding.NodeScript.prototype[f] === 'function') { + this[f] = function() { + if (!(this instanceof Script)) { + throw new TypeError('invalid call to '+f); + } + return ns[f].apply(ns, arguments); + }; + } + }, this); }; -exports.createContext = binding.NodeScript.createContext; -exports.runInContext = binding.NodeScript.runInContext; -exports.runInThisContext = binding.NodeScript.runInThisContext; -exports.runInNewContext = binding.NodeScript.runInNewContext; +Script.createScript = function(code, ctx, name) { + return new Script(code, ctx, name); +}; + +Script.createContext = binding.NodeScript.createContext; +Script.runInContext = binding.NodeScript.runInContext; +Script.runInThisContext = binding.NodeScript.runInThisContext; +Script.runInNewContext = binding.NodeScript.runInNewContext;