mongoose 8.19.4 → 9.0.0-rc0

package/lib/types/buffer.js

@@ -4,8 +4,8 @@
 
 'use strict';
 
-const Binary = require('bson').Binary;
-const UUID = require('bson').UUID;
+const Binary = require('mongodb/lib/bson').Binary;
+const UUID = require('mongodb/lib/bson').UUID;
 const utils = require('../utils');
 
 /**
@@ -169,14 +169,14 @@ utils.each(
  *
  * #### SubTypes:
  *
- *     const bson = require('bson')
- *     bson.BSON_BINARY_SUBTYPE_DEFAULT
- *     bson.BSON_BINARY_SUBTYPE_FUNCTION
- *     bson.BSON_BINARY_SUBTYPE_BYTE_ARRAY
- *     bson.BSON_BINARY_SUBTYPE_UUID
- *     bson.BSON_BINARY_SUBTYPE_MD5
- *     bson.BSON_BINARY_SUBTYPE_USER_DEFINED
- *     doc.buffer.toObject(bson.BSON_BINARY_SUBTYPE_USER_DEFINED);
+ *     const mongodb = require('mongodb')
+ *     mongodb.BSON.BSON_BINARY_SUBTYPE_DEFAULT
+ *     mongodb.BSON.BSON_BINARY_SUBTYPE_FUNCTION
+ *     mongodb.BSON.BSON_BINARY_SUBTYPE_BYTE_ARRAY
+ *     mongodb.BSON.BSON_BINARY_SUBTYPE_UUID
+ *     mongodb.BSON.BSON_BINARY_SUBTYPE_MD5
+ *     mongodb.BSON.BSON_BINARY_SUBTYPE_USER_DEFINED
+ *     doc.buffer.toObject(mongodb.BSON.BSON_BINARY_SUBTYPE_USER_DEFINED);
  *
  * @see bsonspec https://bsonspec.org/#/specification
  * @param {Hex} [subtype]

package/lib/types/decimal128.js

@@ -10,4 +10,4 @@
 
 'use strict';
 
-module.exports = require('bson').Decimal128;
+module.exports = require('mongodb/lib/bson').Decimal128;

package/lib/types/documentArray/index.js

@@ -61,7 +61,7 @@ function MongooseDocumentArray(values, path, doc, schematype) {
     while (internals[arraySchemaSymbol] != null &&
         internals[arraySchemaSymbol].$isMongooseArray &&
         !internals[arraySchemaSymbol].$isMongooseDocumentArray) {
-      internals[arraySchemaSymbol] = internals[arraySchemaSymbol].casterConstructor;
+      internals[arraySchemaSymbol] = internals[arraySchemaSymbol].embeddedSchemaType;
     }
   }
 

package/lib/types/documentArray/methods/index.js

@@ -2,7 +2,6 @@
 
 const ArrayMethods = require('../../array/methods');
 const Document = require('../../../document');
-const castObjectId = require('../../../cast/objectid');
 const getDiscriminatorByValue = require('../../../helpers/discriminator/getDiscriminatorByValue');
 const internalToObjectOptions = require('../../../options').internalToObjectOptions;
 const utils = require('../../../utils');
@@ -60,7 +59,7 @@ const methods = {
     if (this[arraySchemaSymbol] == null) {
       return value;
     }
-    let Constructor = this[arraySchemaSymbol].casterConstructor;
+    let Constructor = this[arraySchemaSymbol].Constructor;
     const isInstance = Constructor.$isMongooseDocumentArray ?
       utils.isMongooseDocumentArray(value) :
       value instanceof Constructor;
@@ -121,23 +120,36 @@ const methods = {
    *
    * @return {EmbeddedDocument|null} the subdocument or null if not found.
    * @param {ObjectId|String|Number|Buffer} id
-   * @TODO cast to the _id based on schema for proper comparison
    * @method id
    * @api public
    * @memberOf MongooseDocumentArray
    */
 
   id(id) {
-    let casted;
-    let sid;
-    let _id;
+    if (id == null) {
+      return null;
+    }
 
-    try {
-      casted = castObjectId(id).toString();
-    } catch (e) {
-      casted = null;
+    const schemaType = this[arraySchemaSymbol];
+    let idSchemaType = null;
+
+    if (schemaType && schemaType.schema) {
+      idSchemaType = schemaType.schema.path('_id');
+    } else if (schemaType && schemaType.casterConstructor && schemaType.casterConstructor.schema) {
+      idSchemaType = schemaType.casterConstructor.schema.path('_id');
     }
 
+    let castedId = null;
+    if (idSchemaType) {
+      try {
+        castedId = idSchemaType.cast(id);
+      } catch {
+        // ignore error
+      }
+    }
+
+    let _id;
+
     for (const val of this) {
       if (!val) {
         continue;
@@ -145,18 +157,20 @@ const methods = {
 
       _id = val.get('_id');
 
-      if (_id === null || typeof _id === 'undefined') {
+      if (_id == null) {
         continue;
       } else if (_id instanceof Document) {
-        sid || (sid = String(id));
-        if (sid == _id._id) {
+        _id = _id.get('_id');
+        if (castedId != null && utils.deepEqual(castedId, _id)) {
           return val;
-        }
-      } else if (!isBsonType(id, 'ObjectId') && !isBsonType(_id, 'ObjectId')) {
-        if (id == _id || utils.deepEqual(id, _id)) {
+        } else if (castedId == null && (id == _id || utils.deepEqual(id, _id))) {
+          // Backwards compat: compare user-specified param to _id using loose equality
           return val;
         }
-      } else if (casted == _id) {
+      } else if (castedId != null && utils.deepEqual(castedId, _id)) {
+        return val;
+      } else if (castedId == null && (_id == id || utils.deepEqual(id, _id))) {
+        // Backwards compat: compare user-specified param to _id using loose equality
         return val;
       }
     }
@@ -280,7 +294,7 @@ const methods = {
    */
 
   create(obj) {
-    let Constructor = this[arraySchemaSymbol].casterConstructor;
+    let Constructor = this[arraySchemaSymbol].Constructor;
     if (obj &&
         Constructor.discriminators &&
         Constructor.schema &&

package/lib/types/double.js

@@ -10,4 +10,4 @@
 
 'use strict';
 
-module.exports = require('bson').Double;
+module.exports = require('mongodb/lib/bson').Double;

package/lib/types/map.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const Mixed = require('../schema/mixed');
 const MongooseError = require('../error/mongooseError');
 const clone = require('../helpers/clone');
 const deepEqual = require('../utils').deepEqual;
@@ -41,7 +40,7 @@ class MongooseMap extends Map {
       this.$__pathRelativeToParent = null;
     }
 
-    this.$__schemaType = schemaType == null ? new Mixed(path) : schemaType;
+    this.$__schemaType = schemaType;
 
     this.$__runDeferred();
   }

package/lib/types/objectid.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-const ObjectId = require('bson').ObjectId;
+const ObjectId = require('mongodb/lib/bson').ObjectId;
 const objectIdSymbol = require('../helpers/symbols').objectIdSymbol;
 
 /**

package/lib/types/subdocument.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const Document = require('../document');
-const immediate = require('../helpers/immediate');
 const internalToObjectOptions = require('../options').internalToObjectOptions;
 const util = require('util');
 const utils = require('../utils');
@@ -15,11 +14,7 @@ module.exports = Subdocument;
  * @api private
  */
 
-function Subdocument(value, fields, parent, skipId, options) {
-  if (typeof skipId === 'object' && skipId != null && options == null) {
-    options = skipId;
-    skipId = undefined;
-  }
+function Subdocument(value, fields, parent, options) {
   if (parent != null) {
     // If setting a nested path, should copy isNew from parent re: gh-7048
     const parentOptions = { isNew: parent.isNew };
@@ -45,7 +40,7 @@ function Subdocument(value, fields, parent, skipId, options) {
     delete documentOptions.path;
   }
 
-  Document.call(this, value, fields, skipId, documentOptions);
+  Document.call(this, value, fields, documentOptions);
 
   delete this.$__.priorDoc;
 }
@@ -94,14 +89,7 @@ Subdocument.prototype.save = async function save(options) {
       'if you\'re sure this behavior is right for your app.');
   }
 
-  return new Promise((resolve, reject) => {
-    this.$__save((err) => {
-      if (err != null) {
-        return reject(err);
-      }
-      resolve(this);
-    });
-  });
+  return await this.$__save();
 };
 
 /**
@@ -164,8 +152,15 @@ Subdocument.prototype.$__pathRelativeToParent = function(p) {
  * @api private
  */
 
-Subdocument.prototype.$__save = function(fn) {
-  return immediate(() => fn(null, this));
+Subdocument.prototype.$__save = async function $__save() {
+  try {
+    await this._execDocumentPreHooks('save');
+  } catch (error) {
+    await this._execDocumentPostHooks('save', error);
+    return;
+  }
+
+  await this._execDocumentPostHooks('save');
 };
 
 /*!
@@ -286,7 +281,7 @@ Subdocument.prototype.ownerDocument = function() {
     return this.$__.ownerDocument;
   }
 
-  let parent = this; // eslint-disable-line consistent-this
+  let parent = this;
   const paths = [];
   const seenDocs = new Set([parent]);
 
@@ -318,7 +313,7 @@ Subdocument.prototype.ownerDocument = function() {
  */
 
 Subdocument.prototype.$__fullPathWithIndexes = function() {
-  let parent = this; // eslint-disable-line consistent-this
+  let parent = this;
   const paths = [];
   const seenDocs = new Set([parent]);
 
@@ -361,22 +356,6 @@ Subdocument.prototype.parent = function() {
 
 Subdocument.prototype.$parent = Subdocument.prototype.parent;
 
-/**
- * no-op for hooks
- * @param {Function} cb
- * @method $__deleteOne
- * @memberOf Subdocument
- * @instance
- * @api private
- */
-
-Subdocument.prototype.$__deleteOne = function(cb) {
-  if (cb == null) {
-    return;
-  }
-  return cb(null, this);
-};
-
 /**
  * ignore
  * @method $__removeFromParent
@@ -393,14 +372,9 @@ Subdocument.prototype.$__removeFromParent = function() {
  * Null-out this subdoc
  *
  * @param {Object} [options]
- * @param {Function} [callback] optional callback for compatibility with Document.prototype.remove
  */
 
-Subdocument.prototype.deleteOne = function(options, callback) {
-  if (typeof options === 'function') {
-    callback = options;
-    options = null;
-  }
+Subdocument.prototype.deleteOne = function deleteOne(options) {
   registerRemoveListener(this);
 
   // If removing entire doc, no need to remove subdoc
@@ -411,8 +385,6 @@ Subdocument.prototype.deleteOne = function(options, callback) {
     owner.$__.removedSubdocs = owner.$__.removedSubdocs || [];
     owner.$__.removedSubdocs.push(this);
   }
-
-  return this.$__deleteOne(callback);
 };
 
 /*!

package/lib/types/uuid.js

@@ -10,4 +10,4 @@
 
 'use strict';
 
-module.exports = require('bson').UUID;
+module.exports = require('mongodb/lib/bson').UUID;

package/lib/utils.js

@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 
-const UUID = require('bson').UUID;
+const UUID = require('mongodb/lib/bson').UUID;
 const ms = require('ms');
 const mpath = require('mpath');
 const ObjectId = require('./types/objectid');
@@ -18,7 +18,6 @@ const isBsonType = require('./helpers/isBsonType');
 const isPOJO = require('./helpers/isPOJO');
 const getFunctionName = require('./helpers/getFunctionName');
 const isMongooseObject = require('./helpers/isMongooseObject');
-const promiseOrCallback = require('./helpers/promiseOrCallback');
 const schemaMerge = require('./helpers/schema/merge');
 const specialProperties = require('./helpers/specialProperties');
 const { trustedSymbol } = require('./helpers/query/trusted');
@@ -197,12 +196,6 @@ exports.last = function(arr) {
   return void 0;
 };
 
-/*!
- * ignore
- */
-
-exports.promiseOrCallback = promiseOrCallback;
-
 /*!
  * ignore
  */

package/lib/validOptions.js

@@ -19,7 +19,6 @@ const VALID_OPTIONS = Object.freeze([
   'debug',
   'forceRepopulate',
   'id',
-  'timestamps.createdAt.immutable',
   'maxTimeMS',
   'objectIdGetter',
   'overwriteModels',
@@ -29,14 +28,15 @@ const VALID_OPTIONS = Object.freeze([
   'sanitizeProjection',
   'selectPopulatedPaths',
   'setDefaultsOnInsert',
-  'skipOriginalStackTraces',
   'strict',
   'strictPopulate',
   'strictQuery',
+  'timestamps.createdAt.immutable',
   'toJSON',
   'toObject',
   'transactionAsyncLocalStorage',
-  'translateAliases'
+  'translateAliases',
+  'updatePipeline'
 ]);
 
 module.exports = VALID_OPTIONS;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.19.4",
+  "version": "9.0.0-rc0",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -20,33 +20,24 @@
   "type": "commonjs",
   "license": "MIT",
   "dependencies": {
-    "bson": "^6.10.4",
-    "kareem": "2.6.3",
-    "mongodb": "~6.20.0",
+    "kareem": "3.0.0",
+    "mongodb": "~7.0",
     "mpath": "0.9.0",
-    "mquery": "5.0.0",
+    "mquery": "6.0.0",
     "ms": "2.1.3",
     "sift": "17.1.3"
   },
   "devDependencies": {
     "@ark/attest": "0.53.0",
-    "@babel/core": "7.28.5",
-    "@babel/preset-env": "7.28.5",
     "@mongodb-js/mongodb-downloader": "^1.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.19.1",
-    "@typescript-eslint/parser": "^8.19.1",
     "acquit": "1.4.0",
     "acquit-ignore": "0.2.1",
     "acquit-require": "0.1.1",
     "ajv": "8.17.1",
-    "assert-browserify": "2.0.0",
-    "babel-loader": "8.2.5",
     "broken-link-checker": "^0.7.8",
-    "buffer": "^5.6.0",
     "cheerio": "1.1.2",
-    "crypto-browserify": "3.12.1",
     "dox": "1.0.0",
-    "eslint": "8.57.1",
+    "eslint": "9.25.1",
     "eslint-plugin-markdown": "^5.1.0",
     "eslint-plugin-mocha-no-only": "1.2.0",
     "express": "^4.19.2",
@@ -61,16 +52,15 @@
     "moment": "2.30.1",
     "mongodb-memory-server": "10.3.0",
     "mongodb-runner": "^6.0.0",
+    "mongodb-client-encryption": "~7.0",
     "ncp": "^2.0.0",
     "nyc": "15.1.0",
     "pug": "3.0.3",
-    "q": "1.5.1",
     "sinon": "21.0.0",
-    "stream-browserify": "3.0.0",
     "tsd": "0.33.0",
     "typescript": "5.9.3",
-    "uuid": "11.1.0",
-    "webpack": "5.102.1"
+    "typescript-eslint": "^8.31.1",
+    "uuid": "11.1.0"
   },
   "directories": {
     "lib": "./lib/mongoose"
@@ -96,8 +86,6 @@
     "lint-js": "eslint . --ext .js --ext .cjs",
     "lint-ts": "eslint . --ext .ts",
     "lint-md": "markdownlint-cli2 \"**/*.md\" \"#node_modules\" \"#benchmarks\"",
-    "build-browser": "(rm ./dist/* || true) && node ./scripts/build-browser.js",
-    "prepublishOnly": "npm run build-browser",
     "release": "git pull && git push origin master --tags && npm publish",
     "release-5x": "git pull origin 5.x && git push origin 5.x && git push origin 5.x --tags && npm publish --tag 5x",
     "release-6x": "git pull origin 6.x && git push origin 6.x && git push origin 6.x --tags && npm publish --tag 6x",
@@ -107,7 +95,7 @@
     "test": "mocha --exit ./test/*.test.js",
     "test-deno": "deno run --allow-env --allow-read --allow-net --allow-run --allow-sys --allow-write ./test/deno.mjs",
     "test-rs": "START_REPLICA_SET=1 mocha --timeout 30000 --exit ./test/*.test.js",
-    "test-tsd": "node ./test/types/check-types-filename && tsd",
+    "test-tsd": "node ./test/types/check-types-filename && tsd --full",
     "setup-test-encryption": "node scripts/setup-encryption-tests.js",
     "test-encryption": "mocha --exit ./test/encryption/*.test.js",
     "tdd": "mocha ./test/*.test.js --inspect --watch --recursive --watch-files ./**/*.{js,ts}",
@@ -118,7 +106,7 @@
   "main": "./index.js",
   "types": "./types/index.d.ts",
   "engines": {
-    "node": ">=16.20.1"
+    "node": ">=20.19.0"
   },
   "bugs": {
     "url": "https://github.com/Automattic/mongoose/issues/new"
@@ -128,7 +116,6 @@
     "url": "git://github.com/Automattic/mongoose.git"
   },
   "homepage": "https://mongoosejs.com",
-  "browser": "./dist/browser.umd.js",
   "config": {
     "mongodbMemoryServer": {
       "disablePostinstall": true
@@ -148,7 +135,7 @@
       "noImplicitAny": false,
       "strictNullChecks": true,
       "module": "commonjs",
-      "target": "ES2017"
+      "target": "ES2022"
     }
   }
 }

package/types/connection.d.ts

@@ -186,16 +186,25 @@ declare module 'mongoose' {
       collection?: string,
       options?: CompileModelOptions
     ): Model<
-    InferSchemaType<TSchema>,
-    ObtainSchemaGeneric<TSchema, 'TQueryHelpers'>,
-    ObtainSchemaGeneric<TSchema, 'TInstanceMethods'>,
-    {},
-    HydratedDocument<
-    InferSchemaType<TSchema>,
-    ObtainSchemaGeneric<TSchema, 'TInstanceMethods'>,
-    ObtainSchemaGeneric<TSchema, 'TQueryHelpers'>
-    >,
-    TSchema> & ObtainSchemaGeneric<TSchema, 'TStaticMethods'>;
+      InferSchemaType<TSchema>,
+      ObtainSchemaGeneric<TSchema, 'TQueryHelpers'>,
+      ObtainSchemaGeneric<TSchema, 'TInstanceMethods'>,
+      ObtainSchemaGeneric<TSchema, 'TVirtuals'>,
+      // If first schema generic param is set, that means we have an explicit raw doc type,
+      // so user should also specify a hydrated doc type if the auto inferred one isn't correct.
+      IsItRecordAndNotAny<ObtainSchemaGeneric<TSchema, 'EnforcedDocType'>> extends true
+        ? ObtainSchemaGeneric<TSchema, 'THydratedDocumentType'>
+        : HydratedDocument<
+          InferSchemaType<TSchema>,
+          ObtainSchemaGeneric<TSchema, 'TVirtuals'> & ObtainSchemaGeneric<TSchema, 'TInstanceMethods'>,
+          ObtainSchemaGeneric<TSchema, 'TQueryHelpers'>,
+          ObtainSchemaGeneric<TSchema, 'TVirtuals'>,
+          InferSchemaType<TSchema>,
+          ObtainSchemaGeneric<TSchema, 'TSchemaOptions'>
+        >,
+      TSchema,
+      ObtainSchemaGeneric<TSchema, 'TLeanResultType'>
+    > & ObtainSchemaGeneric<TSchema, 'TStaticMethods'>;
     model<T, U, TQueryHelpers = {}>(
       name: string,
       schema?: Schema<T, any, any, TQueryHelpers, any, any, any>,
@@ -273,7 +282,7 @@ declare module 'mongoose' {
     transaction<ReturnType = unknown>(fn: (session: mongodb.ClientSession) => Promise<ReturnType>, options?: mongodb.TransactionOptions): Promise<ReturnType>;
 
     /** Switches to a different database using the same connection pool. */
-    useDb(name: string, options?: { useCache?: boolean, noListener?: boolean }): Connection;
+    useDb(name: string, options?: { useCache?: boolean }): Connection;
 
     /** The username specified in the URI */
     readonly user: string;