Merge remote-tracking branch 'upstream/alpha' into alpha

dblythy · dblythy · commit 4d62c214f061 · 2022-09-15T00:06:08.000+10:00
diff --git a/changelogs/CHANGELOG_alpha.md b/changelogs/CHANGELOG_alpha.md
@@ -1,3 +1,40 @@
+# [3.5.0-alpha.3](https://github.com/parse-community/Parse-SDK-JS/compare/3.5.0-alpha.2...3.5.0-alpha.3) (2022-09-14)
+
+
+### Bug Fixes
+
+* `Schema.addField` does not correctly add value of type `Date` ([#1544](https://github.com/parse-community/Parse-SDK-JS/issues/1544)) ([15111f7](https://github.com/parse-community/Parse-SDK-JS/commit/15111f74a658eefc71a50b6bfb3d25c7997d26a2))
+
+# [3.5.0-alpha.2](https://github.com/parse-community/Parse-SDK-JS/compare/3.5.0-alpha.1...3.5.0-alpha.2) (2022-09-12)
+
+
+### Bug Fixes
+
+* remove base64 validation due to validation inefficiency ([#1543](https://github.com/parse-community/Parse-SDK-JS/issues/1543)) ([473949d](https://github.com/parse-community/Parse-SDK-JS/commit/473949d514a395cf3656b03e083e30fff6e2f22c))
+
+# [3.5.0-alpha.1](https://github.com/parse-community/Parse-SDK-JS/compare/3.4.4-alpha.2...3.5.0-alpha.1) (2022-09-08)
+
+
+### Features
+
+* add `json` option to `Parse.Query.each()` ([#1539](https://github.com/parse-community/Parse-SDK-JS/issues/1539)) ([89fd5ec](https://github.com/parse-community/Parse-SDK-JS/commit/89fd5ec6a8e210de3946434c6c88d6de87b6635c))
+* add json option to query.each ([299fb0d](https://github.com/parse-community/Parse-SDK-JS/commit/299fb0d49cbbd3c95c2e8a61744bd03e93c33d36))
+
+## [3.4.4-alpha.2](https://github.com/parse-community/Parse-SDK-JS/compare/3.4.4-alpha.1...3.4.4-alpha.2) (2022-08-16)
+
+
+### Bug Fixes
+
+* `Parse.User.signUp()` does not pass context to Cloud Code  ([#1527](https://github.com/parse-community/Parse-SDK-JS/issues/1527)) ([53edcfd](https://github.com/parse-community/Parse-SDK-JS/commit/53edcfd7ad1bd075a6097ba3c129c5f0998ffbfa))
+
+## [3.4.4-alpha.1](https://github.com/parse-community/Parse-SDK-JS/compare/3.4.3...3.4.4-alpha.1) (2022-07-28)
+
+
+### Bug Fixes
+
+* creating a Parse.File with base64 string fails for some encodings ([#1517](https://github.com/parse-community/Parse-SDK-JS/issues/1517)) ([0439862](https://github.com/parse-community/Parse-SDK-JS/commit/0439862cd83dc37f8f3571b68fdaccb6b11b540d))
+* subscription to a LiveQuery containing `ParseQuery.select` overrides properties ([#1488](https://github.com/parse-community/Parse-SDK-JS/issues/1488)) ([b80eee4](https://github.com/parse-community/Parse-SDK-JS/commit/b80eee4b010b60d37b34b566880ed19f05d4c801))
+
 ## [3.4.3-alpha.3](https://github.com/parse-community/Parse-SDK-JS/compare/3.4.3-alpha.2...3.4.3-alpha.3) (2022-07-02)
 
 
diff --git a/integration/test/ParseQueryTest.js b/integration/test/ParseQueryTest.js
@@ -70,6 +70,13 @@ describe('Parse Query', () => {
     assert.strictEqual(result.foo, 'bar');
     assert.strictEqual(result.className, 'TestObject');
     assert.strictEqual(result.objectId, object.id);
+
+    await query.each((obj) => {
+      assert.strictEqual(obj instanceof Parse.Object, false);
+      assert.strictEqual(obj.foo, 'bar');
+      assert.strictEqual(obj.className, 'TestObject');
+      assert.strictEqual(obj.objectId, object.id);
+    }, { json: true });
   });
 
   it('can do query with count', async () => {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parse",
-  "version": "3.4.4-beta.1",
+  "version": "3.5.0-alpha.3",
   "description": "The Parse JavaScript SDK",
   "homepage": "https://parseplatform.org/",
   "keywords": [
@@ -73,7 +73,7 @@
     "gulp-rename": "2.0.0",
     "gulp-uglify": "3.0.2",
     "gulp-watch": "5.0.1",
-    "husky": "4.3.5",
+    "husky": "4.3.8",
     "jasmine": "3.5.0",
     "jasmine-reporters": "2.3.2",
     "jasmine-spec-reporter": "6.0.0",
diff --git a/src/ParseFile.js b/src/ParseFile.js
@@ -42,16 +42,6 @@ export type FileSource =
       type: string,
     };
 
-const base64Regex = new RegExp(
-  '([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))',
-  'i'
-);
-
-const dataUriRegex = new RegExp(
-  `^data:([a-zA-Z]+\\/[-a-zA-Z0-9+.]+(;[a-z-]+=[a-zA-Z0-9+.-]+)?)?(;base64)?,(${base64Regex.source})*$`,
-  'i'
-);
-
 function b64Digit(number: number): string {
   if (number < 26) {
     return String.fromCharCode(65 + number);
@@ -145,29 +135,13 @@ class ParseFile {
           type: specifiedType,
         };
       } else if (data && typeof data.base64 === 'string') {
-        // Check if data URI or base64 string is valid
-        const validationRegex = new RegExp(base64Regex.source + '|' + dataUriRegex.source, 'i');
-        if (!validationRegex.test(data.base64)) {
-          throw new Error(
-            'Cannot create a Parse.File without valid data URIs or base64 encoded data.'
-          );
-        }
-
         const base64 = data.base64.split(',').slice(-1)[0];
-        let type =
-          specifiedType || data.base64.split(';').slice(0, 1)[0].split(':').slice(1, 2)[0] || '';
-
-        // https://tools.ietf.org/html/rfc2397
-        // If <mediatype> is omitted, it defaults to text/plain;charset=US-ASCII.
-        // As a shorthand, "text/plain" can be omitted but the charset parameter supplied.
-        if (dataUriRegex.test(data.base64)) {
-          type = type || 'text/plain';
-        }
-
+        const dataType =
+          specifiedType || data.base64.split(';').slice(0, 1)[0].split(':').slice(1, 2)[0] || 'text/plain';
         this._source = {
           format: 'base64',
           base64,
-          type,
+          type: dataType,
         };
       } else {
         throw new TypeError('Cannot create a Parse.File with that data.');
diff --git a/src/ParseQuery.js b/src/ParseQuery.js
@@ -990,6 +990,9 @@ class ParseQuery {
     if (options.hasOwnProperty('context') && typeof options.context === 'object') {
       findOptions.context = options.context;
     }
+    if (options.hasOwnProperty('json')) {
+      findOptions.json = options.json;
+    }
 
     let finished = false;
     let previousResults = [];
@@ -1030,6 +1033,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>json: Return raw json without converting to Parse.Object
    * </ul>
    * @returns {Promise} A promise that will be fulfilled once the
    *     iteration has completed.
diff --git a/src/ParseSchema.js b/src/ParseSchema.js
@@ -241,6 +241,14 @@ class ParseSchema {
     if (options.defaultValue !== undefined) {
       fieldOptions.defaultValue = options.defaultValue;
     }
+    if (type === 'Date') {
+      if (options && options.defaultValue) {
+        fieldOptions.defaultValue = {
+          __type: 'Date',
+          iso: new Date(options.defaultValue),
+        };
+      }
+    }
     this._fields[name] = fieldOptions;
     return this;
   }
@@ -310,12 +318,6 @@ class ParseSchema {
    * @returns {Parse.Schema} Returns the schema, so you can chain this call.
    */
   addDate(name: string, options: FieldOptions) {
-    if (options && options.defaultValue) {
-      options.defaultValue = {
-        __type: 'Date',
-        iso: new Date(options.defaultValue),
-      };
-    }
     return this.addField(name, 'Date', options);
   }
 
diff --git a/src/ParseUser.js b/src/ParseUser.js
@@ -425,6 +425,12 @@ class ParseUser extends ParseObject {
     if (options.hasOwnProperty('installationId')) {
       signupOptions.installationId = options.installationId;
     }
+    if (
+      options.hasOwnProperty('context') &&
+      Object.prototype.toString.call(options.context) === '[object Object]'
+    ) {
+      signupOptions.context = options.context;
+    }
 
     const controller = CoreManager.getUserController();
     return controller.signUp(this, attrs, signupOptions);
diff --git a/src/__tests__/ParseFile-test.js b/src/__tests__/ParseFile-test.js
@@ -60,10 +60,22 @@ describe('ParseFile', () => {
     process.env.PARSE_BUILD = 'node';
   });
 
-  it('can create files with base64 encoding', () => {
+  it('can create files with base64 encoding (no padding)', () => {
+    const file = new ParseFile('parse.txt', { base64: 'YWJj' });
+    expect(file._source.base64).toBe('YWJj');
+    expect(file._source.type).toBe('text/plain');
+  });
+
+  it('can create files with base64 encoding (1 padding)', () => {
+    const file = new ParseFile('parse.txt', { base64: 'YWI=' });
+    expect(file._source.base64).toBe('YWI=');
+    expect(file._source.type).toBe('text/plain');
+  });
+
+  it('can create files with base64 encoding (2 padding)', () => {
     const file = new ParseFile('parse.txt', { base64: 'ParseA==' });
     expect(file._source.base64).toBe('ParseA==');
-    expect(file._source.type).toBe('');
+    expect(file._source.type).toBe('text/plain');
   });
 
   it('can set the default type to be text/plain when using base64', () => {
@@ -152,12 +164,6 @@ describe('ParseFile', () => {
     expect(function () {
       new ParseFile('parse.txt', 'string');
     }).toThrow('Cannot create a Parse.File with that data.');
-
-    expect(function () {
-      new ParseFile('parse.txt', {
-        base64: 'abc',
-      });
-    }).toThrow('Cannot create a Parse.File without valid data URIs or base64 encoded data.');
   });
 
   it('throws with invalid base64', () => {
diff --git a/src/__tests__/ParseQuery-test.js b/src/__tests__/ParseQuery-test.js
@@ -1376,6 +1376,13 @@ describe('ParseQuery', () => {
     expect(result.size).toBe('small');
     expect(result.name).toEqual('Product 3');
     expect(result.className).toEqual('Item');
+
+    await q.each((obj) => {
+      expect(obj.objectId).toBe('I1');
+      expect(obj.size).toBe('small');
+      expect(obj.name).toEqual('Product 3');
+      expect(obj.className).toEqual('Item');
+    }, { json: true });
   });
 
   it('will error when getting a nonexistent object', done => {
diff --git a/src/__tests__/ParseSchema-test.js b/src/__tests__/ParseSchema-test.js
@@ -194,6 +194,15 @@ describe('ParseSchema', () => {
     }
   });
 
+  it('can add date field with default value', () => {
+    const schema = new ParseSchema('NewSchemaTest');
+    const date = new Date();
+    schema.addDate('testField', { defaultValue: date });
+    schema.addField('testField2', 'Date', { defaultValue: date });
+    expect(schema._fields.testField.defaultValue).toEqual({ __type: 'Date', iso: date });
+    expect(schema._fields.testField2.defaultValue).toEqual({ __type: 'Date', iso: date });
+  });
+
   it('cannot add index with null name', done => {
     try {
       const schema = new ParseSchema('SchemaTest');
diff --git a/src/__tests__/ParseUser-test.js b/src/__tests__/ParseUser-test.js
@@ -1681,6 +1681,30 @@ describe('ParseUser', () => {
     expect(user.existed()).toBe(true);
   });
 
+  it('can signup with context', async () => {
+    CoreManager.setRESTController({
+      ajax() {},
+      request() {
+        return Promise.resolve(
+          {
+            objectId: 'uid3',
+            username: 'username',
+            sessionToken: '123abc',
+          },
+          200
+        );
+      },
+    });
+    const controller = CoreManager.getRESTController();
+    jest.spyOn(controller, 'request');
+    const context = { a: 'a' };
+    const user = new ParseUser();
+    user.setUsername('name');
+    user.setPassword('pass');
+    await user.signUp(null, { context });
+    expect(controller.request.mock.calls[0][3].context).toEqual(context);
+  });
+
   it('can verify user password', async () => {
     ParseUser.enableUnsafeCurrentUser();
     ParseUser._clearCache();
