fix: move tests to another directory to prevent mocha discovery and remove abstract cursor generic constraint

Author: nbbeeken

.gitignore

@@ -56,7 +56,7 @@ lib/
 *.tgz
 *.d.ts
 # type definition tests
-!test/unit/types
+!test/types
 
 .vscode
 output

package.json

@@ -115,6 +115,6 @@
     "test": "npm run check:lint && npm run check:test"
   },
   "tsd": {
-    "directory": "test/unit/types"
+    "directory": "test/types"
   }
 }

src/cursor/abstract_cursor.ts

@@ -74,7 +74,7 @@ export type InternalAbstractCursorOptions = Omit<AbstractCursorOptions, 'readPre
 };
 
 /** @public */
-export abstract class AbstractCursor<TSchema extends Document = any> extends EventEmitter {
+export abstract class AbstractCursor<TSchema = any> extends EventEmitter {
   /** @internal */
   [kId]?: Long;
   /** @internal */
@@ -303,15 +303,15 @@ export abstract class AbstractCursor<TSchema extends Document = any> extends Eve
           if (doc == null) return done();
 
           // NOTE: no need to transform because `next` will do this automatically
-          let result = iterator(doc as TSchema); // TODO_OPERATIONS_LAYER - We need to work with the transform return type somehow
+          let result = iterator(doc as TSchema); // TODO_NODE_2648 - We need to work with the transform return type somehow
           if (result === false) return done();
 
           // these do need to be transformed since they are copying the rest of the batch
           const internalDocs = this[kDocuments].splice(0, this[kDocuments].length);
           if (internalDocs) {
             for (let i = 0; i < internalDocs.length; ++i) {
               result = iterator(
-                (transform ? transform(internalDocs[i]) : internalDocs[i]) as TSchema // TODO_OPERATIONS_LAYER - We need to work with the transform return type somehow
+                (transform ? transform(internalDocs[i]) : internalDocs[i]) as TSchema // TODO_NODE_2648 - We need to work with the transform return type somehow
               );
               if (result === false) return done();
             }
@@ -401,7 +401,7 @@ export abstract class AbstractCursor<TSchema extends Document = any> extends Eve
           // these do need to be transformed since they are copying the rest of the batch
           const internalDocs = (transform
             ? this[kDocuments].splice(0, this[kDocuments].length).map(transform)
-            : this[kDocuments].splice(0, this[kDocuments].length)) as TSchema[]; // TODO_OPERATIONS_LAYER - We need to work with the transform return type somehow
+            : this[kDocuments].splice(0, this[kDocuments].length)) as TSchema[]; // TODO_NODE_2648 - We need to work with the transform return type somehow
 
           if (internalDocs) {
             docs.push(...internalDocs);
@@ -442,9 +442,9 @@ export abstract class AbstractCursor<TSchema extends Document = any> extends Eve
    *
    * @param transform - The mapping transformation method.
    */
-  map<TResult>(transform: (doc: TSchema) => TResult): this {
+  map<TResult = any>(transform: (doc: TSchema) => TResult): this {
     assertUninitialized(this);
-    const oldTransform = this[kTransform] as (doc: TSchema) => TSchema; // TODO_OPERATIONS_LAYER - We need to work with the transform return type somehow
+    const oldTransform = this[kTransform] as (doc: TSchema) => TSchema; // TODO_NODE_2648 - We need to work with the transform return type somehow
     if (oldTransform) {
       this[kTransform] = doc => {
         return transform(oldTransform(doc));

src/index.ts

@@ -352,7 +352,6 @@ export type {
   Query,
   Projection,
   InferIdType,
-  WithId as ObjectWithId,
   ProjectionOperators,
   MetaProjectionOperators,
   MetaSortOperators

test/unit/types/basic_schema.test-d.ts renamed to test/types/basic_schema.test-d.ts

@@ -1,10 +1,10 @@
 import { expectType } from 'tsd';
 
-import { Collection } from '../../.../../../src/collection';
-import type { ObjectId } from '../../../src/bson';
-import { Db } from '../../../src/db';
-import { MongoClient } from '../../../src/mongo_client';
-import type { InferIdType } from '../../../src/mongo_types';
+import { Collection } from '../../src/collection';
+import type { ObjectId } from '../../src/bson';
+import { Db } from '../../src/db';
+import { MongoClient } from '../../src/mongo_client';
+import type { InferIdType } from '../../src/mongo_types';
 
 const db = new Db(new MongoClient(''), '');
 

test/types/distinct.test-d.ts

@@ -0,0 +1,12 @@
+import { expectType } from 'tsd';
+
+import { Db } from '../../src/db';
+import { MongoClient } from '../../src/mongo_client';
+import type { Movie } from './example_schemas';
+
+const db = new Db(new MongoClient(''), '');
+const collection = db.collection<Movie>('');
+
+// Ensure distinct takes all keys of the schema plus '_id'
+let x = (null as unknown) as Parameters<typeof collection.distinct>[0];
+expectType<'_id' | keyof Movie>(x);

test/unit/types/example_schemas.ts renamed to test/types/example_schemas.ts

@@ -1,4 +1,4 @@
-import { Double, Int32 } from '../../../src/bson';
+import type { Double, Int32 } from '../../src/bson';
 
 export type MediaType = 'movie' | 'tv' | 'web series';
 

test/unit/types/indexed_schema.test-d.ts renamed to test/types/indexed_schema.test-d.ts

@@ -1,14 +1,9 @@
-import { expectDeprecated, expectType, expectNotType, expectError, expectAssignable } from 'tsd';
+import { expectType, expectNotType, expectError, expectAssignable } from 'tsd';
 
-import { Collection } from '../../.../../../src/collection';
-import { ObjectId } from '../../../src/bson';
-import { Db } from '../../../src/db';
-import { MongoClient } from '../../../src/mongo_client';
-import type { InferIdType } from '../../../src/mongo_types';
-
-expectDeprecated(Collection.prototype.insert);
-expectDeprecated(Collection.prototype.update);
-expectDeprecated(Collection.prototype.remove);
+import { Collection } from '../../src/collection';
+import { ObjectId } from '../../src/bson';
+import { Db } from '../../src/db';
+import { MongoClient } from '../../src/mongo_client';
 
 const db = new Db(new MongoClient(''), '');
 

test/unit/types/mongodb.test-d.ts renamed to test/types/mongodb.test-d.ts

@@ -1,10 +1,10 @@
 import { expectDeprecated, expectType, expectNotType, expectError, expectAssignable } from 'tsd';
 
-import { Collection } from '../../.../../../src/collection';
-import { AggregationCursor } from '../../../src/cursor/aggregation_cursor';
-import { Db } from '../../../src/db';
-import { MongoError } from '../../../src/error';
-import { MongoClient } from '../../../src/mongo_client';
+import { Collection } from '../../src//collection';
+import { AggregationCursor } from '../../src//cursor/aggregation_cursor';
+import { Db } from '../../src//db';
+import { MongoError } from '../../src//error';
+import { MongoClient } from '../../src//mongo_client';
 
 expectDeprecated(Collection.prototype.insert);
 expectDeprecated(Collection.prototype.update);

test/unit/types/union_schema.test-d.ts renamed to test/types/union_schema.test-d.ts

@@ -1,9 +1,9 @@
 import { expectType, expectError, expectNotType } from 'tsd';
 
-import { Collection } from '../../.../../../src/collection';
-import { ObjectId } from '../../../src/bson';
-import { Db } from '../../../src/db';
-import { MongoClient } from '../../../src/mongo_client';
+import { Collection } from '../../src/collection';
+import { ObjectId } from '../../src/bson';
+import { Db } from '../../src//db';
+import { MongoClient } from '../../src//mongo_client';
 
 type InsertRes<TId = ObjectId> = Promise<{ acknowledged: boolean; insertedId: TId }>;