Permalink
Browse files

fixed process.mixin to properly copy getters/setters

  • Loading branch information...
1 parent bcc032e commit 3bb7ad6fea42545e9d84ba5cbef8b48e470790fc @rsms rsms committed with ry Feb 18, 2010
Showing with 41 additions and 21 deletions.
  1. +25 −20 src/node.js
  2. +16 −1 test/mjsunit/test-process-mixin.js
View
@@ -105,9 +105,10 @@ process.assert = function (x, msg) {
// Copyright (c) 2009 John Resig
// Dual licensed under the MIT and GPL licenses.
// http://docs.jquery.com/License
+// Modified for node.js (formely for copying properties correctly)
process.mixin = function() {
// copy reference to target object
- var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options;
+ var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, source;
// Handle a deep copy situation
if ( typeof target === "boolean" ) {
@@ -129,27 +130,31 @@ process.mixin = function() {
for ( ; i < length; i++ ) {
// Only deal with non-null/undefined values
- if ( (options = arguments[ i ]) != null ) {
+ if ( (source = arguments[i]) != null ) {
// Extend the base object
- for ( var name in options ) {
- var src = target[ name ], copy = options[ name ];
-
- // Prevent never-ending loop
- if ( target === copy )
- continue;
-
- // Recurse if we're merging object values
- if ( deep && copy && typeof copy === "object" ) {
- target[ name ] = process.mixin( deep,
- // Never move original objects, clone them
- src || ( copy.length != null ? [ ] : { } )
- , copy );
-
- // Don't bring in undefined values
- } else {
- target[ name ] = copy;
+ Object.getOwnPropertyNames(source).forEach(function(k){
+ var d = Object.getOwnPropertyDescriptor(source, k);
+ if (d.get) {
+ target.__defineGetter__(k, d.get);
+ if (d.set)
+ target.__defineSetter__(k, d.set);
}
- }
+ else {
+ // Prevent never-ending loop
+ if (target === d.value)
+ continue;
+
+ if (deep && d.value && typeof d.value === "object") {
+ target[k] = process.mixin(deep,
+ // Never move original objects, clone them
+ source || (d.value.length != null ? [] : {})
+ , d.value);
+ }
+ else {
+ target[k] = d.value;
+ }
+ }
+ });
}
}
// Return the modified object
@@ -19,4 +19,19 @@ var objectWithUndefinedValue = {foo: undefined};
target = {};
process.mixin(target, objectWithUndefinedValue);
-assert.ok(target.hasOwnProperty('foo'));
+assert.ok(target.hasOwnProperty('foo'));
+
+// This test verifies getters and setters being copied correctly
+
+var source = {
+ _foo:'a',
+ get foo(){ return this._foo; },
+ set foo(value){ this._foo = "did set to "+value; }
+};
+var target = {};
+process.mixin(target, source);
+target._foo = 'b';
+assert.equal(source.foo, 'a');
+assert.equal('b', target.foo, 'target.foo != "b" -- value/result was copied instead of getter function');
+source.foo = 'c';
+assert.equal('did set to c', source.foo, 'source.foo != "c" -- value was set instead of calling setter function');

0 comments on commit 3bb7ad6

Please sign in to comment.