Merge remote-tracking branch 'upstream/master'

Author: mtrezza

CHANGELOG.md

@@ -1,7 +1,29 @@
 # Parse-SDK-JS
 
 ### master
-[Full Changelog](https://github.com/parse-community/Parse-SDK-JS/compare/2.13.0...master)
+[Full Changelog](https://github.com/parse-community/Parse-SDK-JS/compare/2.15.0...master)
+
+## 2.15.0
+[Full Changelog](https://github.com/parse-community/Parse-SDK-JS/compare/2.14.0...2.15.0)
+
+**Features**
+- New Parse.Error 159 DUPLICATE_REQUEST ([#1189](https://github.com/parse-community/Parse-SDK-JS/pull/1189))
+
+**Fixes**
+- Live Query Subscription Error Event ([#1193](https://github.com/parse-community/Parse-SDK-JS/pull/1193))
+
+## 2.14.0
+[Full Changelog](https://github.com/parse-community/Parse-SDK-JS/compare/2.13.0...2.14.0)
+
+**New Features**
+- Passing context in destroy, saveAll, get, find hooks. ([#1159](https://github.com/parse-community/Parse-SDK-JS/pull/1159))
+- Support using aggregate on top of constructed query ([#1170](https://github.com/parse-community/Parse-SDK-JS/pull/1170))
+
+**Improvements**
+- Performance improvement for Query.eachBatch ([#1179](https://github.com/parse-community/Parse-SDK-JS/pull/1179))
+
+**Fixes**
+- Fix context for cascade saving ([#1186](https://github.com/parse-community/Parse-SDK-JS/pull/1186))
 
 ## 2.13.0
 [Full Changelog](https://github.com/parse-community/Parse-SDK-JS/compare/2.12.0...2.13.0)

integration/test/ParseQueryAggregateTest.js

@@ -96,6 +96,25 @@ describe('Parse Aggregate Query', () => {
     expect(results[0].tempPointer.value).toEqual(2);
   });
 
+  it('aggregate pipeline on top of a simple query', async done => {
+    const pipeline = {
+      group: { objectId: '$name' },
+    };
+    let results = await new Parse.Query(TestObject)
+      .equalTo('name', 'foo')
+      .aggregate(pipeline);
+
+    expect(results.length).toBe(1);
+
+    results = await new Parse.Query(TestObject)
+      .equalTo('score', 20)
+      .aggregate(pipeline);
+
+    expect(results.length).toBe(1);
+
+    done();
+  });
+
   it('distinct query', () => {
     const query = new Parse.Query(TestObject);
     return query.distinct('score').then((results) => {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "parse",
-  "version": "2.13.0",
+  "version": "2.15.0",
   "description": "The Parse JavaScript SDK",
   "homepage": "https://parseplatform.org/",
   "keywords": [
@@ -29,12 +29,12 @@
     "react-native": false
   },
   "dependencies": {
-    "@babel/runtime": "7.10.2",
-    "@babel/runtime-corejs3": "7.10.2",
+    "@babel/runtime-corejs3": "7.10.4",
+    "@babel/runtime": "7.10.4",
     "crypto-js": "4.0.0",
     "react-native-crypto-js": "1.0.0",
-    "uuid": "3.3.3",
-    "ws": "7.3.0",
+    "uuid": "3.4.0",
+    "ws": "7.3.1",
     "xmlhttprequest": "1.8.0"
   },
   "devDependencies": {
@@ -52,7 +52,7 @@
     "babel-plugin-minify-dead-code-elimination": "0.5.1",
     "babel-plugin-transform-inline-environment-variables": "0.4.3",
     "browserify": "16.5.1",
-    "codecov": "3.7.0",
+    "codecov": "3.7.1",
     "core-js": "3.6.5",
     "cross-env": "7.0.2",
     "eslint": "6.8.0",

package.json

@@ -57,6 +57,9 @@ export function run(
   if (options.sessionToken) {
     requestOptions.sessionToken = options.sessionToken;
   }
+  if (options.context && typeof options.context === 'object') {
+    requestOptions.context = options.context;
+  }
 
   return CoreManager.getCloudController().run(name, data, requestOptions);
 }

src/Cloud.js

@@ -381,7 +381,7 @@ class LiveQueryClient extends EventEmitter {
       if (data.requestId) {
         if (subscription) {
           subscription.subscribePromise.resolve();
-          subscription.emit(SUBSCRIPTION_EMMITER_TYPES.ERROR, data.error);
+          setTimeout(() => subscription.emit(SUBSCRIPTION_EMMITER_TYPES.ERROR, data.error), 200);
         }
       } else {
         this.emit(CLIENT_EMMITER_TYPES.ERROR, data.error);

src/LiveQueryClient.js

@@ -353,6 +353,15 @@ ParseError.FILE_DELETE_ERROR = 153;
  */
 ParseError.REQUEST_LIMIT_EXCEEDED = 155;
 
+/**
+ * Error code indicating that the request was a duplicate and has been discarded due to
+ * idempotency rules.
+ * @property DUPLICATE_REQUEST
+ * @static
+ * @final
+ */
+ParseError.DUPLICATE_REQUEST = 159;
+
 /**
  * Error code indicating an invalid event name.
  * @property INVALID_EVENT_NAME

src/ParseError.js

@@ -1084,6 +1084,7 @@ class ParseObject {
    *       behalf of a specific user.
    *   <li>include: The name(s) of the key(s) to include. Can be a string, an array of strings,
    *       or an array of array of strings.
+   *   <li>context: A dictionary that is accessible in Cloud Code `beforeFind` trigger.
    * </ul>
    * @return {Promise} A promise that is fulfilled when the fetch
    *     completes.
@@ -1097,6 +1098,9 @@ class ParseObject {
     if (options.hasOwnProperty('sessionToken')) {
       fetchOptions.sessionToken = options.sessionToken;
     }
+    if (options.hasOwnProperty('context') && typeof options.context === 'object') {
+      fetchOptions.context = options.context;
+    }
     if (options.hasOwnProperty('include')) {
       fetchOptions.include = [];
       if (Array.isArray(options.include)) {
@@ -1273,6 +1277,7 @@ class ParseObject {
    *     be used for this request.
    *   <li>sessionToken: A valid session token, used for making a request on
    *       behalf of a specific user.
+   *   <li>context: A dictionary that is accessible in Cloud Code `beforeDelete` and `afterDelete` triggers.
    * </ul>
    * @return {Promise} A promise that is fulfilled when the destroy
    *     completes.
@@ -1286,6 +1291,9 @@ class ParseObject {
     if (options.hasOwnProperty('sessionToken')) {
       destroyOptions.sessionToken = options.sessionToken;
     }
+    if (options.hasOwnProperty('context') && typeof options.context === 'object') {
+      destroyOptions.context = options.context;
+    }
     if (!this.id) {
       return Promise.resolve();
     }
@@ -1631,6 +1639,7 @@ class ParseObject {
    *   <li>sessionToken: A valid session token, used for making a request on
    *       behalf of a specific user.
    *   <li>batchSize: Number of objects to process per request
+   *   <li>context: A dictionary that is accessible in Cloud Code `beforeDelete` and `afterDelete` triggers.
    * </ul>
    * @return {Promise} A promise that is fulfilled when the destroyAll
    *     completes.
@@ -1646,6 +1655,9 @@ class ParseObject {
     if (options.hasOwnProperty('batchSize') && typeof options.batchSize === 'number') {
       destroyOptions.batchSize = options.batchSize;
     }
+    if (options.hasOwnProperty('context') && typeof options.context === 'object') {
+      destroyOptions.context = options.context;
+    }
     return CoreManager.getObjectController().destroy(
       list,
       destroyOptions
@@ -1674,6 +1686,7 @@ class ParseObject {
    *   <li>sessionToken: A valid session token, used for making a request on
    *       behalf of a specific user.
    *   <li>batchSize: Number of objects to process per request
+   *   <li>context: A dictionary that is accessible in Cloud Code `beforeSave` and `afterSave` triggers.
    * </ul>
    */
   static saveAll(list: Array<ParseObject>, options: RequestOptions = {}) {
@@ -1687,6 +1700,9 @@ class ParseObject {
     if (options.hasOwnProperty('batchSize') && typeof options.batchSize === 'number') {
       saveOptions.batchSize = options.batchSize;
     }
+    if (options.hasOwnProperty('context') && typeof options.context === 'object') {
+      saveOptions.context = options.context;
+    }
     return CoreManager.getObjectController().save(
       list,
       saveOptions

src/ParseObject.js

@@ -564,6 +564,7 @@ class ParseQuery {
    *     be used for this request.
    *   <li>sessionToken: A valid session token, used for making a request on
    *       behalf of a specific user.
+   *   <li>context: A dictionary that is accessible in Cloud Code `beforeFind` trigger.
    * </ul>
    *
    * @return {Promise} A promise that is resolved with the result when
@@ -579,6 +580,9 @@ class ParseQuery {
     if (options && options.hasOwnProperty('sessionToken')) {
       firstOptions.sessionToken = options.sessionToken;
     }
+    if (options && options.hasOwnProperty('context') && typeof options.context === 'object') {
+      firstOptions.context = options.context;
+    }
 
     return this.first(firstOptions).then((response) => {
       if (response) {
@@ -604,6 +608,7 @@ class ParseQuery {
    *     be used for this request.
    *   <li>sessionToken: A valid session token, used for making a request on
    *       behalf of a specific user.
+   *   <li>context: A dictionary that is accessible in Cloud Code `beforeFind` trigger.
    * </ul>
    *
    * @return {Promise} A promise that is resolved with the results when
@@ -619,6 +624,9 @@ class ParseQuery {
     if (options.hasOwnProperty('sessionToken')) {
       findOptions.sessionToken = options.sessionToken;
     }
+    if (options.hasOwnProperty('context') && typeof options.context === 'object') {
+      findOptions.context = options.context;
+    }
     this._setRequestTask(findOptions);
 
     const controller = CoreManager.getQueryController();
@@ -773,6 +781,11 @@ class ParseQuery {
       throw new Error('Invalid pipeline must be Array or Object');
     }
 
+    if (Object.keys(this._where || {}).length) {
+      if(!Array.isArray(pipeline)) pipeline = [pipeline];
+      pipeline.unshift({ match: this._where });
+    }
+
     const params = {
       pipeline,
       hint: this._hint,
@@ -799,6 +812,7 @@ class ParseQuery {
    *     be used for this request.
    *   <li>sessionToken: A valid session token, used for making a request on
    *       behalf of a specific user.
+   *   <li>context: A dictionary that is accessible in Cloud Code `beforeFind` trigger.
    * </ul>
    *
    * @return {Promise} A promise that is resolved with the object when
@@ -814,6 +828,9 @@ class ParseQuery {
     if (options.hasOwnProperty('sessionToken')) {
       findOptions.sessionToken = options.sessionToken;
     }
+    if (options.hasOwnProperty('context') && typeof options.context === 'object') {
+      findOptions.context = options.context;
+    }
     this._setRequestTask(findOptions);
 
     const controller = CoreManager.getQueryController();
@@ -871,6 +888,7 @@ class ParseQuery {
    *     be used for this request.
    *   <li>sessionToken: A valid session token, used for making a request on
    *       behalf of a specific user.
+   *   <li>context: A dictionary that is accessible in Cloud Code `beforeFind` trigger.
    * </ul>
    * @return {Promise} A promise that will be fulfilled once the
    *     iteration has completed.
@@ -921,6 +939,9 @@ class ParseQuery {
     if (options.hasOwnProperty('sessionToken')) {
       findOptions.sessionToken = options.sessionToken;
     }
+    if (options.hasOwnProperty('context') && typeof options.context === 'object') {
+      findOptions.context = options.context;
+    }
 
     let finished = false;
     let previousResults = [];

src/ParseQuery.js

@@ -227,7 +227,6 @@ const RESTController = {
     const context = options.context;
     if (context !== undefined) {
       payload._context = context;
-      delete options.context;
     }
 
     if (method !== 'POST') {

src/RESTController.js

@@ -205,4 +205,21 @@ describe('CloudController', () => {
     expect(CoreManager.getRESTController().request.mock.calls[0])
       .toEqual(['GET', 'cloud_code/jobs/data', null, { useMasterKey: true }]);
   });
+
+  it('accepts context on cloud function call', async () => {
+    const request = jest.fn();
+    request.mockReturnValue(Promise.resolve(undefined));
+
+    const ajax = jest.fn();
+    CoreManager.setRESTController({ request: request, ajax: ajax });
+
+    // Spy on REST controller
+    const controller = CoreManager.getRESTController();
+    jest.spyOn(controller, 'request');
+    // Save object
+    const context = {a: "a"};
+    await Cloud.run('myfunction', {}, { context: context });
+    // Validate
+    expect(controller.request.mock.calls[0][3].context).toEqual(context);
+  });
 });

src/__tests__/Cloud-test.js

@@ -244,6 +244,7 @@ describe('LiveQueryClient', () => {
 
     liveQueryClient._handleWebSocketMessage(event);
 
+    jest.runOnlyPendingTimers();
     expect(isChecked).toBe(true);
   });