Merge pull request #495 from bekzod/align-things

[FEATURE] allow passing promise values to hash/map/hashSettled

lib/rsvp/hash-settled.js

@@ -123,9 +123,12 @@ HashSettled.prototype._setResultAt = setSettledResult;
 */
 
 export default function hashSettled(object, label) {
-  if (object === null || typeof object !== 'object') {
-    return Promise.reject(new TypeError("hashSettled must be called with an object"), label);
-  }
-
-  return new HashSettled(Promise, object, false, label).promise;
+  return Promise.resolve(object, label)
+    .then(function(object) {
+      if (object === null || typeof object !== 'object') {
+        throw new TypeError("hashSettled must be called with an object");
+      }
+
+      return new HashSettled(Promise, object, false, label).promise;
+    });
 }

lib/rsvp/hash.js

@@ -92,9 +92,11 @@ import PromiseHash from './promise-hash';
   have been fulfilled, or rejected if any of them become rejected.
 */
 export default function hash(object, label) {
-  if (object === null || typeof object !== 'object') {
-    return Promise.reject(new TypeError("Promise.hash must be called with an object"), label);
-  }
-
-  return new PromiseHash(Promise, object, label).promise;
+  return Promise.resolve(object, label)
+    .then(function(object) {
+      if (object === null || typeof object !== 'object') {
+        throw new TypeError("Promise.hash must be called with an object");
+      }
+      return new PromiseHash(Promise, object, label).promise;
+    });
 }

lib/rsvp/map.js

@@ -122,13 +122,15 @@ export class MapEnumerator extends Enumerator {
    The promise will be rejected if any of the given `promises` become rejected.
 */
 export default function map(promises, mapFn, label) {
-  if (!Array.isArray(promises)) {
-    return Promise.reject(new TypeError("map must be called with an array"), label);
-  }
-
   if (typeof mapFn !== 'function') {
     return Promise.reject(new TypeError("map expects a function as a second argument"), label);
   }
 
-  return new MapEnumerator(Promise, promises, mapFn, label).promise;
+  return Promise.resolve(promises, label)
+    .then(function(promises) {
+      if (!Array.isArray(promises)) {
+        throw new TypeError("map must be called with an array");
+      }
+      return new MapEnumerator(Promise, promises, mapFn, label).promise;
+    });
 }

test/extension-test.js

@@ -757,6 +757,14 @@ describe("RSVP extensions", function() {
       });
     });
 
+    it('works with promise hash', function(done) {
+      RSVP.hash(Promise.resolve({}))
+        .then(function(results) {
+          assert.deepEqual(results, {}, 'expected fulfillment');
+          done();
+        }).catch(done);
+    });
+
     it('works with null', function(done) {
       RSVP.hash({foo: null}).then(function(results) {
         assert.deepEqual(results.foo, null);
@@ -831,6 +839,14 @@ describe("RSVP extensions", function() {
       assert(RSVP.hashSettled);
     });
 
+    it('works with promise hash', function(done) {
+      RSVP.hashSettled(Promise.resolve({}))
+        .then(function(results) {
+          assert.deepEqual(results, {}, 'expected fulfillment');
+          done();
+        }).catch(done);
+    });
+
     it('fulfilled only after all of the promise values are fulfilled', function(done) {
       var firstResolved, secondResolved, firstResolver, secondResolver;
 
@@ -2836,6 +2852,15 @@ describe("RSVP extensions", function() {
       });
     });
 
+    it("works promise array", function(done){
+      var values = RSVP.resolve([ 1, RSVP.resolve(2) ]);
+
+      RSVP.map(values, mapFn).then(function(results){
+        assert.deepEqual([2, 3], results);
+        done();
+      }).catch(done);
+    });
+
     it("becomes rejected with the first promise that becomes rejected", function(done){
 
       var promises = [