chore(index.d.ts): pull any types into LeanDocuments correctly

Re: #8108
Automattic · Nov 17, 2020 · 16be7cb · 16be7cb
1 parent e6bab31
commit 16be7cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -1704,8 +1704,9 @@ declare module "mongoose" {
 
   export type DocumentDefinition<T> = Omit<T, Exclude<keyof Document, '_id'>>;
 
-  type FunctionPropertyNames<T> = { 
-    [K in keyof T]: T[K] extends Function ? K : never 
+  type FunctionPropertyNames<T> = {
+    // The 1 & T[K] check comes from: https://stackoverflow.com/questions/55541275/typescript-check-for-the-any-type
+    [K in keyof T]: 0 extends (1 & T[K]) ? never : (T[K] extends Function ? K : never) 
   }[keyof T];
   export type LeanDocument<T> = Omit<Omit<T, Exclude<keyof Document, '_id'>>, FunctionPropertyNames<T>>;
 

diff --git a/test/typescript/leanDocuments.ts b/test/typescript/leanDocuments.ts
@@ -5,6 +5,7 @@ const schema: Schema = new Schema({ name: { type: 'String' } });
 interface ITest extends Document {
   _id?: Types.ObjectId,
   name?: string;
+  mixed?: any;
   testMethod: () => number;
 }
 
@@ -24,6 +25,8 @@ void async function main() {
   await _doc.save();
 
   _doc.testMethod();
+  _doc.name = 'test';
+  _doc.mixed = 42;
 
   const hydrated = Test.hydrate(_doc);
   await hydrated.save();