Merge branch 'master' into master

Author: jsdevjournal

.travis.yml

@@ -22,9 +22,10 @@ jobs:
       before_script:
       - npm install -g mongodb-runner
       - mongodb-runner start
-      script: 
+      script:
       - npm run lint
       - npm test -- --maxWorkers=4
+      - npm run build
       - npm run integration
       after_script: ./node_modules/codecov/bin/codecov -f ./coverage/coverage-final.json && rm -rf ./coverage
     # release on github latest branch
@@ -33,7 +34,7 @@ jobs:
       -
       before_script: skip
       after_script: skip
-      script: 
+      script:
       - npm run release_docs
       - npm run build
       deploy:

CHANGELOG.md

@@ -1,23 +1,40 @@
 # Parse-SDK-JS
 
+## 2.2.0
+
+- Support for Local Datastore ([#612](https://github.com/parse-community/parse-server/pull/612))
+- LiveQuery override data on update ([#718](https://github.com/parse-community/parse-server/pull/718)) (Requires Parse-Server 3.1.3+)
+- Support setting user from JSON (hydrate) ([#730](https://github.com/parse-community/parse-server/pull/730))
+- Improve dot notation for updating nested objects ([#729](https://github.com/parse-community/parse-server/pull/729))
+- LiveQuery handle unset operation ([#714](https://github.com/parse-community/parse-server/pull/714)) (Requires Parse-Server 3.1.3+)
+- Add original object to LiveQuery events ([#712](https://github.com/parse-community/parse-server/pull/712)) (Requires Parse-Server 3.1.3+)
+- Add support for providing file upload progress. ([#373](https://github.com/parse-community/parse-server/pull/373)) (Browser Only)
+- Support clone with relation ([#382](https://github.com/parse-community/parse-server/pull/382))
+- Add batchSize to saveAll / destroyAll ([#701](https://github.com/parse-community/parse-server/pull/701))
+- Add save Method for Parse.Config ([#684](https://github.com/parse-community/parse-server/pull/684))
+- Allow specific keys to be reverted in unsaved objects ([#565](https://github.com/parse-community/parse-server/pull/565))
+- Handle undefined in Cloud Code ([#682](https://github.com/parse-community/parse-server/pull/682))
+- Validate if geopoint values is number ([#671](https://github.com/parse-community/parse-server/pull/671))
+- LiveQuery Support for Subclasses ([#662](https://github.com/parse-community/parse-server/pull/662))
+
 ## 2.1.0
 
-- Parse.Error now inherits from Error
+- Parse.Error now inherits from Error ([#658](https://github.com/parse-community/parse-server/pull/658))
 
 ## 2.0.2
 
-- Fixes issue affecting unsubscribing from liveQueries (#640)
-- Adds support for aggregate stages with identical names (#637)
-- Adds ability to fetch an object with includes (#631)
-- Adds support for $nor operator in queries (#634)
-- Adds support for containedBy operator in queries (#633)
-- Adds support for includeAll (#632)
+- Fixes issue affecting unsubscribing from liveQueries ([#640](https://github.com/parse-community/parse-server/pull/640))
+- Adds support for aggregate stages with identical names ([#637](https://github.com/parse-community/parse-server/pull/637))
+- Adds ability to fetch an object with includes ([#631](https://github.com/parse-community/parse-server/pull/631))
+- Adds support for $nor operator in queries ([#634](https://github.com/parse-community/parse-server/pull/634))
+- Adds support for containedBy operator in queries ([#633](https://github.com/parse-community/parse-server/pull/633))
+- Adds support for includeAll ([#632](https://github.com/parse-community/parse-server/pull/632))
 
 ## 2.0.1
 
-- Ensure we only read the job status id header if present.
+- Ensure we only read the job status id header if present. ([#623](https://github.com/parse-community/parse-server/pull/623))
 
 ## 2.0.0
 
-- Parse.Promise has been replaced by native Promises
-- Backbone style callbacks are removed
+- Parse.Promise has been replaced by native Promises ([#620](https://github.com/parse-community/parse-server/pull/620))
+- Backbone style callbacks are removed ([#620](https://github.com/parse-community/parse-server/pull/620))

integration/test/ParseLocalDatastoreTest.js

@@ -81,6 +81,23 @@ function runTest(controller) {
       assert.equal(cachedObject.field, 'new info');
     });
 
+    it(`${controller.name} can check if pinned`, async () => {
+      const object = new TestObject();
+      object.set('field', 'test');
+      await object.save();
+
+      let isPinned = await object.isPinned();
+      assert.equal(isPinned, false);
+
+      await object.pin();
+      isPinned = await object.isPinned();
+      assert.equal(isPinned, true);
+
+      await object.unPin();
+      isPinned = await object.isPinned();
+      assert.equal(isPinned, false);
+    });
+
     it(`${controller.name} can pin (recursive)`, async () => {
       const parent = new TestObject();
       const child = new Item();

integration/test/ParseObjectTest.js

@@ -229,6 +229,181 @@ describe('Parse Object', () => {
     });
   });
 
+  it('can increment nested fields', async () => {
+    const obj = new TestObject();
+    obj.set('objectField', { number: 5 });
+    assert.equal(obj.get('objectField').number, 5);
+    await obj.save();
+
+    obj.increment('objectField.number', 15);
+    assert.equal(obj.get('objectField').number, 20);
+    await obj.save();
+
+    assert.equal(obj.get('objectField').number, 20);
+
+    const query = new Parse.Query(TestObject);
+    const result = await query.get(obj.id);
+    assert.equal(result.get('objectField').number, 20);
+  });
+
+  it('can increment non existing field', async () => {
+    const obj = new TestObject();
+    obj.set('objectField', { number: 5 });
+    await obj.save();
+
+    obj.increment('objectField.unknown', 15);
+    assert.deepEqual(obj.get('objectField'), {
+      number: 5,
+      unknown: 15,
+    });
+    await obj.save();
+
+    const query = new Parse.Query(TestObject);
+    const result = await query.get(obj.id);
+    assert.equal(result.get('objectField').number, 5);
+    assert.equal(result.get('objectField').unknown, 15);
+  });
+
+  it('can increment nested fields two levels', async () => {
+    const obj = new TestObject();
+    obj.set('objectField', { foo: { bar: 5 } });
+    assert.equal(obj.get('objectField').foo.bar, 5);
+    await obj.save();
+
+    obj.increment('objectField.foo.bar', 15);
+    assert.equal(obj.get('objectField').foo.bar, 20);
+    await obj.save();
+
+    assert.equal(obj.get('objectField').foo.bar, 20);
+
+    const query = new Parse.Query(TestObject);
+    const result = await query.get(obj.id);
+    assert.equal(result.get('objectField').foo.bar, 20);
+  });
+
+  it('can increment nested fields without object', async () => {
+    const obj = new TestObject();
+    obj.set('hello', 'world');
+    await obj.save();
+
+    obj.increment('hello.dot', 15);
+    try  {
+      await obj.save();
+      assert.equal(false, true);
+    } catch(error) {
+      assert.equal(error.message, "Cannot create property 'dot' on string 'world'");
+    }
+  });
+
+  it('can set nested fields', async () => {
+    const obj = new TestObject({ objectField: { number: 5 } });
+    assert.equal(obj.get('objectField').number, 5);
+    await obj.save();
+
+    assert.equal(obj.get('objectField').number, 5);
+    obj.set('objectField.number', 20);
+    assert.equal(obj.get('objectField').number, 20);
+    await obj.save();
+
+    const query = new Parse.Query(TestObject);
+    const result = await query.get(obj.id);
+    assert.equal(result.get('objectField').number, 20);
+  });
+
+  it('can set non existing fields', async () => {
+    const obj = new TestObject();
+    obj.set('objectField', { number: 5 });
+    await obj.save();
+
+    obj.set('objectField.unknown', 20);
+    await obj.save();
+    const query = new Parse.Query(TestObject);
+    const result = await query.get(obj.id);
+    assert.equal(result.get('objectField').number, 5);
+    assert.equal(result.get('objectField').unknown, 20);
+  });
+
+  it('ignore set nested fields on new object', async () => {
+    const obj = new TestObject();
+    obj.set('objectField.number', 5);
+    assert.deepEqual(obj._getPendingOps()[0], {});
+    assert.equal(obj.get('objectField'), undefined);
+
+    await obj.save();
+    assert.equal(obj.get('objectField'), undefined);
+  });
+
+  it('can set nested fields two levels', async () => {
+    const obj = new TestObject({ objectField: { foo: { bar: 5 } } });
+    assert.equal(obj.get('objectField').foo.bar, 5);
+    await obj.save();
+
+    assert.equal(obj.get('objectField').foo.bar, 5);
+    obj.set('objectField.foo.bar', 20);
+    assert.equal(obj.get('objectField').foo.bar, 20);
+    await obj.save();
+
+    const query = new Parse.Query(TestObject);
+    const result = await query.get(obj.id);
+    assert.equal(result.get('objectField').foo.bar, 20);
+  });
+
+  it('can unset nested fields', async () => {
+    const obj = new TestObject({
+      objectField: {
+        number: 5,
+        string: 'hello',
+      }
+    });
+    await obj.save();
+
+    obj.unset('objectField.number');
+    assert.equal(obj.get('objectField').number, undefined);
+    assert.equal(obj.get('objectField').string, 'hello');
+    await obj.save();
+
+    const query = new Parse.Query(TestObject);
+    const result = await query.get(obj.id);
+    assert.equal(result.get('objectField').number, undefined);
+    assert.equal(result.get('objectField').string, 'hello');
+  });
+
+  it('can unset nested fields two levels', async () => {
+    const obj = new TestObject({
+      objectField: {
+        foo: {
+          bar: 5,
+        },
+        string: 'hello',
+      }
+    });
+    await obj.save();
+
+    obj.unset('objectField.foo.bar');
+    assert.equal(obj.get('objectField').foo.bar, undefined);
+    assert.equal(obj.get('objectField').string, 'hello');
+    await obj.save();
+
+    const query = new Parse.Query(TestObject);
+    const result = await query.get(obj.id);
+    assert.equal(result.get('objectField').foo.bar, undefined);
+    assert.equal(result.get('objectField').string, 'hello');
+  });
+
+  it('can unset non existing fields', async () => {
+    const obj = new TestObject();
+    obj.set('objectField', { number: 5 });
+    await obj.save();
+
+    obj.unset('objectField.unknown');
+    await obj.save();
+
+    const query = new Parse.Query(TestObject);
+    const result = await query.get(obj.id);
+    assert.equal(result.get('objectField').number, 5);
+    assert.equal(result.get('objectField').unknown, undefined);
+  });
+
   it('can set keys to null', (done) => {
     const obj = new TestObject();
     obj.set('foo', null);

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "parse",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "The Parse JavaScript SDK",
   "homepage": "https://www.parse.com",
   "keywords": [
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "ws": "6.1.2",
+    "ws": "6.1.4",
     "xmlhttprequest": "1.8.0"
   },
   "devDependencies": {
@@ -74,7 +74,6 @@
     "test": "PARSE_BUILD=node jest",
     "lint": "eslint --cache src/ integration/",
     "lint:fix": "eslint --fix --cache src/ integration/",
-    "preintegration": "npm run build",
     "watch": "PARSE_BUILD=${PARSE_BUILD:=node} gulp watch",
     "integration": "TESTING=1 jasmine --config=jasmine.json",
     "docs": "jsdoc -c ./jsdoc-conf.json ./src",

package.json

@@ -122,6 +122,7 @@ type UserController = {
   signUp: (user: ParseUser, attrs: AttributeMap, options: RequestOptions) => Promise;
   logIn: (user: ParseUser, options: RequestOptions) => Promise;
   become: (options: RequestOptions) => Promise;
+  hydrate: (userJSON: AttributeMap) => Promise;
   logOut: () => Promise;
   requestPasswordReset: (email: string, options: RequestOptions) => Promise;
   updateUserOnDisk: (user: ParseUser) => Promise;

src/CoreManager.js

@@ -9,6 +9,7 @@
  */
 /* global WebSocket */
 
+import CoreManager from './CoreManager';
 import EventEmitter from './EventEmitter';
 import ParseObject from './ParseObject';
 import LiveQuerySubscription from './LiveQuerySubscription';
@@ -392,7 +393,9 @@ class LiveQueryClient extends EventEmitter {
       if (!subscription) {
         break;
       }
+      let override = false;
       if (data.original) {
+        override = true;
         delete data.original.__type;
         // Check for removed fields
         for (const field in data.original) {
@@ -403,9 +406,14 @@ class LiveQueryClient extends EventEmitter {
         data.original = ParseObject.fromJSON(data.original, false);
       }
       delete data.object.__type;
-      const parseObject = ParseObject.fromJSON(data.object, false);
+      const parseObject = ParseObject.fromJSON(data.object, override);
 
       subscription.emit(data.op, parseObject, data.original);
+
+      const localDatastore = CoreManager.getLocalDatastore();
+      if (override && localDatastore.isEnabled) {
+        localDatastore._updateObjectIfPinned(parseObject).then(() => {});
+      }
     }
     }
   }

src/LiveQueryClient.js

@@ -123,7 +123,18 @@ export function estimateAttributes(serverData: AttributeMap, pendingOps: Array<O
           );
         }
       } else {
-        data[attr] = pendingOps[i][attr].applyTo(data[attr]);
+        if (attr.includes('.')) {
+          // convert a.b.c into { a: { b: { c: value } } }
+          const fields = attr.split('.');
+          const last = fields[fields.length - 1];
+          let object = Object.assign({}, data);
+          for (let i = 0; i < fields.length - 1; i++) {
+            object = object[fields[i]];
+          }
+          object[last] = pendingOps[i][attr].applyTo(object[last]);
+        } else {
+          data[attr] = pendingOps[i][attr].applyTo(data[attr]);
+        }
       }
     }
   }