fix: generic constraint relaxing

mongodb · Apr 1, 2022 · 05bd89f · 05bd89f
1 parent f990b3b
commit 05bd89f
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 37 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
  "source-map-support": "^0.5.21",
  "standard-version": "^9.3.2",
  "ts-node": "^10.7.0",
- "tsd": "^0.19.1",
+ "tsd": "^0.20.0",
  "typescript": "^4.6.3",
  "typescript-cached-transpile": "^0.0.6",
  "xml2js": "^0.4.23",

diff --git a/src/cursor/abstract_cursor.ts b/src/cursor/abstract_cursor.ts
@@ -102,7 +102,7 @@ export type AbstractCursorEvents = {
 
 /** @public */
 export abstract class AbstractCursor<
- TSchema extends Document = any,
+ TSchema = any,
  CursorEvents extends AbstractCursorEvents = AbstractCursorEvents
 > extends TypedEventEmitter<CursorEvents> {
  /** @internal */
@@ -118,7 +118,7 @@ export abstract class AbstractCursor<
  /** @internal */
  [kTopology]: Topology;
  /** @internal */
- [kTransform]?: (doc: TSchema) => Document;
+ [kTransform]?: (doc: TSchema) => any;
  /** @internal */
  [kInitialized]: boolean;
  /** @internal */
@@ -477,7 +477,7 @@ export abstract class AbstractCursor<
  * ```
  * @param transform - The mapping transformation method.
  */
- map<T extends Document = any>(transform: (doc: TSchema) => T): AbstractCursor<T> {
+ map<T = any>(transform: (doc: TSchema) => T): AbstractCursor<T> {
  assertUninitialized(this);
  const oldTransform = this[kTransform] as (doc: TSchema) => TSchema; // TODO(NODE-3283): Improve transform typing
  if (oldTransform) {
@@ -622,7 +622,7 @@ export abstract class AbstractCursor<
  }
 }
 
-function nextDocument<T extends Document>(cursor: AbstractCursor): T | null {
+function nextDocument<T>(cursor: AbstractCursor): T | null {
  if (cursor[kDocuments] == null || !cursor[kDocuments].length) {
  return null;
  }
@@ -640,11 +640,7 @@ function nextDocument<T extends Document>(cursor: AbstractCursor): T | null {
  return null;
 }
 
-function next<T extends Document>(
- cursor: AbstractCursor,
- blocking: boolean,
- callback: Callback<T | null>
-): void {
+function next<T>(cursor: AbstractCursor<T>, blocking: boolean, callback: Callback<T | null>): void {
  const cursorId = cursor[kId];
  if (cursor.closed) {
  return callback(undefined, null);
@@ -823,7 +819,7 @@ export function assertUninitialized(cursor: AbstractCursor): void {
  }
 }
 
-function makeCursorStream<TSchema extends Document>(cursor: AbstractCursor<TSchema>) {
+function makeCursorStream(cursor: AbstractCursor) {
  const readable = new Readable({
  objectMode: true,
  autoDestroy: false,

diff --git a/src/cursor/aggregation_cursor.ts b/src/cursor/aggregation_cursor.ts
@@ -25,9 +25,7 @@ const kOptions = Symbol('options');
  * or higher stream
  * @public
  */
-export class AggregationCursor<
- TSchema extends Document = Document
-> extends AbstractCursor<TSchema> {
+export class AggregationCursor<TSchema = any> extends AbstractCursor<TSchema> {
  /** @internal */
  [kPipeline]: Document[];
  /** @internal */
@@ -58,7 +56,7 @@ export class AggregationCursor<
  });
  }
 
- override map<T extends Document>(transform: (doc: TSchema) => T): AggregationCursor<T> {
+ override map<T>(transform: (doc: TSchema) => T): AggregationCursor<T> {
  return super.map(transform) as AggregationCursor<T>;
  }
 
@@ -101,7 +99,7 @@ export class AggregationCursor<
  }
 
  /** Add a group stage to the aggregation pipeline */
- group<T extends Document = TSchema>($group: Document): AggregationCursor<T>;
+ group<T = TSchema>($group: Document): AggregationCursor<T>;
  group($group: Document): this {
  assertUninitialized(this);
  this[kPipeline].push({ $group });

diff --git a/src/cursor/find_cursor.ts b/src/cursor/find_cursor.ts
@@ -30,7 +30,7 @@ export const FLAGS = [
 ] as const;
 
 /** @public */
-export class FindCursor<TSchema extends Document = Document> extends AbstractCursor<TSchema> {
+export class FindCursor<TSchema = any> extends AbstractCursor<TSchema> {
  /** @internal */
  [kFilter]: Document;
  /** @internal */
@@ -63,7 +63,7 @@ export class FindCursor<TSchema extends Document = Document> extends AbstractCur
  });
  }
 
- override map<T extends Document>(transform: (doc: TSchema) => T): FindCursor<T> {
+ override map<T>(transform: (doc: TSchema) => T): FindCursor<T> {
  return super.map(transform) as FindCursor<T>;
  }
 

diff --git a/test/types/community/collection/insertX.test-d.ts b/test/types/community/collection/insertX.test-d.ts
@@ -133,8 +133,9 @@ expectError(
 );
 
 // defined _id's that are not of type ObjectId cannot be cast to ObjectId
-const collectionWithRequiredNumericId =
- db.collection<{ _id: number; otherField: string }>('testCollection');
+const collectionWithRequiredNumericId = db.collection<{ _id: number; otherField: string }>(
+ 'testCollection'
+);
 
 expectError(
  collectionWithRequiredNumericId.insertOne({
@@ -143,8 +144,9 @@ expectError(
  })
 );
 
-const collectionWithOptionalNumericId =
- db.collection<{ _id?: number; otherField: string }>('testCollection');
+const collectionWithOptionalNumericId = db.collection<{ _id?: number; otherField: string }>(
+ 'testCollection'
+);
 
 expectError(
  collectionWithOptionalNumericId.insertOne({