fix: use packaged Promise because AV.Promise might be overwrited

Author: leeyeh

src/av.js

@@ -1,6 +1,7 @@
 const _ = require('underscore');
 const userAgent = require('./ua');
 const { inherits, parseDate } = require('./utils');
+const Promise = require('./promise');
 
 const AV = global.AV || {};
 
@@ -63,7 +64,7 @@ AV._installationId = null;
 AV._getInstallationId = () => {
   // See if it's cached in RAM.
   if (AV._installationId) {
-    return AV.Promise.resolve(AV._installationId);
+    return Promise.resolve(AV._installationId);
   }
 
   // Try to get it from localStorage.
@@ -91,7 +92,7 @@ AV._refreshSubscriptionId = (path = AV._getAVPath('subscriptionId')) => {
 AV._getSubscriptionId = () => {
   // See if it's cached in RAM.
   if (AV._subscriptionId) {
-    return AV.Promise.resolve(AV._subscriptionId);
+    return Promise.resolve(AV._subscriptionId);
   }
 
   // Try to get it from localStorage.

src/geopoint.js

@@ -1,4 +1,5 @@
 var _ = require('underscore');
+const Promise = require('./promise');
 
 /*global navigator: false */
 module.exports = function(AV) {
@@ -99,7 +100,7 @@ module.exports = function(AV) {
    * @return {Promise.<AV.GeoPoint>}
    */
   AV.GeoPoint.current = () =>
-    new AV.Promise((resolve, reject) => {
+    new Promise((resolve, reject) => {
       navigator.geolocation.getCurrentPosition(function(location) {
         resolve(
           new AV.GeoPoint({

src/insight.js

@@ -1,6 +1,7 @@
 const _ = require('underscore');
 const AVError = require('./error');
 const { request } = require('./request');
+const Promise = require('./promise');
 
 module.exports = function(AV) {
   /**
@@ -129,11 +130,9 @@ module.exports = function(AV) {
           signKey: false,
         }).then(function(response) {
           if (response.error) {
-            return AV.Promise.reject(
-              new AVError(response.code, response.error)
-            );
+            return Promise.reject(new AVError(response.code, response.error));
           }
-          return AV.Promise.resolve(response);
+          return Promise.resolve(response);
         });
       },
     }

src/object.js

@@ -1,5 +1,6 @@
 const _ = require('underscore');
 const AVError = require('./error');
+const Promise = require('./promise');
 const { _request } = require('./request');
 const {
   isNullOrUndefined,
@@ -144,7 +145,7 @@ module.exports = function(AV) {
    */
 
   AV.Object.fetchAll = (objects, options) =>
-    AV.Promise.resolve()
+    Promise.resolve()
       .then(() =>
         _request(
           'batch',
@@ -978,7 +979,7 @@ module.exports = function(AV) {
        * @param {AuthOptions} options AuthOptions plus:
        * @param {Boolean} options.fetchWhenSave fetch and update object after save succeeded
        * @param {AV.Query} options.query Save object only when it matches the query
-       * @return {AV.Promise} A promise that is fulfilled when the save
+       * @return {Promise} A promise that is fulfilled when the save
        *     completes.
        * @see AVError
        */
@@ -1018,7 +1019,7 @@ module.exports = function(AV) {
         this._startSave();
         this._saving = (this._saving || 0) + 1;
 
-        this._allPreviousSaves = this._allPreviousSaves || AV.Promise.resolve();
+        this._allPreviousSaves = this._allPreviousSaves || Promise.resolve();
         this._allPreviousSaves = this._allPreviousSaves
           .catch(e => {})
           .then(function() {
@@ -1400,7 +1401,7 @@ module.exports = function(AV) {
    */
   AV.Object.destroyAll = function(objects, options = {}) {
     if (!objects || objects.length === 0) {
-      return AV.Promise.resolve();
+      return Promise.resolve();
     }
     const objectsByClassNameAndFlags = _.groupBy(objects, object =>
       JSON.stringify({
@@ -1655,7 +1656,7 @@ module.exports = function(AV) {
     var unsavedFiles = [];
     AV.Object._findUnsavedChildren(object, unsavedChildren, unsavedFiles);
 
-    var promise = AV.Promise.resolve();
+    var promise = Promise.resolve();
     _.each(unsavedFiles, function(file) {
       promise = promise.then(function() {
         return file.save();
@@ -1667,7 +1668,7 @@ module.exports = function(AV) {
 
     return promise
       .then(function() {
-        return AV.Promise._continueWhile(
+        return Promise._continueWhile(
           function() {
             return remaining.length > 0;
           },
@@ -1692,7 +1693,7 @@ module.exports = function(AV) {
 
             // If we can't save any objects, there must be a circular reference.
             if (batch.length === 0) {
-              return AV.Promise.reject(
+              return Promise.reject(
                 new AVError(
                   AVError.OTHER_CAUSE,
                   'Tried to save a batch with a cycle.'
@@ -1701,9 +1702,9 @@ module.exports = function(AV) {
             }
 
             // Reserve a spot in every object's save queue.
-            var readyToStart = AV.Promise.resolve(
+            var readyToStart = Promise.resolve(
               _.map(batch, function(object) {
-                return object._allPreviousSaves || AV.Promise.resolve();
+                return object._allPreviousSaves || Promise.resolve();
               })
             );
 

src/query.js

@@ -1013,7 +1013,7 @@ module.exports = function(AV) {
           var error = new Error(
             'Cannot iterate on a query with sort, skip, or limit.'
           );
-          return AV.Promise.reject(error);
+          return Promise.reject(error);
         }
 
         var query = new AV.Query(this.objectClass);
@@ -1026,13 +1026,13 @@ module.exports = function(AV) {
         query.ascending('objectId');
 
         var finished = false;
-        return AV.Promise._continueWhile(
+        return Promise._continueWhile(
           function() {
             return !finished;
           },
           function() {
             return query.find(options).then(function(results) {
-              var callbacksDone = AV.Promise.resolve();
+              var callbacksDone = Promise.resolve();
               _.each(results, function(result) {
                 callbacksDone = callbacksDone.then(function() {
                   return callback(result);

src/search.js

@@ -226,7 +226,7 @@ module.exports = function(AV) {
        * completes.
        *
        * @see AV.Query#find
-       * @return {AV.Promise} A promise that is resolved with the results when
+       * @return {Promise} A promise that is resolved with the results when
        * the query completes.
        */
       find: function() {

src/status.js

@@ -65,7 +65,7 @@ module.exports = function(AV) {
        */
       destroy: function(options) {
         if (!this.id)
-          return AV.Promise.reject(new Error('The status id is not exists.'));
+          return Promise.reject(new Error('The status id is not exists.'));
         var request = AVRequest('statuses', null, this.id, 'DELETE', options);
         return request;
       },

test/file.js

@@ -112,7 +112,7 @@ describe('File', function() {
           expect(file.size()).to.be(9);
           expect(file.ownerId()).to.be.ok();
           expect(file.id).to.be.ok();
-          return new AV.Promise(function(resolve, reject) {
+          return new Promise(function(resolve, reject) {
             request(file.url()).end(function(err, res) {
               if (err) {
                 return reject(err);

test/query.js

@@ -332,7 +332,7 @@ describe('Queries', function() {
         test.set('number', i);
         promises.unshift(test.save());
       }
-      return AV.Promise.all(promises)
+      return Promise.all(promises)
         .then(function() {
           return new AV.Query('deletedAll').limit(300).destroyAll();
         })