Merge branch 'alpha' into upgrade-lru

Author: mtrezza

package-lock.json

@@ -25,10 +25,10 @@
     "@graphql-tools/utils": "8.12.0",
     "@graphql-yoga/node": "2.6.0",
     "@parse/fs-files-adapter": "1.2.2",
-    "@parse/push-adapter": "4.1.2",
+    "@parse/push-adapter": "4.1.3",
     "bcryptjs": "2.4.3",
     "body-parser": "1.20.1",
-    "commander": "5.1.0",
+    "commander": "10.0.1",
     "cors": "2.8.5",
     "deepcopy": "2.1.0",
     "express": "4.18.2",
@@ -49,7 +49,7 @@
     "mongodb": "4.10.0",
     "mustache": "4.2.0",
     "parse": "4.0.1",
-    "path-to-regexp": "0.1.7",
+    "path-to-regexp": "6.2.1",
     "pg-monitor": "2.0.0",
     "pg-promise": "11.3.0",
     "pluralize": "8.0.0",

package.json

@@ -74,7 +74,7 @@ describe('commander additions', () => {
     done();
   });
 
-  it('should load properly use args over env', done => {
+  it('should load properly use args over env', () => {
     commander.loadDefinitions(testDefinitions);
     commander.parse(['node', './CLI.spec.js', '--arg0', 'arg0Value', '--arg4', ''], {
       PROGRAM_ARG_0: 'arg0ENVValue',
@@ -86,7 +86,6 @@ describe('commander additions', () => {
     expect(commander.arg1).toEqual('arg1ENVValue');
     expect(commander.arg2).toEqual(4);
     expect(commander.arg4).toEqual('');
-    done();
   });
 
   it('should fail in action as port is invalid', done => {

spec/CLI.spec.js

@@ -136,5 +136,5 @@ Command.prototype.getOptions = function () {
   }, {});
 };
 
-export default new Command();
+export default new Command().storeOptionsAsProperties();
 /* eslint-enable no-console */

src/cli/utils/commander.js

@@ -82,9 +82,9 @@ const getRoute = parseClass => {
       '@File': 'files',
     }[parseClass] || 'classes';
   if (parseClass === '@File') {
-    return `/${route}/:id?*`;
+    return `/${route}/:id?(.*)`;
   }
-  return `/${route}/${parseClass}/:id?*`;
+  return `/${route}/${parseClass}/:id?(.*)`;
 };
 /** @namespace
  * @name Parse

src/cloud-code/Parse.Cloud.js

@@ -9,7 +9,7 @@ import MongoStorageAdapter from './Adapters/Storage/Mongo/MongoStorageAdapter';
 import PostgresStorageAdapter from './Adapters/Storage/Postgres/PostgresStorageAdapter';
 import rateLimit from 'express-rate-limit';
 import { RateLimitOptions } from './Options/Definitions';
-import pathToRegexp from 'path-to-regexp';
+import { pathToRegexp } from 'path-to-regexp';
 import ipRangeCheck from 'ip-range-check';
 import RedisStore from 'rate-limit-redis';
 import { createClient } from 'redis';
@@ -512,8 +512,12 @@ export const addRateLimit = (route, config, cloud) => {
       },
     });
   }
+  let transformPath = route.requestPath.replaceAll('/*', '/(.*)');
+  if (transformPath === '*') {
+    transformPath = '(.*)';
+  }
   config.rateLimits.push({
-    path: pathToRegexp(route.requestPath),
+    path: pathToRegexp(transformPath),
     handler: rateLimit({
       windowMs: route.requestTimeWindow,
       max: route.requestCount,