mongoose 9.0.0 → 9.0.2

package/lib/types/objectid.js

@@ -30,7 +30,7 @@ Object.defineProperty(ObjectId.prototype, '_id', {
  * Convenience `valueOf()` to allow comparing ObjectIds using double equals re: gh-7299
  */
 
-if (!ObjectId.prototype.hasOwnProperty('valueOf')) {
+if (!Object.hasOwn(ObjectId.prototype, 'valueOf')) {
   ObjectId.prototype.valueOf = function objectIdValueOf() {
     return this.toString();
   };

package/lib/utils.js

@@ -190,6 +190,9 @@ exports.deepEqual = function deepEqual(a, b) {
  */
 
 exports.last = function(arr) {
+  if (arr == null) {
+    return void 0;
+  }
   if (arr.length > 0) {
     return arr[arr.length - 1];
   }
@@ -272,6 +275,10 @@ exports.clonePOJOsAndArrays = function clonePOJOsAndArrays(val) {
 exports.merge = function merge(to, from, options, path) {
   options = options || {};
 
+  if (from == null) {
+    return to;
+  }
+
   const keys = Object.keys(from);
   let i = 0;
   const len = keys.length;
@@ -690,6 +697,9 @@ exports.setValue = function(path, val, obj, map, _copying) {
 
 exports.object = {};
 exports.object.vals = function vals(o) {
+  if (o == null) {
+    return [];
+  }
   const keys = Object.keys(o);
   let i = keys.length;
   const ret = [];
@@ -701,18 +711,6 @@ exports.object.vals = function vals(o) {
   return ret;
 };
 
-const hop = Object.prototype.hasOwnProperty;
-
-/**
- * Safer helper for hasOwnProperty checks
- *
- * @param {Object} obj
- * @param {String} prop
- */
-
-exports.object.hasOwnProperty = function(obj, prop) {
-  return hop.call(obj, prop);
-};
 
 /**
  * Determine if `val` is null or undefined
@@ -763,8 +761,6 @@ exports.array.flatten = function flatten(arr, filter, ret) {
  * ignore
  */
 
-const _hasOwnProperty = Object.prototype.hasOwnProperty;
-
 exports.hasUserDefinedProperty = function(obj, key) {
   if (obj == null) {
     return false;
@@ -779,7 +775,7 @@ exports.hasUserDefinedProperty = function(obj, key) {
     return false;
   }
 
-  if (_hasOwnProperty.call(obj, key)) {
+  if (Object.hasOwn(obj, key)) {
     return true;
   }
   if (typeof obj === 'object' && key in obj) {
@@ -865,15 +861,7 @@ exports.buffer.areEqual = function(a, b) {
   if (!Buffer.isBuffer(b)) {
     return false;
   }
-  if (a.length !== b.length) {
-    return false;
-  }
-  for (let i = 0, len = a.length; i < len; ++i) {
-    if (a[i] !== b[i]) {
-      return false;
-    }
-  }
-  return true;
+  return a.equals(b);
 };
 
 exports.getFunctionName = getFunctionName;

package/lib/virtualType.js

@@ -143,7 +143,7 @@ VirtualType.prototype.set = function(fn) {
 VirtualType.prototype.applyGetters = function(value, doc) {
   if (utils.hasUserDefinedProperty(this.options, ['ref', 'refPath']) &&
       doc.$$populatedVirtuals &&
-      doc.$$populatedVirtuals.hasOwnProperty(this.path)) {
+      Object.hasOwn(doc.$$populatedVirtuals, this.path)) {
     value = doc.$$populatedVirtuals[this.path];
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -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,7 +37,7 @@
     "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",
@@ -45,10 +45,10 @@
     "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",
@@ -81,7 +81,7 @@
     "docs:prepare:publish:5x": "git checkout 5.x && git merge 5.x && npm run docs:clean:stable && npm run docs:generate && npm run docs:copy:tmp && git checkout gh-pages && npm run docs:copy:tmp:5x",
     "docs:prepare:publish:6x": "git checkout 6.x && git merge 6.x && npm run docs:clean:stable && env DOCS_DEPLOY=true npm run docs:generate && mv ./docs/6.x ./tmp && git checkout gh-pages && npm run docs:copy:tmp:6x",
     "docs:prepare:publish:7x": "env DOCS_DEPLOY=true npm run docs:generate && git checkout gh-pages && rimraf ./docs/7.x && mv ./tmp ./docs/7.x",
-    "docs:prepare:publish:8x": "git checkout gh-pages && git merge 8.x && npm run docs:generate",
+    "docs:prepare:publish:8x": "env DOCS_DEPLOY=true npm run docs:generate && git checkout gh-pages && rimraf ./docs/8.x && mv ./tmp ./docs/8.x",
     "docs:check-links": "blc http://127.0.0.1:8089 -ro",
     "lint": "eslint .",
     "lint-js": "eslint . --ext .js --ext .cjs",
@@ -99,9 +99,10 @@
     "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}",
+    "tdd": "mocha --watch --inspect --recursive ./test/*.test.js --watch-files lib/**/*.js test/**/*.js",
     "test-coverage": "nyc --reporter=html --reporter=text npm test",
     "ts-benchmark": "cd ./benchmarks/typescript/simple && npm install && npm run benchmark | node ../../../scripts/tsc-diagnostics-check",
+    "ts-benchmark:local": "node ./scripts/create-tarball && cd ./benchmarks/typescript/simple && rm -rf ./node_modules && npm install && npm run benchmark | node ../../../scripts/tsc-diagnostics-check",
     "attest-benchmark": "node ./benchmarks/typescript/infer.bench.mts"
   },
   "main": "./index.js",

package/types/index.d.ts

@@ -345,7 +345,8 @@ declare module 'mongoose' {
         TSchemaOptions extends { methods: infer M } ? M : {},
         TSchemaOptions extends { query: any } ? TSchemaOptions['query'] : {},
         TSchemaOptions extends { virtuals: any } ? TSchemaOptions['virtuals'] : {},
-        RawDocType
+        RawDocType,
+        ResolveSchemaOptions<TSchemaOptions>
       >
     >(def: TSchemaDefinition): Schema<
       RawDocType,
@@ -374,7 +375,14 @@ declare module 'mongoose' {
         InferRawDocType<TSchemaDefinition, ResolveSchemaOptions<TSchemaOptions>>,
         ResolveSchemaOptions<TSchemaOptions>
       >,
-      THydratedDocumentType extends AnyObject = HydratedDocument<InferHydratedDocType<TSchemaDefinition, ResolveSchemaOptions<TSchemaOptions>>>
+      THydratedDocumentType extends AnyObject = HydratedDocument<
+        InferHydratedDocType<TSchemaDefinition, ResolveSchemaOptions<TSchemaOptions>>,
+        TSchemaOptions extends { methods: infer M } ? M : {},
+        TSchemaOptions extends { query: any } ? TSchemaOptions['query'] : {},
+        TSchemaOptions extends { virtuals: any } ? TSchemaOptions['virtuals'] : {},
+        RawDocType,
+        ResolveSchemaOptions<TSchemaOptions>
+      >
     >(def: TSchemaDefinition, options: TSchemaOptions): Schema<
       RawDocType,
       Model<RawDocType, any, any, any>,
@@ -623,7 +631,7 @@ declare module 'mongoose' {
 
     /** Adds static "class" methods to Models compiled from this schema. */
     static<K extends keyof TStaticMethods>(name: K, fn: TStaticMethods[K]): this;
-    static(obj: { [F in keyof TStaticMethods]: TStaticMethods[F] } & { [name: string]: (this: TModelType, ...args: any[]) => any }): this;
+    static(obj: Partial<TStaticMethods> & { [name: string]: (this: TModelType, ...args: any[]) => any }): this;
     static(name: string, fn: (this: TModelType, ...args: any[]) => any): this;
 
     /** Object of currently defined statics on this schema. */

package/types/inferrawdoctype.d.ts

@@ -12,18 +12,24 @@ declare module 'mongoose' {
     ? ObtainSchemaGeneric<TSchema, 'EnforcedDocType'>
     : FlattenMaps<SubdocsToPOJOs<ObtainSchemaGeneric<TSchema, 'DocType'>>>;
 
-  export type InferRawDocType<
+  export type InferRawDocTypeWithout_id<
     SchemaDefinition,
     TSchemaOptions extends Record<any, any> = DefaultSchemaOptions,
     TTransformOptions = { bufferToBinary: false }
-  > = Require_id<ApplySchemaOptions<{
+  > = ApplySchemaOptions<{
     [
     K in keyof (RequiredPaths<SchemaDefinition, TSchemaOptions['typeKey']> &
     OptionalPaths<SchemaDefinition, TSchemaOptions['typeKey']>)
     ]: IsPathRequired<SchemaDefinition[K], TSchemaOptions['typeKey']> extends true
       ? ObtainRawDocumentPathType<SchemaDefinition[K], TSchemaOptions['typeKey'], TTransformOptions>
       : ObtainRawDocumentPathType<SchemaDefinition[K], TSchemaOptions['typeKey'], TTransformOptions> | null;
-  }, TSchemaOptions>>;
+  }, TSchemaOptions>;
+
+  export type InferRawDocType<
+    SchemaDefinition,
+    TSchemaOptions extends Record<any, any> = DefaultSchemaOptions,
+    TTransformOptions = { bufferToBinary: false }
+  > = Require_id<InferRawDocTypeWithout_id<SchemaDefinition, TSchemaOptions, TTransformOptions>>;
 
   /**
    * @summary Allows users to optionally choose their own type for a schema field for stronger typing.

package/types/inferschematype.d.ts

@@ -100,10 +100,10 @@ declare module 'mongoose' {
       {
         EnforcedDocType: EnforcedDocType;
         M: M;
-        TInstanceMethods: TInstanceMethods;
-        TQueryHelpers: TQueryHelpers;
-        TVirtuals: AddDefaultId<DocType, TVirtuals, TSchemaOptions>;
-        TStaticMethods: TStaticMethods;
+        TInstanceMethods: IfEquals<TInstanceMethods, {}, TSchemaOptions extends { methods: infer M } ? M : {}, TInstanceMethods>;
+        TQueryHelpers: IfEquals<TQueryHelpers, {}, TSchemaOptions extends { query: infer Q } ? Q : {}, TQueryHelpers>;
+        TVirtuals: AddDefaultId<DocType, IfEquals<TVirtuals, {}, TSchemaOptions extends { virtuals: infer V } ? V : {}, TVirtuals>, TSchemaOptions>;
+        TStaticMethods: IfEquals<TStaticMethods, {}, TSchemaOptions extends { statics: infer S } ? S : {}, TStaticMethods>;
         TSchemaOptions: TSchemaOptions;
         DocType: DocType;
         THydratedDocumentType: THydratedDocumentType;
@@ -136,11 +136,6 @@ declare module 'mongoose' {
     : T;
 }
 
-type IsPathDefaultUndefined<PathType> =
-  PathType extends { default: undefined } ? true
-  : PathType extends { default: (...args: any[]) => undefined } ? true
-  : false;
-
 type RequiredPropertyDefinition =
   | {
       required: true | string | [true, string | undefined] | { isRequired: true };
@@ -159,16 +154,17 @@ type IsPathRequired<P, TypeKey extends string = DefaultTypeKey> =
     P extends { required: false } ?
       false
     : true
-  : P extends Record<TypeKey, ArrayConstructor | any[]> ?
-    IsPathDefaultUndefined<P> extends true ?
-      false
-    : true
-  : P extends Record<TypeKey, any> ?
-    P extends { default: any } ?
-      IfEquals<P['default'], undefined, false, true>
-    : false
+  : P extends { default: undefined | null | ((...args: any[]) => undefined) | ((...args: any[]) => null) } ? false
+  : P extends { default: any } ? true
+  : P extends Record<TypeKey, ArrayConstructor | any[]> ? true
   : false;
 
+// Internal type used to efficiently check for never or any types
+// can be efficiently checked like:
+// `[T] extends [neverOrAny] ? T : ...`
+// to avoid edge cases
+type neverOrAny = ' ~neverOrAny~';
+
 /**
  * @summary A Utility to obtain schema's required path keys.
  * @param {T} T A generic refers to document definition.
@@ -251,6 +247,7 @@ type UnionToType<T extends readonly any[]> = T[number] extends infer U
 
 type IsSchemaTypeFromBuiltinClass<T> =
   T extends typeof String ? true
+  : unknown extends Buffer ? false
   : T extends typeof Number ? true
   : T extends typeof Boolean ? true
   : T extends typeof Buffer ? true
@@ -268,7 +265,6 @@ type IsSchemaTypeFromBuiltinClass<T> =
   : T extends NativeDate ? true
   : T extends typeof Schema.Types.Mixed ? true
   : T extends Types.UUID ? true
-  : unknown extends Buffer ? false
   : T extends Buffer ? true
   : false;
 
@@ -284,12 +280,10 @@ type ResolvePathType<
   Options extends SchemaTypeOptions<PathValueType> = {},
   TypeKey extends string = DefaultSchemaOptions['typeKey'],
   TypeHint = never
-> = IfEquals<
-  TypeHint,
-  never,
-  PathValueType extends Schema ? InferSchemaType<PathValueType>
+> = [TypeHint] extends [never]
+  ? PathValueType extends Schema ? InferSchemaType<PathValueType>
   : PathValueType extends AnyArray<infer Item> ?
-    IfEquals<Item, never> extends true
+    [Item] extends [never]
       ? any[]
       : Item extends Schema ?
         // If Item is a schema, infer its type.
@@ -328,7 +322,7 @@ type ResolvePathType<
     : never
   : PathValueType extends ArrayConstructor ? any[]
   : PathValueType extends typeof Schema.Types.Mixed ? any
-  : IfEquals<PathValueType, ObjectConstructor> extends true ? any
+  : PathValueType extends ObjectConstructor ? any
   : IfEquals<PathValueType, {}> extends true ? any
   : PathValueType extends typeof SchemaType ? PathValueType['prototype']
   : PathValueType extends Record<string, any> ?
@@ -339,6 +333,5 @@ type ResolvePathType<
         typeKey: TypeKey;
       }
     >
-  : unknown,
-  TypeHint
->;
+  : unknown
+  : TypeHint;