Skip to content

Commit 58b0b0d

Browse files
committed
OperationBase => AbstractOperation
1 parent 4bc33fd commit 58b0b0d

14 files changed

+34
-34
lines changed

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ export type {
222222
MapReduceOptions,
223223
FinalizeFunction
224224
} from './operations/map_reduce';
225-
export type { Hint, OperationOptions, OperationBase } from './operations/operation';
225+
export type { Hint, OperationOptions, AbstractOperation as OperationBase } from './operations/operation';
226226
export type { ProfilingLevelOptions } from './operations/profiling_level';
227227
export type { RemoveUserOptions } from './operations/remove_user';
228228
export type { RenameOptions } from './operations/rename';

src/operations/bulk_write.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { applyRetryableWrites, Callback } from '../utils';
2-
import { Aspect, defineAspects, OperationBase } from './operation';
2+
import { Aspect, defineAspects, AbstractOperation } from './operation';
33
import type { Collection } from '../collection';
44
import type {
55
BulkOperationBase,
@@ -10,7 +10,7 @@ import type {
1010
import type { Server } from '../sdam/server';
1111

1212
/** @internal */
13-
export class BulkWriteOperation extends OperationBase<BulkWriteOptions, BulkWriteResult> {
13+
export class BulkWriteOperation extends AbstractOperation<BulkWriteOptions, BulkWriteResult> {
1414
collection: Collection;
1515
operations: AnyBulkWriteOperation[];
1616

src/operations/collections.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { OperationBase, OperationOptions } from './operation';
1+
import { AbstractOperation, OperationOptions } from './operation';
22
import { loadCollection } from '../dynamic_loaders';
33
import type { Callback } from '../utils';
44
import type { Db } from '../db';
@@ -12,7 +12,7 @@ export interface CollectionsOptions extends OperationOptions {
1212
}
1313

1414
/** @internal */
15-
export class CollectionsOperation extends OperationBase<CollectionsOptions, Collection[]> {
15+
export class CollectionsOperation extends AbstractOperation<CollectionsOptions, Collection[]> {
1616
db: Db;
1717

1818
constructor(db: Db, options: CollectionsOptions) {

src/operations/command.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Aspect, OperationBase, OperationOptions } from './operation';
1+
import { Aspect, AbstractOperation, OperationOptions } from './operation';
22
import { ReadConcern } from '../read_concern';
33
import { WriteConcern, WriteConcernOptions } from '../write_concern';
44
import { maxWireVersion, MongoDBNamespace, Callback, decorateWithExplain } from '../utils';
@@ -48,7 +48,7 @@ export interface OperationParent {
4848
}
4949

5050
/** @internal */
51-
export abstract class CommandOperation<TResult = Document> extends OperationBase {
51+
export abstract class CommandOperation<TResult = Document> extends AbstractOperation {
5252
options: CommandOperationOptions;
5353
ns: MongoDBNamespace;
5454
readConcern?: ReadConcern;

src/operations/delete.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { defineAspects, Aspect, OperationBase, Hint } from './operation';
1+
import { defineAspects, Aspect, AbstractOperation, Hint } from './operation';
22
import { removeDocuments } from './common_functions';
33
import { CommandOperation, CommandOperationOptions } from './command';
44
import { isObject } from 'util';
@@ -28,7 +28,7 @@ export interface DeleteResult {
2828
}
2929

3030
/** @internal */
31-
export class DeleteOperation extends OperationBase<DeleteOptions, Document> {
31+
export class DeleteOperation extends AbstractOperation<DeleteOptions, Document> {
3232
operations: Document[];
3333

3434
constructor(ns: MongoDBNamespace, ops: Document[], options: DeleteOptions) {

src/operations/execute_operation.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ReadPreference } from '../read_preference';
22
import { MongoError, isRetryableError, AnyError } from '../error';
3-
import { Aspect, OperationBase, OperationOptions } from './operation';
3+
import { Aspect, AbstractOperation, OperationOptions } from './operation';
44
import { maxWireVersion, maybePromise, Callback } from '../utils';
55
import { ServerType } from '../sdam/common';
66
import type { Server } from '../sdam/server';
@@ -12,13 +12,13 @@ const MMAPv1_RETRY_WRITES_ERROR_CODE = 20;
1212
const MMAPv1_RETRY_WRITES_ERROR_MESSAGE =
1313
'This MongoDB deployment does not support retryable writes. Please add retryWrites=false to your connection string.';
1414

15-
type ResultTypeFromOperation<TOperation> = TOperation extends OperationBase<
15+
type ResultTypeFromOperation<TOperation> = TOperation extends AbstractOperation<
1616
OperationOptions,
1717
infer K
1818
>
1919
? K
2020
: never;
21-
type OptionsFromOperation<TOperation> = TOperation extends OperationBase<infer K, unknown>
21+
type OptionsFromOperation<TOperation> = TOperation extends AbstractOperation<infer K, unknown>
2222
? K
2323
: never;
2424

@@ -48,26 +48,26 @@ export interface ExecutionResult {
4848
* @param callback - The command result callback
4949
*/
5050
export function executeOperation<
51-
T extends OperationBase<TOptions, TResult>,
51+
T extends AbstractOperation<TOptions, TResult>,
5252
TOptions = OptionsFromOperation<T>,
5353
TResult = ResultTypeFromOperation<T>
5454
>(topology: Topology, operation: T): Promise<TResult>;
5555
export function executeOperation<
56-
T extends OperationBase<TOptions, TResult>,
56+
T extends AbstractOperation<TOptions, TResult>,
5757
TOptions = OptionsFromOperation<T>,
5858
TResult = ResultTypeFromOperation<T>
5959
>(topology: Topology, operation: T, callback: Callback<TResult>): void;
6060
export function executeOperation<
61-
T extends OperationBase<TOptions, TResult>,
61+
T extends AbstractOperation<TOptions, TResult>,
6262
TOptions = OptionsFromOperation<T>,
6363
TResult = ResultTypeFromOperation<T>
6464
>(topology: Topology, operation: T, callback?: Callback<TResult>): Promise<TResult> | void;
6565
export function executeOperation<
66-
T extends OperationBase<TOptions, TResult>,
66+
T extends AbstractOperation<TOptions, TResult>,
6767
TOptions = OptionsFromOperation<T>,
6868
TResult = ResultTypeFromOperation<T>
6969
>(topology: Topology, operation: T, callback?: Callback<TResult>): Promise<TResult> | void {
70-
if (!(operation instanceof OperationBase)) {
70+
if (!(operation instanceof AbstractOperation)) {
7171
throw new TypeError('This method requires a valid operation instance');
7272
}
7373

src/operations/indexes.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { indexInformation, IndexInformationOptions } from './common_functions';
2-
import { OperationBase, Aspect, defineAspects } from './operation';
2+
import { AbstractOperation, Aspect, defineAspects } from './operation';
33
import { MongoError } from '../error';
44
import {
55
maxWireVersion,
@@ -126,7 +126,7 @@ function makeIndexSpec(indexSpec: IndexSpecification, options: any): IndexDescri
126126
}
127127

128128
/** @internal */
129-
export class IndexesOperation extends OperationBase<IndexInformationOptions, Document> {
129+
export class IndexesOperation extends AbstractOperation<IndexInformationOptions, Document> {
130130
collection: Collection;
131131

132132
constructor(collection: Collection, options: IndexInformationOptions) {
@@ -401,7 +401,7 @@ export class ListIndexesCursor extends AbstractCursor {
401401
}
402402

403403
/** @internal */
404-
export class IndexExistsOperation extends OperationBase<IndexInformationOptions, boolean> {
404+
export class IndexExistsOperation extends AbstractOperation<IndexInformationOptions, boolean> {
405405
collection: Collection;
406406
indexes: string | string[];
407407

@@ -440,7 +440,7 @@ export class IndexExistsOperation extends OperationBase<IndexInformationOptions,
440440
}
441441

442442
/** @internal */
443-
export class IndexInformationOperation extends OperationBase<IndexInformationOptions, Document> {
443+
export class IndexInformationOperation extends AbstractOperation<IndexInformationOptions, Document> {
444444
db: Db;
445445
name: string;
446446

src/operations/insert.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { MongoError } from '../error';
2-
import { defineAspects, Aspect, OperationBase } from './operation';
2+
import { defineAspects, Aspect, AbstractOperation } from './operation';
33
import { CommandOperation } from './command';
44
import { applyRetryableWrites, Callback, MongoDBNamespace } from '../utils';
55
import { prepareDocs } from './common_functions';
@@ -12,7 +12,7 @@ import type { BulkWriteOptions } from '../bulk/common';
1212
import type { WriteConcernOptions } from '../write_concern';
1313

1414
/** @internal */
15-
export class InsertOperation extends OperationBase<BulkWriteOptions, Document> {
15+
export class InsertOperation extends AbstractOperation<BulkWriteOptions, Document> {
1616
operations: Document[];
1717

1818
constructor(ns: MongoDBNamespace, ops: Document[], options: BulkWriteOptions) {

src/operations/insert_many.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Aspect, defineAspects, OperationBase } from './operation';
1+
import { Aspect, defineAspects, AbstractOperation } from './operation';
22
import { BulkWriteOperation } from './bulk_write';
33
import { MongoError } from '../error';
44
import { prepareDocs } from './common_functions';
@@ -21,7 +21,7 @@ export interface InsertManyResult {
2121
}
2222

2323
/** @internal */
24-
export class InsertManyOperation extends OperationBase<BulkWriteOptions, InsertManyResult> {
24+
export class InsertManyOperation extends AbstractOperation<BulkWriteOptions, InsertManyResult> {
2525
collection: Collection;
2626
docs: Document[];
2727

src/operations/is_capped.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import type { Callback } from '../utils';
22
import type { Collection } from '../collection';
3-
import { OperationOptions, OperationBase } from './operation';
3+
import { OperationOptions, AbstractOperation } from './operation';
44
import type { Server } from '../sdam/server';
55
import { MongoError } from '..';
66

77
/** @internal */
8-
export class IsCappedOperation extends OperationBase<OperationOptions, boolean> {
8+
export class IsCappedOperation extends AbstractOperation<OperationOptions, boolean> {
99
collection: Collection;
1010

1111
constructor(collection: Collection, options: OperationOptions) {

src/operations/operation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export interface OperationOptions extends BSONSerializeOptions {
3535
* a specific aspect.
3636
* @internal
3737
*/
38-
export abstract class OperationBase<
38+
export abstract class AbstractOperation<
3939
T extends OperationOptions = OperationOptions,
4040
TResult = Document
4141
> {

src/operations/options_operation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { OperationBase, OperationOptions } from './operation';
1+
import { AbstractOperation, OperationOptions } from './operation';
22
import { MongoError } from '../error';
33
import type { Callback } from '../utils';
44
import type { Document } from '../bson';
55
import type { Collection } from '../collection';
66
import type { Server } from '../sdam/server';
77

88
/** @internal */
9-
export class OptionsOperation extends OperationBase<OperationOptions, Document> {
9+
export class OptionsOperation extends AbstractOperation<OperationOptions, Document> {
1010
collection: Collection;
1111

1212
constructor(collection: Collection, options: OperationOptions) {

src/operations/update.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { defineAspects, Aspect, OperationBase } from './operation';
1+
import { defineAspects, Aspect, AbstractOperation } from './operation';
22
import { updateDocuments } from './common_functions';
33
import { hasAtomicOperators, MongoDBNamespace, Callback } from '../utils';
44
import { CommandOperation, CommandOperationOptions } from './command';
@@ -41,7 +41,7 @@ export interface UpdateResult {
4141
}
4242

4343
/** @internal */
44-
export class UpdateOperation extends OperationBase<UpdateOptions, Document> {
44+
export class UpdateOperation extends AbstractOperation<UpdateOptions, Document> {
4545
operations: Document[];
4646

4747
constructor(ns: MongoDBNamespace, ops: Document[], options: UpdateOptions) {

src/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type { Topology } from './sdam/topology';
88
import type { EventEmitter } from 'events';
99
import type { Db } from './db';
1010
import type { Collection } from './collection';
11-
import type { OperationOptions, OperationBase, Hint } from './operations/operation';
11+
import type { OperationOptions, AbstractOperation, Hint } from './operations/operation';
1212
import type { ClientSession } from './sessions';
1313
import { ReadConcern } from './read_concern';
1414
import type { Connection } from './cmap/connection';
@@ -232,7 +232,7 @@ export function filterOptions(options: AnyOptions, names: string[]): AnyOptions
232232
* @param args - Arguments to apply the provided operation
233233
* @param options - Options that modify the behavior of the method
234234
*/
235-
export function executeLegacyOperation<T extends OperationBase>(
235+
export function executeLegacyOperation<T extends AbstractOperation>(
236236
topology: Topology,
237237
operation: (...args: any[]) => void | Promise<Document>,
238238
args: any[],

0 commit comments

Comments
 (0)