mongoose 9.7.2 → 9.7.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "9.7.2",
+  "version": "9.7.4",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -20,6 +20,7 @@
   "type": "commonjs",
   "license": "MIT",
   "dependencies": {
+    "@standard-schema/spec": "^1.1.0",
     "kareem": "3.3.0",
     "mongodb": "~7.2",
     "mpath": "0.9.0",
@@ -28,7 +29,7 @@
     "sift": "17.1.3"
   },
   "devDependencies": {
-    "@ark/attest": "0.56.0",
+    "@ark/attest": "0.56.1",
     "@eslint/js": "^9.39.3",
     "@mongodb-js/mongodb-downloader": "^1.0.0",
     "@types/node": "^20.19.0",
@@ -39,18 +40,18 @@
     "c8": "11.0.0",
     "cheerio": "1.2.0",
     "dox": "1.0.0",
-    "eslint": "10.4.1",
+    "eslint": "10.6.0",
     "eslint-plugin-mocha-no-only": "1.2.0",
     "express": "5.2.1",
     "fs-extra": "~11.3.0",
-    "globals": "^17.4.0",
     "glob": "^13.0.6",
+    "globals": "^17.4.0",
     "highlight.js": "11.11.1",
     "linkinator": "7.x",
     "lodash.isequal": "4.5.0",
     "lodash.isequalwith": "4.4.0",
     "markdownlint-cli2": "0.22.1",
-    "marked": "18.0.4",
+    "marked": "18.0.5",
     "mkdirp": "^3.0.1",
     "mocha": "12.0.0-beta-10",
     "moment": "2.30.1",
@@ -63,7 +64,7 @@
     "tstyche": "^7.0.0",
     "typescript": "5.9.3",
     "typescript-eslint": "^8.31.1",
-    "uuid": "14.0.0",
+    "uuid": "14.0.1",
     "xss": "1.0.15"
   },
   "directories": {
@@ -86,7 +87,7 @@
     "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 && rm -rf ./docs/7.x && mv ./tmp ./docs/7.x",
     "docs:prepare:publish:8x": "env DOCS_DEPLOY=true npm run docs:generate && git checkout gh-pages && rm -rf ./docs/8.x && mv ./tmp ./docs/8.x",
-    "docs:check-links": "linkinator http://127.0.0.1:8089 --silent --recurse --skip cdn.carbonads.com --skip m.servedby-buysellads.com --skip \"127\\.0\\.0\\.1:8089\/docs\/\\d+.x\"",
+    "docs:check-links": "linkinator http://127.0.0.1:8089 --silent --recurse --skip cdn.carbonads.com --skip m.servedby-buysellads.com --skip \"127\\.0\\.0\\.1:8089/docs/\\d+.x\"",
     "docs:update-mongodb-links": "node ./scripts/update-mongodb-links.js",
     "lint": "eslint .",
     "lint-js": "eslint . --ext .js --ext .cjs",

package/types/index.d.ts

@@ -191,11 +191,13 @@ declare module 'mongoose' {
         Document<unknown, TQueryHelpers, RawDocType, TVirtuals, TSchemaOptions> & Default__v<Require_id<HydratedDocPathsType>, TSchemaOptions>,
         Document<unknown, TQueryHelpers, RawDocType, TVirtuals, TSchemaOptions> & MergeType<
           Default__v<Require_id<HydratedDocPathsType>, TSchemaOptions>,
-          IfEquals<
-            TOverrides,
-            {},
-            TOverrides,
-            TOverrides & AddDefaultId<HydratedDocPathsType, TVirtuals, TSchemaOptions>
+          HydratedDocumentOverrides<
+            IfEquals<
+              TOverrides,
+              {},
+              TOverrides,
+              TOverrides & AddDefaultId<HydratedDocPathsType, TVirtuals, TSchemaOptions>
+            >
           >
         >
       >

package/types/models.d.ts

@@ -1,5 +1,6 @@
 declare module 'mongoose' {
   import mongodb = require('mongodb');
+  import { StandardSchemaV1 as StandardSchemaV1Spec, StandardTypedV1 as StandardTypedV1Spec } from '@standard-schema/spec';
 
   export interface DiscriminatorOptions {
     value?: string | number | ObjectId;
@@ -108,40 +109,8 @@ declare module 'mongoose' {
    */
   type pathsToValidate = PathsToValidate;
 
-  export namespace StandardSchemaV1 {
-    export interface Props<Output = unknown> {
-      readonly version: 1;
-      readonly vendor: 'mongoose';
-      readonly validate: (
-        value: unknown,
-        options?: Options | undefined
-      ) => Result<Output> | Promise<Result<Output>>;
-    }
-
-    export interface Options {
-      readonly libraryOptions?: Record<string, unknown> | undefined;
-    }
-
-    export type Result<Output> = SuccessResult<Output> | FailureResult;
-
-    export interface SuccessResult<Output> {
-      readonly value: Output;
-      readonly issues?: undefined;
-    }
-
-    export interface FailureResult {
-      readonly issues: ReadonlyArray<Issue>;
-    }
-
-    export interface Issue {
-      readonly message: string;
-      readonly path?: ReadonlyArray<PropertyKey | PathSegment> | undefined;
-    }
-
-    export interface PathSegment {
-      readonly key: PropertyKey;
-    }
-  }
+  export import StandardTypedV1 = StandardTypedV1Spec;
+  export import StandardSchemaV1 = StandardSchemaV1Spec;
 
   interface SaveOptions extends
     SessionOption {
@@ -224,7 +193,7 @@ declare module 'mongoose' {
    * - vanilla arrays of POJOs for document arrays
    * - POJOs and array of arrays for maps
    */
-  type CreateObjectWithExtraKeys<T> = T & Record<string, unknown>;
+  type CreateObjectWithExtraKeys<T> = T | (T & Record<string, unknown>);
   type ApplyBasicCreateCasting<T> = {
     [K in keyof T]: NonNullable<T[K]> extends Map<infer KeyType extends string, infer ValueType>
       ? (Record<KeyType, ValueType> | Array<[KeyType, ValueType]> | T[K] | QueryTypeCasting<Extract<T[K], TreatAsPrimitives>>)
@@ -270,7 +239,7 @@ declare module 'mongoose' {
     base: Mongoose;
 
     /** Standard Schema adapter for validating input with this model's schema. */
-    readonly '~standard': StandardSchemaV1.Props<TRawDocType>;
+    readonly '~standard': StandardSchemaV1.Props<Default__v<Require_id<TRawDocType>, ObtainSchemaGeneric<TSchema, 'TSchemaOptions'>>>;
 
     /**
      * If this is a discriminator model, `baseModelName` is the name of
@@ -684,11 +653,11 @@ declare module 'mongoose' {
      */
     useConnection(connection: Connection): this;
 
-    /** Casts and validates the given object against this model's schema, passing the given `context` to custom validators. */
-    validate(): Promise<void>;
-    validate(obj: any): Promise<void>;
-    validate(obj: any, pathsOrOptions: PathsToValidate): Promise<void>;
-    validate(obj: any, pathsOrOptions: { pathsToSkip?: pathsToSkip }): Promise<void>;
+    /** Casts and validates the given object against this model's schema, returning the casted-and-validated copy of `obj`, passing the given `context` to custom validators. */
+    validate(): Promise<TRawDocType>;
+    validate(obj: any): Promise<TRawDocType>;
+    validate(obj: any, pathsOrOptions: PathsToValidate): Promise<TRawDocType>;
+    validate(obj: any, pathsOrOptions: { pathsToSkip?: pathsToSkip }): Promise<TRawDocType>;
 
     /** Watches the underlying collection for changes using [MongoDB change streams](https://www.mongodb.com/docs/manual/changeStreams/). */
     watch<ResultType extends mongodb.Document = any, ChangeType extends mongodb.ChangeStreamDocument = any>(pipeline?: Array<Record<string, unknown>>, options?: mongodb.ChangeStreamOptions & { hydrate?: boolean }): mongodb.ChangeStream<ResultType, ChangeType>;

package/types/utility.d.ts

@@ -161,6 +161,15 @@ declare module 'mongoose' {
       : T[K];
   };
 
+  type OmitThisParameterIfFunction<T> = T extends (...args: any[]) => any ? OmitThisParameter<T> : T;
+
+  // Strip explicit `this` parameter from methods in schema type options. The `this` parameter
+  // is just for type-checking the function body. Keeping the explicit 'this' typing can cause
+  // compiler errors on the method calls, so remove it for the hydrated document definition.
+  type HydratedDocumentOverrides<T> = {
+    [K in keyof T]: OmitThisParameterIfFunction<T[K]>;
+  };
+
   /**
    * @summary Adds timestamp fields to a type
    * @description Adds createdAt and updatedAt fields of type Date, or custom timestamp fields if specified