more fixes for #14962

Author: vkarpov15

test/types/connection.test.ts

@@ -1,4 +1,4 @@
-import { createConnection, Schema, Collection, Connection, ConnectionSyncIndexesResult, Model, connection, HydratedDocument, Query } from 'mongoose';
+import { createConnection, Schema, Collection, Connection, ConnectionSyncIndexesResult, Model, connection, HydratedDocument, Query, model } from 'mongoose';
 import * as mongodb from 'mongodb';
 import { expectAssignable, expectError, expectType } from 'tsd';
 import { AutoTypedSchemaType, autoTypedSchema } from './schema.test';

types/connection.d.ts

@@ -175,7 +175,6 @@ declare module 'mongoose' {
      */
     readonly models: Readonly<{ [index: string]: Model<any> }>;
 
-    /** Defines or retrieves a model. */
     model<TSchema extends Schema = any>(
       name: string,
       schema?: TSchema,
@@ -185,20 +184,24 @@ declare module 'mongoose' {
     InferSchemaType<TSchema>,
     ObtainSchemaGeneric<TSchema, 'TQueryHelpers'>,
     ObtainSchemaGeneric<TSchema, 'TInstanceMethods'>,
-    {},
+    ObtainSchemaGeneric<TSchema, 'TVirtuals'>,
     HydratedDocument<
     InferSchemaType<TSchema>,
-    ObtainSchemaGeneric<TSchema, 'TInstanceMethods'>,
-    ObtainSchemaGeneric<TSchema, 'TQueryHelpers'>
+    ObtainSchemaGeneric<TSchema, 'TVirtuals'> & ObtainSchemaGeneric<TSchema, 'TInstanceMethods'>,
+    ObtainSchemaGeneric<TSchema, 'TQueryHelpers'>,
+    ObtainSchemaGeneric<TSchema, 'TVirtuals'>
     >,
-    TSchema> & ObtainSchemaGeneric<TSchema, 'TStaticMethods'>;
+    TSchema
+    > & ObtainSchemaGeneric<TSchema, 'TStaticMethods'>;
+
+    model<T>(name: string, schema?: Schema<any, T, any, any>, collection?: string, options?: CompileModelOptions): Model<T>;
+
     model<T, U, TQueryHelpers = {}>(
       name: string,
-      schema?: Schema<any, T, any, any, TQueryHelpers, any, any, any>,
+      schema?: Schema<any, T, U, any, TQueryHelpers, any, any, any>,
       collection?: string,
       options?: CompileModelOptions
     ): U;
-    model<T>(name: string, schema?: Schema<any, T, any, any>, collection?: string, options?: CompileModelOptions): Model<T>;
 
     /** Returns an array of model names created on this connection. */
     modelNames(): Array<string>;

types/inferschematype.d.ts

@@ -108,7 +108,7 @@ type IsPathDefaultUndefined<PathType> = PathType extends { default: undefined }
  * @param {TypeKey} TypeKey A generic of literal string type."Refers to the property used for path type definition".
  */
 type IsPathRequired<P, TypeKey extends string = DefaultTypeKey> =
-  P extends { required: true | [true, string | undefined] | { isRequired: true } } | ArrayConstructor | any[]
+  P extends { required: true | (string | boolean)[] | { isRequired: true } } | ArrayConstructor | any[]
     ? true
     : P extends { required: boolean }
       ? P extends { required: false }