add support native constructors to Reflect.construct with 2 arguments, …

…#83
zloirock · Jun 21, 2015 · af092c9 · af092c9
1 parent 0738020
commit af092c9
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 10 deletions.
diff --git a/library/modules/es5.js b/library/modules/es5.js
@@ -170,7 +170,7 @@ $def($def.P, 'Function', {
  function bound(/* args... */){
  var args = partArgs.concat(_slice.call(arguments))
  , constr = this instanceof bound
- , ctx = constr ? $.create(fn.prototype) : that
+ , ctx = constr ? $.create(isObject(fn.prototype) ? fn.prototype : ObjectProto) : that
  , result = invoke(fn, args, ctx);
  return constr ? ctx : result;
  }

diff --git a/library/modules/es6.reflect.construct.js b/library/modules/es6.reflect.construct.js
@@ -3,13 +3,15 @@ var $ = require('./$')
  , $def = require('./$.def')
  , assertFunction = require('./$.assert').fn
  , isObject = $.isObject
- , _apply = Function.apply;
+ , apply = Function.apply
+ , bind = Function.bind;
 
 $def($def.S, 'Reflect', {
  construct: function construct(target, argumentsList /*, newTarget*/){
- var proto = assertFunction(arguments.length < 3 ? target : arguments[2]).prototype
+ if(arguments.length < 3)return new (bind.apply(target, [null].concat(argumentsList)))();
+ var proto = assertFunction(arguments[2]).prototype
  , instance = $.create(isObject(proto) ? proto : Object.prototype)
- , result = _apply.call(target, instance, argumentsList);
+ , result = apply.call(target, instance, argumentsList);
  return isObject(result) ? result : instance;
  }
 });
diff --git a/modules/es5.js b/modules/es5.js
@@ -170,7 +170,7 @@ $def($def.P, 'Function', {
  function bound(/* args... */){
  var args = partArgs.concat(_slice.call(arguments))
  , constr = this instanceof bound
- , ctx = constr ? $.create(fn.prototype) : that
+ , ctx = constr ? $.create(isObject(fn.prototype) ? fn.prototype : ObjectProto) : that
  , result = invoke(fn, args, ctx);
  return constr ? ctx : result;
  }

diff --git a/modules/es6.reflect.construct.js b/modules/es6.reflect.construct.js
@@ -3,13 +3,15 @@ var $ = require('./$')
  , $def = require('./$.def')
  , assertFunction = require('./$.assert').fn
  , isObject = $.isObject
- , _apply = Function.apply;
+ , apply = Function.apply
+ , bind = Function.bind;
 
 $def($def.S, 'Reflect', {
  construct: function construct(target, argumentsList /*, newTarget*/){
- var proto = assertFunction(arguments.length < 3 ? target : arguments[2]).prototype
+ if(arguments.length < 3)return new (bind.apply(target, [null].concat(argumentsList)))();
+ var proto = assertFunction(arguments[2]).prototype
  , instance = $.create(isObject(proto) ? proto : Object.prototype)
- , result = _apply.call(target, instance, argumentsList);
+ , result = apply.call(target, instance, argumentsList);
  return isObject(result) ? result : instance;
  }
 });
diff --git a/tests/tests-library.js b/tests/tests-library.js
diff --git a/tests/tests-library/es6.reflect.construct.ls b/tests/tests-library/es6.reflect.construct.ls
@@ -20,4 +20,5 @@ test '*' !->
  f = (->)
  f:: = 42
  ok try getPrototypeOf(construct f, []) is Object::
- catch => no
+ catch => no
+ eq construct(Set, [[1, 2, 3, 2, 1]]).size, 3, 'works with native constructors'
diff --git a/tests/tests.js b/tests/tests.js
diff --git a/tests/tests/es6.reflect.construct.ls b/tests/tests/es6.reflect.construct.ls
@@ -21,4 +21,5 @@ test '*' !->
  f = (->)
  f:: = 42
  ok try getPrototypeOf(construct f, []) is Object::
- catch => no
+ catch => no
+ eq construct(Set, [[1, 2, 3, 2, 1]]).size, 3, 'works with native constructors'