@mongosh/service-provider-core 3.3.5 → 3.5.0

package/lib/all-transport-types.d.ts

@@ -1 +1 @@
-export type { AggregateOptions, AggregationCursor, AnyBulkWriteOperation, AnyClientBulkWriteModel, Batch, BulkWriteOptions, BulkWriteResult, ClientBulkWriteResult, ClientBulkWriteOptions, ChangeStream, ChangeStreamOptions, ClientSession, CollationOptions, Collection, CommandOperationOptions, CountDocumentsOptions, CountOptions, CreateCollectionOptions, CreateIndexesOptions, ClientSessionOptions, ClusterTime, FindCursor, CursorFlag, RunCommandCursor, Db, DbOptions, DeleteOptions, DeleteResult, DistinctOptions, Document, DropCollectionOptions, DropDatabaseOptions, EstimatedDocumentCountOptions, ExplainOptions, ExplainVerbosityLike, FindOneAndDeleteOptions, FindOneAndUpdateOptions, FindOneAndReplaceOptions, FindOperators, FindOptions, HedgeOptions, IndexDescription, InsertManyResult, InsertOneOptions, InsertOneResult, ListCollectionsOptions, ListDatabasesOptions, ListIndexesOptions, MongoClientOptions, OrderedBulkOperation, ReadConcern, ReadConcernLike, ReadConcernLevel, ReadPreference, ReadPreferenceLike, ReadPreferenceFromOptions, ReadPreferenceMode, RenameOptions, ReplaceOptions, ResumeToken, RunCommandOptions, SearchIndexDescription, ServerSessionId, TagSet, TransactionOptions, UpdateOptions, UpdateResult, UnorderedBulkOperation, WriteConcern, ObjectId as ObjectIdType, Timestamp as TimestampType, Binary as BinaryType, TopologyDescription, TopologyType, ServerType, AutoEncryptionOptions, ServerApi, ServerApiVersion, MongoClient, } from 'mongodb';
+export type { AggregateOptions, AggregationCursor, AnyBulkWriteOperation, AnyClientBulkWriteModel, Batch, BulkWriteOptions, BulkWriteResult, ClientBulkWriteResult, ClientBulkWriteOptions, ChangeStream, ChangeStreamOptions, ClientSession, CollationOptions, Collection, CommandOperationOptions, CountDocumentsOptions, CountOptions, CreateCollectionOptions, CreateIndexesOptions, ClientSessionOptions, ClusterTime, FindCursor, CursorFlag, RunCommandCursor, Db, DbOptions, DeleteOptions, DeleteResult, DistinctOptions, Document, DropCollectionOptions, DropDatabaseOptions, EstimatedDocumentCountOptions, ExplainOptions, ExplainVerbosityLike, FindOneAndDeleteOptions, FindOneAndUpdateOptions, FindOneAndReplaceOptions, FindOperators, FindOptions, HedgeOptions, IndexDescription, InsertManyResult, InsertOneOptions, InsertOneResult, ListCollectionsOptions, ListDatabasesOptions, ListIndexesOptions, MongoClientOptions, OrderedBulkOperation, ReadConcern, ReadConcernLike, ReadConcernLevel, ReadPreference, ReadPreferenceLike, ReadPreferenceFromOptions, ReadPreferenceMode, RenameOptions, ReplaceOptions, ResumeToken, RunCommandOptions, SearchIndexDescription, ServerSessionId, TagSet, TransactionOptions, UpdateOptions, UpdateResult, UnorderedBulkOperation, WriteConcern, ObjectId as ObjectIdType, Timestamp as TimestampType, Binary as BinaryType, TopologyType, ServerType, AutoEncryptionOptions, ServerApi, ServerApiVersion, MongoClient, } from 'mongodb';

package/lib/closable.d.ts

@@ -1,4 +1,4 @@
 export default interface Closable {
-    close(force: boolean): Promise<void>;
+    close(): Promise<void>;
     suspend(): Promise<() => Promise<void>>;
 }

package/lib/index.d.ts

@@ -8,6 +8,7 @@ import ShellAuthOptions from './shell-auth-options';
 export * from './all-transport-types';
 export * from './all-fle-types';
 export { MapReduceOptions, FinalizeFunction } from './map-reduce-options';
+export { TopologyDescription, ServerDescription } from './readable';
 export { CreateEncryptedCollectionOptions, CheckMetadataConsistencyOptions, ConnectionInfo, } from './admin';
 export { bson } from './bson-export';
 export { ServiceProviderAbstractCursor, ServiceProviderAggregationCursor, ServiceProviderFindCursor, ServiceProviderRunCommandCursor, ServiceProviderChangeStream, } from './cursors';

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA0E;AAiCxE,oGAjCwB,sCAAmB,OAiCxB;AAhCrB,kEAA0E;AA6BxE,8BA7BK,sBAAmB,CA6BL;AA3BrB,MAAM,UAAU,GAAG,MAAM,CAAC;AA6BxB,gCAAU;AA5BZ,qDAAoD;AA8BlD,iGA9BO,iCAAgB,OA8BP;AA5BlB,wDAAsC;AACtC,kDAAgC;AAUhC,6CAAqC;AAA5B,mGAAA,IAAI,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA0E;AAmCxE,oGAnCwB,sCAAmB,OAmCxB;AAlCrB,kEAA0E;AA+BxE,8BA/BK,sBAAmB,CA+BL;AA7BrB,MAAM,UAAU,GAAG,MAAM,CAAC;AA+BxB,gCAAU;AA9BZ,qDAAoD;AAgClD,iGAhCO,iCAAgB,OAgCP;AA9BlB,wDAAsC;AACtC,kDAAgC;AAYhC,6CAAqC;AAA5B,mGAAA,IAAI,OAAA"}

package/lib/readable.d.ts

@@ -1,6 +1,15 @@
-import type { Document, AggregateOptions, CountOptions, CountDocumentsOptions, DistinctOptions, EstimatedDocumentCountOptions, FindOptions, ListCollectionsOptions, ListIndexesOptions, DbOptions, ReadPreferenceFromOptions, ReadPreferenceLike } from './all-transport-types';
+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';
+export interface ServerDescription {
+    type?: ServerType;
+    setName?: string | null;
+}
+export interface TopologyDescription {
+    type?: TopologyType;
+    setName?: string | null;
+    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;
@@ -9,7 +18,7 @@ export default interface Readable {
     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;
-    getTopology(): any;
+    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[]>;
     readPreferenceFromOptions(options?: Omit<ReadPreferenceFromOptions, 'session'>): ReadPreferenceLike | undefined;

package/lib/writable.d.ts

@@ -17,7 +17,9 @@ export default interface Writable {
     insertOne(database: string, collection: string, doc: Document, options: InsertOneOptions, dbOptions?: DbOptions): Promise<InsertOneResult>;
     replaceOne(database: string, collection: string, filter: Document, replacement: Document, options?: ReplaceOptions, dbOptions?: DbOptions): Promise<UpdateResult>;
     updateMany(database: string, collection: string, filter: Document, update: Document, options?: UpdateOptions, dbOptions?: DbOptions): Promise<UpdateResult>;
-    updateOne(database: string, collection: string, filter: Document, update: Document, options?: UpdateOptions, dbOptions?: DbOptions): Promise<UpdateResult>;
+    updateOne(database: string, collection: string, filter: Document, update: Document, options?: UpdateOptions & {
+        sort?: Document;
+    }, dbOptions?: DbOptions): Promise<UpdateResult>;
     createIndexes(database: string, collection: string, indexSpecs: Document[], options?: CreateIndexesOptions, dbOptions?: DbOptions): Promise<string[]>;
     dropCollection(database: string, collection: string, options: DropCollectionOptions, dbOptions?: DbOptions): Promise<boolean>;
     renameCollection(database: string, oldName: string, newName: string, options?: RenameOptions, dbOptions?: DbOptions): Promise<Collection>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/service-provider-core",
-  "version": "3.3.5",
+  "version": "3.5.0",
   "description": "MongoDB Shell Core Service Provider Package",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -33,27 +33,15 @@
     "node": ">=14.15.1"
   },
   "mongosh": {
-    "unitTestsOnly": true,
-    "ciRequiredOptionalDependencies": {
-      "mongodb-client-encryption": [
-        "darwin",
-        "linux",
-        "win32"
-      ]
-    }
+    "unitTestsOnly": true
   },
   "dependencies": {
-    "@aws-sdk/credential-providers": "^3.525.0",
-    "@mongosh/errors": "2.4.2",
-    "bson": "^6.10.3",
-    "mongodb": "^6.16.0",
+    "@mongosh/errors": "2.4.4",
+    "bson": "^6.10.4",
+    "mongodb": "^6.19.0",
     "mongodb-build-info": "^1.7.2",
-    "mongodb-client-encryption": "^6.3.0",
     "mongodb-connection-string-url": "^3.0.1"
   },
-  "optionalDependencies": {
-    "mongodb-client-encryption": "^6.3.0"
-  },
   "devDependencies": {
     "@mongodb-js/eslint-config-mongosh": "^1.0.0",
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
@@ -62,5 +50,5 @@
     "eslint": "^7.25.0",
     "prettier": "^2.8.8"
   },
-  "gitHead": "511befbaf032b589d7f3e81325e5e389d360cc3f"
+  "gitHead": "e019a30c3021026ff8db296171d7d7f68cdac05e"
 }

package/src/all-transport-types.ts

@@ -71,7 +71,6 @@ export type {
   ObjectId as ObjectIdType,
   Timestamp as TimestampType,
   Binary as BinaryType,
-  TopologyDescription,
   TopologyType,
   ServerType,
   AutoEncryptionOptions,

package/src/closable.ts

@@ -1,10 +1,8 @@
 export default interface Closable {
   /**
    * Close the connection.
-   *
-   * @param {boolean} force - Whether to force close.
    */
-  close(force: boolean): Promise<void>;
+  close(): Promise<void>;
 
   /**
    * Suspends the connection, i.e. temporarily force-closes it

package/src/index.ts

@@ -10,6 +10,8 @@ export * from './all-fle-types';
 
 export { MapReduceOptions, FinalizeFunction } from './map-reduce-options';
 
+export { TopologyDescription, ServerDescription } from './readable';
+
 export {
   CreateEncryptedCollectionOptions,
   CheckMetadataConsistencyOptions,

package/src/readable.ts

@@ -11,6 +11,8 @@ import type {
   DbOptions,
   ReadPreferenceFromOptions,
   ReadPreferenceLike,
+  TopologyType,
+  ServerType,
 } from './all-transport-types';
 import type { ChangeStreamOptions } from './all-transport-types';
 import type {
@@ -19,6 +21,17 @@ import type {
   ServiceProviderFindCursor,
 } from './cursors';
 
+// These are trimmed-down versions of the MongoDB driver types
+export interface ServerDescription {
+  type?: ServerType;
+  setName?: string | null;
+}
+export interface TopologyDescription {
+  type?: TopologyType;
+  setName?: string | null;
+  servers?: Map<string, ServerDescription>;
+}
+
 /**
  * Interface for read operations in the CRUD specification.
  */
@@ -160,7 +173,7 @@ export default interface Readable {
   /**
    * Get currently known topology information.
    */
-  getTopology(): any;
+  getTopologyDescription(): TopologyDescription | undefined;
 
   /**
    * Returns an array that holds a list of documents that identify and

package/src/writable.ts

@@ -319,7 +319,7 @@ export default interface Writable {
     collection: string,
     filter: Document,
     update: Document,
-    options?: UpdateOptions,
+    options?: UpdateOptions & { sort?: Document },
     dbOptions?: DbOptions
   ): Promise<UpdateResult>;