types: correct schema inference for doubles

Automattic · Feb 25, 2025 · 6be3df0 · 6be3df0
1 parent a8d2f2f
commit 6be3df0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
@@ -1738,3 +1738,11 @@ function gh15244() {
   const schema = new Schema({});
   schema.discriminator('Name', new Schema({}), { value: 'value' });
 }
+
+async function schemaDouble() {
+  const schema = new Schema({ balance: 'Double' });
+  const TestModel = model('Test', schema);
+
+  const doc = await TestModel.findOne().orFail();
+  expectType<Types.Double | null | undefined>(doc.balance);
+}
diff --git a/types/inferschematype.d.ts b/types/inferschematype.d.ts
@@ -312,14 +312,15 @@ type ResolvePathType<PathValueType, Options extends SchemaTypeOptions<PathValueT
                                               IfEquals<PathValueType, BigInt> extends true ? bigint :
                                                 PathValueType extends 'bigint' | 'BigInt' | typeof Schema.Types.BigInt | typeof BigInt ? bigint :
                                                   PathValueType extends 'uuid' | 'UUID' | typeof Schema.Types.UUID ? Buffer :
-                                                    IfEquals<PathValueType, Schema.Types.UUID> extends true ? Buffer :
-                                                      PathValueType extends MapConstructor | 'Map' ? Map<string, ResolvePathType<Options['of']>> :
-                                                        IfEquals<PathValueType, typeof Schema.Types.Map> extends true ? Map<string, ResolvePathType<Options['of']>> :
-                                                          PathValueType extends ArrayConstructor ? any[] :
-                                                            PathValueType extends typeof Schema.Types.Mixed ? any:
-                                                              IfEquals<PathValueType, ObjectConstructor> extends true ? any:
-                                                                IfEquals<PathValueType, {}> extends true ? any:
-                                                                  PathValueType extends typeof SchemaType ? PathValueType['prototype'] :
-                                                                    PathValueType extends Record<string, any> ? ObtainDocumentType<PathValueType, any, { typeKey: TypeKey }> :
-                                                                      unknown,
+                                                    PathValueType extends 'double' | 'Double' | typeof Schema.Types.Double ? Types.Double :
+                                                      IfEquals<PathValueType, Schema.Types.UUID> extends true ? Buffer :
+                                                        PathValueType extends MapConstructor | 'Map' ? Map<string, ResolvePathType<Options['of']>> :
+                                                          IfEquals<PathValueType, typeof Schema.Types.Map> extends true ? Map<string, ResolvePathType<Options['of']>> :
+                                                            PathValueType extends ArrayConstructor ? any[] :
+                                                              PathValueType extends typeof Schema.Types.Mixed ? any:
+                                                                IfEquals<PathValueType, ObjectConstructor> extends true ? any:
+                                                                  IfEquals<PathValueType, {}> extends true ? any:
+                                                                    PathValueType extends typeof SchemaType ? PathValueType['prototype'] :
+                                                                      PathValueType extends Record<string, any> ? ObtainDocumentType<PathValueType, any, { typeKey: TypeKey }> :
+                                                                        unknown,
   TypeHint>;