Merge branch 'alpha' into dependabot/npm_and_yarn/follow-redirects-1.15.9

Author: mtrezza

Dockerfile

@@ -1,7 +1,7 @@
 ############################################################
 # Build stage
 ############################################################
-FROM node:20.14.0-alpine3.20 AS build
+FROM node:20.17.0-alpine3.20 AS build
 
 RUN apk --no-cache add \
    build-base \
@@ -28,7 +28,7 @@ RUN npm ci --omit=dev --ignore-scripts \
 ############################################################
 # Release stage
 ############################################################
-FROM node:20.14.0-alpine3.20 AS release
+FROM node:20.17.0-alpine3.20 AS release
 
 VOLUME /parse-server/cloud /parse-server/config
 

changelogs/CHANGELOG_alpha.md

@@ -1,3 +1,17 @@
+# [7.4.0-alpha.4](https://github.com/parse-community/parse-server/compare/7.4.0-alpha.3...7.4.0-alpha.4) (2024-10-22)
+
+
+### Bug Fixes
+
+* `Parse.Query.distinct` fails due to invalid aggregate stage 'hint' ([#9295](https://github.com/parse-community/parse-server/issues/9295)) ([5f66c6a](https://github.com/parse-community/parse-server/commit/5f66c6a075cbe1cdaf9d1b108ee65af8ae596b89))
+
+# [7.4.0-alpha.3](https://github.com/parse-community/parse-server/compare/7.4.0-alpha.2...7.4.0-alpha.3) (2024-10-22)
+
+
+### Features
+
+* Add support for PostGIS 3.5 ([#9354](https://github.com/parse-community/parse-server/issues/9354)) ([8ea3538](https://github.com/parse-community/parse-server/commit/8ea35382db3436d54ab59bd30706705564b0985c))
+
 # [7.4.0-alpha.2](https://github.com/parse-community/parse-server/compare/7.4.0-alpha.1...7.4.0-alpha.2) (2024-10-07)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "7.4.0-alpha.2",
+  "version": "7.4.0-alpha.4",
   "description": "An express module providing a Parse-compatible API server",
   "main": "lib/index.js",
   "repository": {

package.json

@@ -6,6 +6,8 @@
 
 const Parse = require('parse/node');
 const request = require('../lib/request');
+const ParseServerRESTController = require('../lib/ParseServerRESTController').ParseServerRESTController;
+const ParseServer = require('../lib/ParseServer').default;
 
 const masterKeyHeaders = {
   'X-Parse-Application-Id': 'test',
@@ -5275,4 +5277,33 @@ describe('Parse.Query testing', () => {
     // Validate
     expect(result.executionStats).not.toBeUndefined();
   });
+
+  it('should query with distinct within eachBatch and direct access enabled', async () => {
+    await reconfigureServer({
+      directAccess: true,
+    });
+
+    Parse.CoreManager.setRESTController(
+      ParseServerRESTController(Parse.applicationId, ParseServer.promiseRouter({ appId: Parse.applicationId }))
+    );
+
+    const user = new Parse.User();
+    user.set('username', 'foo');
+    user.set('password', 'bar');
+    await user.save();
+
+    const score = new Parse.Object('Score');
+    score.set('player', user);
+    score.set('score', 1);
+    await score.save();
+
+    await new Parse.Query('_User')
+      .equalTo('objectId', user.id)
+      .eachBatch(async ([user]) => {
+        const score = await new Parse.Query('Score')
+          .equalTo('player', user)
+          .distinct('score', { useMasterKey: true });
+        expect(score).toEqual([1]);
+      }, { useMasterKey: true });
+  });
 });

spec/ParseQuery.spec.js

@@ -1,7 +1,7 @@
-import ClassesRouter from './ClassesRouter';
-import rest from '../rest';
-import * as middleware from '../middlewares';
 import Parse from 'parse/node';
+import * as middleware from '../middlewares';
+import rest from '../rest';
+import ClassesRouter from './ClassesRouter';
 import UsersRouter from './UsersRouter';
 
 export class AggregateRouter extends ClassesRouter {
@@ -52,7 +52,7 @@ export class AggregateRouter extends ClassesRouter {
   }
 
   /* Builds a pipeline from the body. Originally the body could be passed as a single object,
-   * and now we support many options
+   * and now we support many options.
    *
    * Array
    *
@@ -71,17 +71,19 @@ export class AggregateRouter extends ClassesRouter {
    *
    * body: {
    *   pipeline: {
-   *     group: { objectId: '$name' },
+   *     $group: { objectId: '$name' },
    *   }
    * }
    *
    */
   static getPipeline(body) {
     let pipeline = body.pipeline || body;
     if (!Array.isArray(pipeline)) {
-      pipeline = Object.keys(pipeline).map(key => {
-        return { [key]: pipeline[key] };
-      });
+      pipeline = Object.keys(pipeline)
+        .filter(key => pipeline[key] !== undefined)
+        .map(key => {
+          return { [key]: pipeline[key] };
+        });
     }
 
     return pipeline.map(stage => {