Merge branch 'master' into gh-9850

Automattic · Mar 3, 2021 · 964dfd5 · 964dfd5
2 parents 64739b5 + b23f4f1
commit 964dfd5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -1052,7 +1052,7 @@ declare module 'mongoose' {
   type SchemaPreOptions = { document?: boolean, query?: boolean };
   type SchemaPostOptions = { document?: boolean, query?: boolean };
 
-  class Schema<DocType extends Document = Document, M extends Model<DocType, any> = Model<DocType>, SchemaDefinitionType = undefined> extends events.EventEmitter {
+  class Schema<DocType extends Document = Document, M extends Model<DocType, any> = Model<any, any>, SchemaDefinitionType = undefined> extends events.EventEmitter {
     /**
      * Create a new schema
      */

diff --git a/test/typescript/models.ts b/test/typescript/models.ts
@@ -1,4 +1,4 @@
-import { Schema, Document, Model, connection } from 'mongoose';
+import { Schema, Document, Model, connection, model } from 'mongoose';
 
 function conventionalSyntax(): void {
   interface ITest extends Document {
@@ -49,6 +49,21 @@ function insertManyTest() {
   });
 }
 
+function schemaStaticsWithoutGenerics() {
+  const UserSchema = new Schema({});
+  UserSchema.statics.static1 = function() { return ''; };
+
+  interface IUserDocument extends Document {
+    instanceField: string;
+  }
+  interface IUserModel extends Model<IUserDocument> {
+    static1: () => string;
+  }
+
+  const UserModel: IUserModel = model<IUserDocument, IUserModel>('User', UserSchema);
+  UserModel.static1();
+}
+
 const ExpiresSchema = new Schema({
   ttl: {
     type: Date,