Merge branch 'alpha' into event-emitter

Author: mtrezza

changelogs/CHANGELOG_alpha.md

@@ -1,3 +1,17 @@
+# [4.2.0-alpha.6](https://github.com/parse-community/Parse-SDK-JS/compare/4.2.0-alpha.5...4.2.0-alpha.6) (2023-08-27)
+
+
+### Features
+
+* Add Bytes type to `Parse.Schema` ([#2001](https://github.com/parse-community/Parse-SDK-JS/issues/2001)) ([343d0d7](https://github.com/parse-community/Parse-SDK-JS/commit/343d0d729a57acdd3c9ba5c1dbe5738b3916ea04))
+
+# [4.2.0-alpha.5](https://github.com/parse-community/Parse-SDK-JS/compare/4.2.0-alpha.4...4.2.0-alpha.5) (2023-08-27)
+
+
+### Features
+
+* Add support for excluding keys in `ParseQuery.findAll` ([#2000](https://github.com/parse-community/Parse-SDK-JS/issues/2000)) ([012ba4c](https://github.com/parse-community/Parse-SDK-JS/commit/012ba4cdab1e3f853625f507c713cef2264a40dd))
+
 # [4.2.0-alpha.4](https://github.com/parse-community/Parse-SDK-JS/compare/4.2.0-alpha.3...4.2.0-alpha.4) (2023-07-23)
 
 

integration/test/ParseQueryTest.js

@@ -1621,6 +1621,23 @@ describe('Parse Query', () => {
     assert.equal(result.get('slice'), 'pizza');
   });
 
+  it('can exclude keys in findAll', async () => {
+    const object = new TestObject({
+      hello: 'world',
+      foo: 'bar',
+      slice: 'pizza',
+    });
+    await object.save();
+
+    const query = new Parse.Query(TestObject);
+    query.exclude('foo');
+    query.equalTo('objectId', object.id);
+    const [result] = await query.findAll();
+    assert.equal(result.get('foo'), undefined);
+    assert.equal(result.get('hello'), 'world');
+    assert.equal(result.get('slice'), 'pizza');
+  });
+
   it('uses subclasses when creating objects', done => {
     const ParentObject = Parse.Object.extend({ className: 'ParentObject' });
     let ChildObject = Parse.Object.extend('ChildObject', {

integration/test/ParseSchemaTest.js

@@ -72,6 +72,7 @@ describe('Schema', () => {
       .addString('stringField')
       .addNumber('numberField')
       .addBoolean('booleanField')
+      .addBytes('bytesField')
       .addDate('dateField')
       .addFile('fileField')
       .addGeoPoint('geoPointField')
@@ -91,6 +92,7 @@ describe('Schema', () => {
         assert.equal(result.fields.stringField.type, 'String');
         assert.equal(result.fields.numberField.type, 'Number');
         assert.equal(result.fields.booleanField.type, 'Boolean');
+        assert.equal(result.fields.bytesField.type, 'Bytes');
         assert.equal(result.fields.dateField.type, 'Date');
         assert.equal(result.fields.fileField.type, 'File');
         assert.equal(result.fields.geoPointField.type, 'GeoPoint');
@@ -182,6 +184,7 @@ describe('Schema', () => {
         required: true,
         defaultValue: '2000-01-01T00:00:00.000Z',
       })
+      .addBytes('bytesField', { required: true, defaultValue: 'ParseA==' })
       .addFile('fileField', { required: true, defaultValue: file })
       .addGeoPoint('geoPointField', { required: true, defaultValue: point })
       .addPolygon('polygonField', { required: true, defaultValue: polygon })
@@ -204,6 +207,11 @@ describe('Schema', () => {
       stringField: { type: 'String', required: true, defaultValue: 'world' },
       numberField: { type: 'Number', required: true, defaultValue: 10 },
       booleanField: { type: 'Boolean', required: true, defaultValue: false },
+      bytesField: {
+        type: 'Bytes',
+        required: true,
+        defaultValue: { __type: 'Bytes', base64: 'ParseA==' },
+      },
       dateField: {
         type: 'Date',
         required: true,
@@ -245,6 +253,7 @@ describe('Schema', () => {
       stringField: 'world',
       numberField: 10,
       booleanField: false,
+      bytesField: { __type: 'Bytes', base64: 'ParseA==' },
       dateField: { __type: 'Date', iso: '2000-01-01T00:00:00.000Z' },
       dateStringField: { __type: 'Date', iso: '2000-01-01T00:00:00.000Z' },
       fileField: file.toJSON(),

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "parse",
-  "version": "4.2.0-alpha.4",
+  "version": "4.2.0-alpha.6",
   "description": "Parse JavaScript SDK",
   "homepage": "https://parseplatform.org",
   "keywords": [

package.json

@@ -948,13 +948,10 @@ class ParseQuery {
 
     const query = new ParseQuery(this.className);
     query._limit = options.batchSize || 100;
-    query._include = this._include.map(i => {
-      return i;
-    });
+    query._include = [...this._include];
+    query._exclude = [...this._exclude];
     if (this._select) {
-      query._select = this._select.map(s => {
-        return s;
-      });
+      query._select = [...this._select];
     }
     query._hint = this._hint;
     query._where = {};

src/ParseQuery.js

@@ -12,6 +12,7 @@ const FIELD_TYPES = [
   'String',
   'Number',
   'Boolean',
+  'Bytes',
   'Date',
   'File',
   'GeoPoint',
@@ -242,6 +243,14 @@ class ParseSchema {
         };
       }
     }
+    if (type === 'Bytes') {
+      if (options && options.defaultValue) {
+        fieldOptions.defaultValue = {
+          __type: 'Bytes',
+          base64: options.defaultValue,
+        };
+      }
+    }
     this._fields[name] = fieldOptions;
     return this;
   }
@@ -303,6 +312,17 @@ class ParseSchema {
     return this.addField(name, 'Boolean', options);
   }
 
+  /**
+   * Adding Bytes Field
+   *
+   * @param {string} name Name of the field that will be created on Parse
+   * @param {object} options See {@link https://parseplatform.org/Parse-SDK-JS/api/master/Parse.Schema.html#addField addField}
+   * @returns {Parse.Schema} Returns the schema, so you can chain this call.
+   */
+  addBytes(name: string, options: FieldOptions) {
+    return this.addField(name, 'Bytes', options);
+  }
+
   /**
    * Adding Date Field
    *

src/ParseSchema.js

@@ -1817,6 +1817,7 @@ describe('ParseQuery', () => {
       q.select('size', 'name');
       q.includeAll();
       q.hint('_id_');
+      q.exclude('foo')
 
       await q.findAll();
       expect(findMock).toHaveBeenCalledTimes(1);
@@ -1827,6 +1828,7 @@ describe('ParseQuery', () => {
         order: 'objectId',
         keys: 'size,name',
         include: '*',
+        excludeKeys: 'foo',
         hint: '_id_',
         where: {
           size: {

src/__tests__/ParseQuery-test.js

@@ -57,6 +57,7 @@ describe('ParseSchema', () => {
       .addString('stringField')
       .addNumber('numberField')
       .addBoolean('booleanField')
+      .addBytes('bytesField')
       .addDate('dateField')
       .addFile('fileField')
       .addGeoPoint('geoPointField')
@@ -70,6 +71,7 @@ describe('ParseSchema', () => {
     expect(schema._fields.stringField.type).toEqual('String');
     expect(schema._fields.numberField.type).toEqual('Number');
     expect(schema._fields.booleanField.type).toEqual('Boolean');
+    expect(schema._fields.bytesField.type).toEqual('Bytes');
     expect(schema._fields.dateField.type).toEqual('Date');
     expect(schema._fields.fileField.type).toEqual('File');
     expect(schema._fields.geoPointField.type).toEqual('GeoPoint');
@@ -103,6 +105,10 @@ describe('ParseSchema', () => {
         required: true,
         defaultValue: 'hello',
       })
+      .addBytes('bytesField', {
+        required: true,
+        defaultValue: 'ParseA==',
+      })
       .addDate('dateField', {
         required: true,
         defaultValue: '2000-01-01T00:00:00.000Z',
@@ -131,6 +137,14 @@ describe('ParseSchema', () => {
         iso: new Date('2000-01-01T00:00:00.000Z'),
       },
     });
+    expect(schema._fields.bytesField).toEqual({
+      type: 'Bytes',
+      required: true,
+      defaultValue: {
+        __type: 'Bytes',
+        base64: 'ParseA==',
+      },
+    });
   });
 
   it('can create schema indexes', done => {