Merge branch 'master' into add-bulkwrite-overwriteimmutable-types

AbdelrahmanHafez · AbdelrahmanHafez · commit b7c11662d9c3 · 2025-12-03T02:39:07.000+01:00
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-22.04
     name: Benchmark TypeScript Types
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 0
       - name: Setup node
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Lint Markdown files
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Setup node
         uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-22.04
     name: Test Generating Docs
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - run: git fetch --depth=1 --tags # download all tags for documentation
 
       - name: Setup node
diff --git a/.github/workflows/encryption-tests.yml b/.github/workflows/encryption-tests.yml
@@ -36,7 +36,7 @@ jobs:
     env:
       FORCE_COLOR: true
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Setup node
         uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,7 +13,7 @@ jobs:
       id-token: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6.0.0
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Lint JS-Files
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Setup node
         uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
@@ -53,7 +53,7 @@ jobs:
       MONGOMS_PREFER_GLOBAL_PATH: 1
       FORCE_COLOR: true
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Setup node
         uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
@@ -85,7 +85,7 @@ jobs:
       MONGOMS_PREFER_GLOBAL_PATH: 1
       FORCE_COLOR: true
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Setup node
         uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
@@ -112,9 +112,9 @@ jobs:
       IS_ATLAS: true
       MONGOOSE_TEST_URI: mongodb://127.0.0.1:27017/mongoose_test?directConnection=true
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Setup AtlasCLI
-        uses: mongodb/atlas-github-action@v0.2.1
+        uses: mongodb/atlas-github-action@v0.2.2
       - name: Setup local Atlas deployment
         run: atlas deployments setup mycluster --type local --force --port 27017
       - name: Setup node
@@ -135,7 +135,7 @@ jobs:
     env:
       FORCE_COLOR: true
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Setup node
         uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
@@ -152,6 +152,6 @@ jobs:
       contents: read
     steps:
       - name: Check out repo
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Dependency review
         uses: actions/dependency-review-action@v4
diff --git a/.github/workflows/tidelift-alignment.yml b/.github/workflows/tidelift-alignment.yml
@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'Automattic/mongoose'
     steps:
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Setup node
         uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
diff --git a/.github/workflows/tsd.yml b/.github/workflows/tsd.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Lint TS-Files
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Setup node
         uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Test Typescript Types
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Setup node
         uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
diff --git a/lib/cast/double.js b/lib/cast/double.js
@@ -34,7 +34,7 @@ module.exports = function castDouble(val) {
     // ex: { a: 'im an object, valueOf: () => 'helloworld' } // throw an error
     if (typeof tempVal === 'string') {
       try {
-        coercedVal = BSON.Double.fromString(val);
+        coercedVal = BSON.Double.fromString(tempVal);
         return coercedVal;
       } catch {
         assert.ok(false);
diff --git a/lib/schema/operators/text.js b/lib/schema/operators/text.js
@@ -28,7 +28,7 @@ module.exports = function castTextSearch(val, path) {
   }
   if (val.$caseSensitive != null) {
     val.$caseSensitive = castBoolean(val.$caseSensitive,
-      path + '.$castSensitive');
+      path + '.$caseSensitive');
   }
   if (val.$diacriticSensitive != null) {
     val.$diacriticSensitive = castBoolean(val.$diacriticSensitive,
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "sift": "17.1.3"
   },
   "devDependencies": {
-    "@ark/attest": "0.53.0",
+    "@ark/attest": "0.55.0",
     "@mongodb-js/mongodb-downloader": "^1.0.0",
     "acquit": "1.4.0",
     "acquit-ignore": "0.2.1",
@@ -37,18 +37,18 @@
     "broken-link-checker": "^0.7.8",
     "cheerio": "1.1.2",
     "dox": "1.0.0",
-    "eslint": "9.25.1",
+    "eslint": "9.39.1",
     "eslint-plugin-markdown": "^5.1.0",
     "eslint-plugin-mocha-no-only": "1.2.0",
     "express": "^4.19.2",
     "fs-extra": "~11.3.0",
     "highlight.js": "11.11.1",
     "lodash.isequal": "4.5.0",
     "lodash.isequalwith": "4.4.0",
-    "markdownlint-cli2": "^0.18.1",
+    "markdownlint-cli2": "^0.19.1",
     "marked": "15.x",
     "mkdirp": "^3.0.1",
-    "mocha": "11.7.4",
+    "mocha": "11.7.5",
     "moment": "2.30.1",
     "mongodb-memory-server": "10.3.0",
     "mongodb-runner": "^6.0.0",
diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
@@ -2086,11 +2086,3 @@ function gh15751() {
   const doc = new TestModel();
   expectType<Types.ObjectId>(doc.myId);
 }
-
-function gh15798() {
-  const schema1 = new Schema({ name: String }, { statics: { testMe() { } }, versionKey: false });
-  model('M1', schema1).testMe();
-
-  const schema2 = new Schema({ name: String }, { statics: { testMe() { } }, timestamps: true });
-  model('M2', schema2).testMe();
-}
diff --git a/types/inferschematype.d.ts b/types/inferschematype.d.ts
@@ -114,7 +114,7 @@ declare module 'mongoose' {
 
   type ResolveSchemaOptions<T> = MergeType<DefaultSchemaOptions, T>;
 
-  type ApplySchemaOptions<T, O = DefaultSchemaOptions> = Default__v<ResolveTimestamps<T, O>, O>;
+  type ApplySchemaOptions<T, O = DefaultSchemaOptions> = ResolveTimestamps<T, O>;
 
   type DefaultTimestampProps = {
     createdAt: NativeDate;

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ module.exports = function castTextSearch(val, path) {`
`28`	`28`	`}`
`29`	`29`	`if (val.$caseSensitive != null) {`
`30`	`30`	`val.$caseSensitive = castBoolean(val.$caseSensitive,`
`31`		`- path + '.$castSensitive');`
	`31`	`+ path + '.$caseSensitive');`
`32`	`32`	`}`
`33`	`33`	`if (val.$diacriticSensitive != null) {`
`34`	`34`	`val.$diacriticSensitive = castBoolean(val.$diacriticSensitive,`