Merge branch 'master' of github.com:Automattic/mongoose

Author: vkarpov15

.github/workflows/benchmark.yml

@@ -2,20 +2,18 @@ name: Benchmark
 on:
   pull_request:
     paths:
-      - '.github/workflows/benchmark.yml'
-      - 'package.json'
-      - 'types/**'
-      - 'benchmarks/typescript/**'
-      - 'benchmarks/typescript.js'
+      - ".github/workflows/benchmark.yml"
+      - "package.json"
+      - "types/**"
+      - "benchmarks/typescript/**"
   push:
     branches:
       - master
     paths:
-      - '.github/workflows/benchmark.yml'
-      - 'package.json'
-      - 'types/**'
-      - 'benchmarks/typescript/**'
-      - 'benchmarks/typescript.js'
+      - ".github/workflows/benchmark.yml"
+      - "package.json"
+      - "types/**"
+      - "benchmarks/typescript/**"
 permissions:
   contents: read
 
@@ -33,6 +31,6 @@ jobs:
 
       - run: npm install
 
-      - run: node ./benchmarks/typescript
+      - run: npx ts-benchmark -p ./benchmarks/typescript/simple -f 17/100000 18 29 32 -b master -g --colors
         env:
-          DB_URL: ${{ secrets.DB_URL }}
+          DB_URL: ${{ secrets.DB_URL }}

package.json

@@ -60,7 +60,7 @@
     "serve-handler": "6.1.3",
     "sinon": "14.0.0",
     "stream-browserify": "3.0.0",
-    "ts-benchmark": "^1.0.2",
+    "ts-benchmark": "^1.1.5",
     "tsd": "0.20.0",
     "typescript": "4.7.4",
     "uuid": "8.3.2",
@@ -98,8 +98,8 @@
     "test-tsd": "node ./test/types/check-types-filename && tsd",
     "tdd": "mocha ./test/*.test.js --inspect --watch --recursive --watch-files ./**/*.{js,ts}",
     "test-coverage": "nyc --reporter=html --reporter=text npm test",
-    "ts-benchmark": "node ./benchmarks/typescript.js",
-    "ts-benchmark-watch": "ts-benchmark -p ./benchmarks/typescript/simple -w ./types -i -s -f 17 18 29 32 -b master"
+    "ts-benchmark": "ts-benchmark -p ./benchmarks/typescript/simple -f 17/100000 18 29 32",
+    "ts-benchmark-watch": "ts-benchmark -p ./benchmarks/typescript/simple -w ./types -i -s -f 17/100000 18 29 32 -b master"
   },
   "main": "./index.js",
   "types": "./types/index.d.ts",

test/types/PipelineStage.test.ts

@@ -392,3 +392,26 @@ const stages3: PipelineStage[] = [
     }
   }
 ];
+
+const stages4: PipelineStage[] = [
+  {
+    $addFields: {
+      usersCount: {
+        $let: {
+          vars: {
+            users: { $push: '$user' }
+          },
+          in: {
+            $reduce: {
+              input: '$users',
+              initialValue: 0,
+              in: {
+                $cond: { if: { $isArray: '$$this' }, then: { $size: '$$this' }, else: '$$this' }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+];

test/types/expressions.test.ts

@@ -193,3 +193,13 @@ const nullExpr: Expression = {
 const nullNETupleExpr: Expression = {
   $ne: ['$name', null]
 };
+
+const switchExpr: Expression.Switch = {
+  $switch: {
+    branches: [
+      { case: { $eq: ['$name', 'Detlef'] }, then: 'Detlef' },
+      { case: { $eq: ['$name', 'John'] }, then: 'John' }
+    ],
+    default: 'Hello'
+  }
+};

types/expressions.d.ts

@@ -1067,13 +1067,13 @@ declare module 'mongoose' {
          * - $case
          * - $then
          */
-        $branches: { $case: Expression, then: Expression }[];
+        branches: { case: Expression, then: Expression }[];
         /**
          * The path to take if no branch case expression evaluates to true.
          *
          * Although optional, if default is unspecified and no branch case evaluates to true, $switch returns an error.
          */
-        $default: Expression;
+        default: Expression;
       };
     }
 
@@ -2448,7 +2448,8 @@ declare module 'mongoose' {
     BinaryExpression |
     FunctionExpression |
     ObjectIdExpression |
-    ConditionalExpressionOperator;
+    ConditionalExpressionOperator |
+    Expression.Let;
 
   export type ObjectIdExpression =
     TypeExpressionOperatorReturningObjectId;