chore: clean up some inconsistencies with mongodbs new TS types

Automattic · Feb 2, 2021 · baf3938 · baf3938
1 parent 26f25c1
commit baf3938
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -1740,8 +1740,9 @@ declare module 'mongoose' {
       toObject(options?: ToObjectOptions & { flattenMaps?: boolean }): any;
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-empty-interface
-    interface ObjectId extends mongodb.ObjectId { }
+    class ObjectId extends mongodb.ObjectId {
+      _id: this;
+    }
 
     class Subdocument extends Document {
       $isSingleNested: true;
@@ -2218,12 +2219,14 @@ declare module 'mongoose' {
   };
 
   type ReadonlyPartial<TSchema> = {
-      readonly [key in keyof TSchema]?: TSchema[key];
+    readonly [key in keyof TSchema]?: TSchema[key];
   };
 
   type MatchKeysAndValues<TSchema> = ReadonlyPartial<TSchema> & DotAndArrayNotation<any>;
 
-  type Condition<T> = T | QuerySelector<T>;
+  type AllowRegexpForStrings<T> = T extends string ? T | RegExp : T;
+
+  type Condition<T> = AllowRegexpForStrings<T> | QuerySelector<T>;
 
   type _FilterQuery<T> = {
     [P in keyof T]?: P extends '_id'

diff --git a/test/typescript/objectid.ts b/test/typescript/objectid.ts
@@ -4,4 +4,4 @@ const oid = new Types.ObjectId();
 oid.toHexString();
 oid._id;
 
-Types.ObjectId().toHexString();
+(new Types.ObjectId()).toHexString();