Merge pull request #15791 from Automattic/vkarpov15/gh-15779

types(query+model): use function overrides instead of `| Query<any, any>` to support using Query as filter

Author: vkarpov15

scripts/tsc-diagnostics-check.js

@@ -3,7 +3,7 @@
 const fs = require('fs');
 
 const stdin = fs.readFileSync(0).toString('utf8');
-const maxInstantiations = isNaN(process.argv[2]) ? 350000 : parseInt(process.argv[2], 10);
+const maxInstantiations = isNaN(process.argv[2]) ? 375000 : parseInt(process.argv[2], 10);
 
 console.log(stdin);
 

test/types/queries.test.ts

@@ -827,6 +827,31 @@ function gh15671() {
   };
 }
 
+async function gh15779() {
+  type Entity = {
+    id: string;
+    age: number;
+    name: string;
+  };
+
+  function getV8FilterQuery(filter: QueryFilter<Entity>): QueryFilter<Entity> {
+    return { ...filter, deletedAt: null };
+  }
+
+  const v8Filter = getV8FilterQuery({ age: { $gt: 18 } });
+
+  v8Filter.name = 'test';
+
+  expectAssignable<typeof v8Filter.age>(42);
+  expectNotAssignable<typeof v8Filter.age>('taco');
+
+  const TestModel = model('Test', new Schema({ age: Number, name: String }));
+  const query = TestModel.find({ age: { $gt: 18 } });
+  TestModel.find(query); // Should compile without errors
+  TestModel.findOne(query);
+  TestModel.deleteMany(query);
+}
+
 async function gh15786() {
   interface IDoc {
     nmae: string;