Merge pull request #14882 from Automattic/vkarpov15/gh-14839

type(inferrawdoctype): infer Date types as JS dates rather than Mongoose SchemaType Date
Automattic · Sep 11, 2024 · 36fa0c0 · 36fa0c0
2 parents 286ab98 + 180f5d9
commit 36fa0c0
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/test/types/inferrawdoctype.test.ts b/test/types/inferrawdoctype.test.ts
@@ -0,0 +1,25 @@
+import { InferRawDocType } from 'mongoose';
+import { expectType, expectError } from 'tsd';
+
+function gh14839() {
+  const schemaDefinition = {
+    email: {
+      type: String,
+      trim: true,
+      required: true,
+      unique: true,
+      lowercase: true
+    },
+    password: {
+      type: String,
+      required: true
+    },
+    dateOfBirth: {
+      type: Date,
+      required: true
+    }
+  };
+
+  type UserType = InferRawDocType< typeof schemaDefinition>;
+  expectType<{ email: string, password: string, dateOfBirth: Date }>({} as UserType);
+}
diff --git a/types/inferrawdoctype.d.ts b/types/inferrawdoctype.d.ts
@@ -91,8 +91,8 @@ declare module 'mongoose' {
             IfEquals<PathValueType, String> extends true ? PathEnumOrString<Options['enum']> :
               PathValueType extends NumberSchemaDefinition ? Options['enum'] extends ReadonlyArray<any> ? Options['enum'][number] : number :
                 IfEquals<PathValueType, Schema.Types.Number> extends true ? number :
-                  PathValueType extends DateSchemaDefinition ? Date :
-                    IfEquals<PathValueType, Schema.Types.Date> extends true ? Date :
+                  PathValueType extends DateSchemaDefinition ? NativeDate :
+                    IfEquals<PathValueType, Schema.Types.Date> extends true ? NativeDate :
                       PathValueType extends typeof Buffer | 'buffer' | 'Buffer' | typeof Schema.Types.Buffer ? Buffer :
                         PathValueType extends BooleanSchemaDefinition ? boolean :
                           IfEquals<PathValueType, Schema.Types.Boolean> extends true ? boolean :

diff --git a/types/inferschematype.d.ts b/types/inferschematype.d.ts
@@ -281,8 +281,8 @@ type ResolvePathType<PathValueType, Options extends SchemaTypeOptions<PathValueT
               IfEquals<PathValueType, String> extends true ? PathEnumOrString<Options['enum']> :
                 PathValueType extends NumberSchemaDefinition ? Options['enum'] extends ReadonlyArray<any> ? Options['enum'][number] : number :
                   IfEquals<PathValueType, Schema.Types.Number> extends true ? number :
-                    PathValueType extends DateSchemaDefinition ? Date :
-                      IfEquals<PathValueType, Schema.Types.Date> extends true ? Date :
+                    PathValueType extends DateSchemaDefinition ? NativeDate :
+                      IfEquals<PathValueType, Schema.Types.Date> extends true ? NativeDate :
                         PathValueType extends typeof Buffer | 'buffer' | 'Buffer' | typeof Schema.Types.Buffer ? Buffer :
                           PathValueType extends BooleanSchemaDefinition ? boolean :
                             IfEquals<PathValueType, Schema.Types.Boolean> extends true ? boolean :