@mongosh/service-provider-core 3.7.0 → 5.0.0

package/lib/readable.d.ts

@@ -1,3 +1,4 @@
+import type { Abortable } from 'events';
 import type { Document, AggregateOptions, CountOptions, CountDocumentsOptions, DistinctOptions, EstimatedDocumentCountOptions, FindOptions, ListCollectionsOptions, ListIndexesOptions, DbOptions, ReadPreferenceFromOptions, ReadPreferenceLike, TopologyType, ServerType } from './all-transport-types';
 import type { ChangeStreamOptions } from './all-transport-types';
 import type { ServiceProviderAggregationCursor, ServiceProviderChangeStream, ServiceProviderFindCursor } from './cursors';
@@ -11,16 +12,16 @@ export interface TopologyDescription {
     servers?: Map<string, ServerDescription>;
 }
 export default interface Readable {
-    aggregate(database: string, collection: string, pipeline: Document[], options?: AggregateOptions, dbOptions?: DbOptions): ServiceProviderAggregationCursor;
-    aggregateDb(database: string, pipeline: Document[], options?: AggregateOptions, dbOptions?: DbOptions): ServiceProviderAggregationCursor;
+    aggregate(database: string, collection: string, pipeline: Document[], options?: AggregateOptions & Abortable, dbOptions?: DbOptions): ServiceProviderAggregationCursor;
+    aggregateDb(database: string, pipeline: Document[], options?: AggregateOptions & Abortable, dbOptions?: DbOptions): ServiceProviderAggregationCursor;
     count(db: string, coll: string, query?: Document, options?: CountOptions, dbOptions?: DbOptions): Promise<number>;
-    countDocuments(database: string, collection: string, filter?: Document, options?: CountDocumentsOptions, dbOptions?: DbOptions): Promise<number>;
+    countDocuments(database: string, collection: string, filter?: Document, options?: CountDocumentsOptions & Abortable, dbOptions?: DbOptions): Promise<number>;
     distinct(database: string, collection: string, fieldName: string, filter?: Document, options?: DistinctOptions, dbOptions?: DbOptions): Promise<Document>;
     estimatedDocumentCount(database: string, collection: string, options?: EstimatedDocumentCountOptions, dbOptions?: DbOptions): Promise<number>;
-    find(database: string, collection: string, filter?: Document, options?: FindOptions, dbOptions?: DbOptions): ServiceProviderFindCursor;
+    find(database: string, collection: string, filter?: Document, options?: FindOptions & Abortable, dbOptions?: DbOptions): ServiceProviderFindCursor;
     getTopologyDescription(): TopologyDescription | undefined;
     getIndexes(database: string, collection: string, options: ListIndexesOptions, dbOptions?: DbOptions): Promise<Document[]>;
-    listCollections(database: string, filter?: Document, options?: ListCollectionsOptions, dbOptions?: DbOptions): Promise<Document[]>;
+    listCollections(database: string, filter?: Document, options?: ListCollectionsOptions & Abortable, dbOptions?: DbOptions): Promise<Document[]>;
     readPreferenceFromOptions(options?: Omit<ReadPreferenceFromOptions, 'session'>): ReadPreferenceLike | undefined;
     watch(pipeline: Document[], options: ChangeStreamOptions, dbOptions?: DbOptions, db?: string, coll?: string): ServiceProviderChangeStream;
     getSearchIndexes(database: string, collection: string, indexName?: string, options?: Document, dbOptions?: DbOptions): Promise<Document[]>;

package/lib/writable.d.ts

@@ -1,9 +1,10 @@
+import type { Abortable } from 'events';
 import type { RunCursorCommandOptions } from 'mongodb';
 import type { Document, InsertOneOptions, InsertOneResult, Collection, RenameOptions, FindOneAndDeleteOptions, FindOneAndReplaceOptions, FindOneAndUpdateOptions, BulkWriteOptions, AnyBulkWriteOperation, AnyClientBulkWriteModel, ClientBulkWriteResult, ClientBulkWriteOptions, DeleteOptions, DeleteResult, InsertManyResult, ReplaceOptions, UpdateResult, UpdateOptions, DropDatabaseOptions, CreateIndexesOptions, DropCollectionOptions, BulkWriteResult, RunCommandOptions, DbOptions, OrderedBulkOperation, UnorderedBulkOperation, SearchIndexDescription } from './all-transport-types';
 import type { ServiceProviderRunCommandCursor } from './cursors';
 export default interface Writable {
-    runCommand(db: string, spec: Document, options: RunCommandOptions, dbOptions?: DbOptions): Promise<Document>;
-    runCommandWithCheck(db: string, spec: Document, options: RunCommandOptions, dbOptions?: DbOptions): Promise<Document>;
+    runCommand(db: string, spec: Document, options: RunCommandOptions & Abortable, dbOptions?: DbOptions): Promise<Document>;
+    runCommandWithCheck(db: string, spec: Document, options: RunCommandOptions & Abortable, dbOptions?: DbOptions): Promise<Document>;
     runCursorCommand(db: string, spec: Document, options: RunCursorCommandOptions, dbOptions?: DbOptions): ServiceProviderRunCommandCursor;
     dropDatabase(database: string, options: DropDatabaseOptions, dbOptions?: DbOptions): Promise<Document>;
     bulkWrite(database: string, collection: string, requests: AnyBulkWriteOperation[], options: BulkWriteOptions, dbOptions?: DbOptions): Promise<BulkWriteResult>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/service-provider-core",
-  "version": "3.7.0",
+  "version": "5.0.0",
   "description": "MongoDB Shell Core Service Provider Package",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -20,8 +20,7 @@
     "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci",
     "eslint": "eslint",
     "lint": "npm run eslint . && npm run prettier -- --check .",
-    "check": "npm run lint && npm run depcheck",
-    "depcheck": "depcheck",
+    "check": "npm run lint",
     "prettier": "prettier",
     "reformat": "npm run prettier -- --write . && npm run eslint -- --fix"
   },
@@ -36,20 +35,19 @@
     "unitTestsOnly": true
   },
   "dependencies": {
-    "@mongosh/errors": "2.4.5",
-    "@mongosh/shell-bson": "1.1.0",
-    "bson": "^6.10.4",
-    "mongodb": "^6.19.0",
-    "mongodb-build-info": "^1.8.1",
-    "mongodb-connection-string-url": "^3.0.2"
+    "@mongosh/errors": "2.4.6",
+    "@mongosh/shell-bson": "3.0.0",
+    "bson": "^7.2.0",
+    "mongodb": "^7.1.0",
+    "mongodb-build-info": "^1.9.5",
+    "mongodb-connection-string-url": "^7.0.1"
   },
   "devDependencies": {
     "@mongodb-js/eslint-config-mongosh": "^1.0.0",
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
     "@mongodb-js/tsconfig-mongosh": "^1.0.0",
-    "depcheck": "^1.4.7",
     "eslint": "^7.25.0",
     "prettier": "^2.8.8"
   },
-  "gitHead": "d2069810a846a535c51c88929224a57e49960778"
+  "gitHead": "1ae76759bb28ace817059c00cfefa6055aec35c4"
 }

package/src/readable.ts

@@ -1,3 +1,4 @@
+import type { Abortable } from 'events';
 import type {
   Document,
   AggregateOptions,
@@ -51,7 +52,7 @@ export default interface Readable {
     database: string,
     collection: string,
     pipeline: Document[],
-    options?: AggregateOptions,
+    options?: AggregateOptions & Abortable,
     dbOptions?: DbOptions
   ): ServiceProviderAggregationCursor;
 
@@ -68,7 +69,7 @@ export default interface Readable {
   aggregateDb(
     database: string,
     pipeline: Document[],
-    options?: AggregateOptions,
+    options?: AggregateOptions & Abortable,
     dbOptions?: DbOptions
   ): ServiceProviderAggregationCursor;
 
@@ -109,7 +110,7 @@ export default interface Readable {
     database: string,
     collection: string,
     filter?: Document,
-    options?: CountDocumentsOptions,
+    options?: CountDocumentsOptions & Abortable,
     dbOptions?: DbOptions
   ): Promise<number>;
 
@@ -166,7 +167,7 @@ export default interface Readable {
     database: string,
     collection: string,
     filter?: Document,
-    options?: FindOptions,
+    options?: FindOptions & Abortable,
     dbOptions?: DbOptions
   ): ServiceProviderFindCursor;
 
@@ -206,7 +207,7 @@ export default interface Readable {
   listCollections(
     database: string,
     filter?: Document,
-    options?: ListCollectionsOptions,
+    options?: ListCollectionsOptions & Abortable,
     dbOptions?: DbOptions
   ): Promise<Document[]>;
 

package/src/writable.ts

@@ -1,3 +1,4 @@
+import type { Abortable } from 'events';
 import type { RunCursorCommandOptions } from 'mongodb';
 import type {
   Document,
@@ -45,7 +46,7 @@ export default interface Writable {
   runCommand(
     db: string,
     spec: Document,
-    options: RunCommandOptions,
+    options: RunCommandOptions & Abortable,
     dbOptions?: DbOptions
   ): Promise<Document>;
 
@@ -59,7 +60,7 @@ export default interface Writable {
   runCommandWithCheck(
     db: string,
     spec: Document,
-    options: RunCommandOptions,
+    options: RunCommandOptions & Abortable,
     dbOptions?: DbOptions
   ): Promise<Document>;
 

package/.depcheckrc

@@ -1,11 +0,0 @@
-ignores:
- - '@mongodb-js/eslint-config-mongosh'
- - '@mongodb-js/tsconfig-mongosh'
- - '@mongodb-js/prettier-config-devtools'
- - '@typescript-eslint/parser'
- - '@typescript-eslint/eslint-plugin'
- - chai
- - eslint-plugin-mocha
- - eslint-config-mongodb-js
-ignore-patterns:
- - .eslintrc.js