@mongosh/service-provider-core 1.7.1 → 1.8.1

package/AUTHORS

@@ -12,3 +12,4 @@ Alena Khineika <alena.khineika@gmail.com>
 Leonardo Rossi <leonardo.rossi@gmail.com>
 Le Roux Bodenstein <lerouxb@gmail.com>
 Bailey Pearson <bailey.pearson@mongodb.com>
+Himanshu Singh <himanshu.singhs@outlook.in>

package/lib/admin.d.ts

@@ -1,8 +1,15 @@
 import ShellAuthOptions from './shell-auth-options';
-import type { MongoClientOptions, ReadConcern, ReadPreference, WriteConcern, Document, CreateCollectionOptions, ClientSession, DbOptions, ClientSessionOptions, ListDatabasesOptions, AutoEncryptionOptions } from './all-transport-types';
+import type { MongoClientOptions, ReadConcern, ReadPreference, WriteConcern, Document, CreateCollectionOptions, ClientSession, DbOptions, ClientSessionOptions, ListDatabasesOptions, AutoEncryptionOptions, Collection } from './all-transport-types';
 import type { bson as BSON } from './index';
 import type { ReplPlatform } from './platform';
-import { FLE } from './all-fle-types';
+import { AWSEncryptionKeyOptions, AzureEncryptionKeyOptions, ClientEncryption as MongoCryptClientEncryption, ClientEncryptionDataKeyProvider, FLE, GCPEncryptionKeyOptions } from './all-fle-types';
+export interface CreateEncryptedCollectionOptions {
+    provider: ClientEncryptionDataKeyProvider;
+    createCollectionOptions: Omit<CreateCollectionOptions, 'encryptedFields'> & {
+        encryptedFields: Document;
+    };
+    masterKey?: AWSEncryptionKeyOptions | AzureEncryptionKeyOptions | GCPEncryptionKeyOptions;
+}
 export default interface Admin {
     platform: ReplPlatform;
     initialDb: string;
@@ -25,4 +32,8 @@ export default interface Admin {
     getRawClient(): any;
     fle?: FLE | undefined;
     getFleOptions?: () => AutoEncryptionOptions | undefined;
+    createEncryptedCollection?(dbName: string, collName: string, options: CreateEncryptedCollectionOptions, libmongocrypt: MongoCryptClientEncryption): Promise<{
+        collection: Collection;
+        encryptedFields: Document;
+    }>;
 }

package/lib/index.d.ts

@@ -3,12 +3,13 @@ import ServiceProvider, { ServiceProviderCore } from './service-provider';
 import getConnectInfo, { ConnectInfo } from './connect-info';
 import type { ReplPlatform } from './platform';
 declare const DEFAULT_DB = "test";
-import { ObjectId, DBRef, MaxKey, MinKey, Timestamp, BSONSymbol, Code, Decimal128, Int32, Long, Binary, calculateObjectSize, Double, EJSON, BSONRegExp } from 'bson';
+import { ObjectId, DBRef, MaxKey, MinKey, Timestamp, BSONSymbol, Code, Decimal128, Int32, Long, Binary, calculateObjectSize, Double, BSONRegExp } from 'bson';
 import { bsonStringifiers } from './printable-bson';
 import ShellAuthOptions from './shell-auth-options';
 export * from './all-transport-types';
 export * from './all-fle-types';
 export { MapReduceOptions, FinalizeFunction } from './map-reduce-options';
+export { CreateEncryptedCollectionOptions } from './admin';
 declare const bson: {
     ObjectId: typeof ObjectId;
     DBRef: typeof DBRef;
@@ -21,10 +22,14 @@ declare const bson: {
     Int32: typeof Int32;
     Long: typeof Long;
     Binary: typeof Binary;
-    Map: MapConstructor;
     calculateObjectSize: typeof calculateObjectSize;
     Double: typeof Double;
-    EJSON: typeof EJSON;
+    EJSON: {
+        parse: (text: string, options?: import("bson").EJSONOptions | undefined) => any;
+        stringify: (value: any, replacer?: (string | number)[] | import("bson").EJSONOptions | ((this: any, key: string, value: any) => any) | undefined, space?: string | number | undefined, options?: import("bson").EJSONOptions | undefined) => string;
+        serialize: (value: any, options?: import("bson").EJSONOptions | undefined) => import("bson").Document;
+        deserialize: (ejson: import("bson").Document, options?: import("bson").EJSONOptions | undefined) => any;
+    };
     BSONRegExp: typeof BSONRegExp;
 };
 export { ServiceProvider, ShellAuthOptions, getConnectInfo, ReplPlatform, DEFAULT_DB, ServiceProviderCore, bson, bsonStringifiers, ConnectInfo };

package/lib/index.js

@@ -42,7 +42,6 @@ const bson = {
     Int32: bson_1.Int32,
     Long: bson_1.Long,
     Binary: bson_1.Binary,
-    Map: bson_1.Map,
     calculateObjectSize: bson_1.calculateObjectSize,
     Double: bson_1.Double,
     EJSON: bson_1.EJSON,

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA0E;AAsDxE,oGAtDwB,sCAAmB,OAsDxB;AArDrB,kEAA6D;AAkD3D,yBAlDK,sBAAc,CAkDL;AAhDhB,MAAM,UAAU,GAAG,MAAM,CAAC;AAkDxB,gCAAU;AAjDZ,+BAiBc;AACd,qDAAoD;AAkClD,iGAlCO,iCAAgB,OAkCP;AAhClB,wDAAsC;AACtC,kDAAgC;AAIhC,MAAM,IAAI,GAAG;IACX,QAAQ,EAAR,eAAQ;IACR,KAAK,EAAL,YAAK;IACL,MAAM,EAAN,aAAM;IACN,MAAM,EAAN,aAAM;IACN,SAAS,EAAT,gBAAS;IACT,UAAU,EAAV,iBAAU;IACV,IAAI,EAAJ,WAAI;IACJ,UAAU,EAAV,iBAAU;IACV,KAAK,EAAL,YAAK;IACL,IAAI,EAAJ,WAAI;IACJ,MAAM,EAAN,aAAM;IACN,GAAG,EAAH,UAAG;IACH,mBAAmB,EAAnB,0BAAmB;IACnB,MAAM,EAAN,aAAM;IACN,KAAK,EAAL,YAAK;IACL,UAAU,EAAV,iBAAU;CACX,CAAC;AASA,oBAAI"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA0E;AAsDxE,oGAtDwB,sCAAmB,OAsDxB;AArDrB,kEAA6D;AAkD3D,yBAlDK,sBAAc,CAkDL;AAhDhB,MAAM,UAAU,GAAG,MAAM,CAAC;AAkDxB,gCAAU;AAjDZ,+BAgBc;AACd,qDAAoD;AAmClD,iGAnCO,iCAAgB,OAmCP;AAjClB,wDAAsC;AACtC,kDAAgC;AAMhC,MAAM,IAAI,GAAG;IACX,QAAQ,EAAR,eAAQ;IACR,KAAK,EAAL,YAAK;IACL,MAAM,EAAN,aAAM;IACN,MAAM,EAAN,aAAM;IACN,SAAS,EAAT,gBAAS;IACT,UAAU,EAAV,iBAAU;IACV,IAAI,EAAJ,WAAI;IACJ,UAAU,EAAV,iBAAU;IACV,KAAK,EAAL,YAAK;IACL,IAAI,EAAJ,WAAI;IACJ,MAAM,EAAN,aAAM;IACN,mBAAmB,EAAnB,0BAAmB;IACnB,MAAM,EAAN,aAAM;IACN,KAAK,EAAL,YAAK;IACL,UAAU,EAAV,iBAAU;CACX,CAAC;AASA,oBAAI"}

package/lib/printable-bson.js

@@ -9,7 +9,7 @@ exports.bsonStringifiers = {
         return `ObjectId("${this.toHexString()}")`;
     },
     DBRef: function (depth, options) {
-        return `DBRef("${this.namespace}", ` +
+        return `DBRef("${this.collection}", ` +
             (0, util_1.inspect)(this.oid, options) +
             (this.db ? `, "${this.db}"` : '') +
             ')';
@@ -43,19 +43,18 @@ exports.bsonStringifiers = {
         return `BSONRegExp(${JSON.stringify(this.pattern)}, ${JSON.stringify(this.options)})`;
     },
     Binary: function () {
-        const asBuffer = this.value(true);
+        const hexString = this.toString('hex');
         switch (this.sub_type) {
             case index_1.bson.Binary.SUBTYPE_MD5:
-                return `MD5("${asBuffer.toString('hex')}")`;
+                return `MD5("${hexString}")`;
             case index_1.bson.Binary.SUBTYPE_UUID:
-                if (asBuffer.length === 16) {
-                    const hex = asBuffer.toString('hex');
-                    const asUUID = hex.match(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/)
+                if (hexString.length === 32) {
+                    const asUUID = hexString.match(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/)
                         .slice(1, 6).join('-');
                     return `UUID("${asUUID}")`;
                 }
             default:
-                return `Binary(Buffer.from("${asBuffer.toString('hex')}", "hex"), ${this.sub_type})`;
+                return `Binary(Buffer.from("${hexString}", "hex"), ${this.sub_type})`;
         }
     },
 };

package/lib/printable-bson.js.map

@@ -1 +1 @@
-{"version":3,"file":"printable-bson.js","sourceRoot":"","sources":["../src/printable-bson.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"printable-bson.js","sourceRoot":"","sources":["../src/printable-bson.ts"],"names":[],"mappings":"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"}

package/lib/writable.d.ts

@@ -14,7 +14,6 @@ export default interface Writable {
     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>;
-    remove(database: string, collection: string, query: Document, options?: DeleteOptions, dbOptions?: DbOptions): Promise<DeleteResult>;
     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": "1.7.1",
+  "version": "1.8.1",
   "description": "MongoDB Shell Core Service Provider Package",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -38,14 +38,14 @@
   },
   "dependencies": {
     "@aws-sdk/credential-providers": "^3.262.0",
-    "@mongosh/errors": "1.7.1",
-    "bson": "^4.7.2",
-    "mongodb": "^4.13.0",
+    "@mongosh/errors": "1.8.1",
+    "bson": "^5.2.0",
+    "mongodb": "^5.3.0",
     "mongodb-build-info": "^1.5.0",
-    "mongodb-client-encryption": "^2.4.0"
+    "mongodb-client-encryption": "^2.7.1"
   },
   "optionalDependencies": {
-    "mongodb-client-encryption": "^2.4.0"
+    "mongodb-client-encryption": "^2.7.1"
   },
   "dependency-check": {
     "entries": [
@@ -58,5 +58,5 @@
       "encoding"
     ]
   },
-  "gitHead": "1bf0d7775443ac1849cc2597465d54eca867acea"
+  "gitHead": "b0244ae6670f5a0f375abbb38bcf3465917de6e4"
 }

package/src/admin.ts

@@ -10,12 +10,25 @@ import type {
   DbOptions,
   ClientSessionOptions,
   ListDatabasesOptions,
-  AutoEncryptionOptions
+  AutoEncryptionOptions,
+  Collection
 } from './all-transport-types';
 import type { bson as BSON } from './index';
 import type { ReplPlatform } from './platform';
-import { FLE } from './all-fle-types';
-
+import {
+  AWSEncryptionKeyOptions,
+  AzureEncryptionKeyOptions,
+  ClientEncryption as MongoCryptClientEncryption,
+  ClientEncryptionDataKeyProvider,
+  FLE,
+  GCPEncryptionKeyOptions
+} from './all-fle-types';
+
+export interface CreateEncryptedCollectionOptions {
+  provider: ClientEncryptionDataKeyProvider,
+  createCollectionOptions: Omit<CreateCollectionOptions, 'encryptedFields'> & { encryptedFields: Document },
+  masterKey?: AWSEncryptionKeyOptions | AzureEncryptionKeyOptions | GCPEncryptionKeyOptions;
+}
 
 export default interface Admin {
   /**
@@ -116,4 +129,14 @@ export default interface Admin {
    * The FLE options passed to the client, if any.
    */
   getFleOptions?: () => AutoEncryptionOptions | undefined;
+
+  /**
+   * The helper method to correctly access FLE implementation's createEncryptedCollection
+   */
+  createEncryptedCollection?(
+    dbName: string,
+    collName: string,
+    options: CreateEncryptedCollectionOptions,
+    libmongocrypt: MongoCryptClientEncryption
+  ): Promise<{ collection: Collection, encryptedFields: Document }>
 }

package/src/index.ts

@@ -15,7 +15,6 @@ import {
   Int32,
   Long,
   Binary,
-  Map,
   calculateObjectSize,
   Double,
   EJSON,
@@ -28,6 +27,8 @@ export * from './all-fle-types';
 
 export { MapReduceOptions, FinalizeFunction } from './map-reduce-options';
 
+export { CreateEncryptedCollectionOptions } from './admin';
+
 const bson = {
   ObjectId,
   DBRef,
@@ -40,7 +41,6 @@ const bson = {
   Int32,
   Long,
   Binary,
-  Map,
   calculateObjectSize,
   Double,
   EJSON,

package/src/printable-bson.ts

@@ -3,72 +3,71 @@ import { inspect } from 'util';
 const inspectCustom = Symbol.for('nodejs.util.inspect.custom');
 
 export const bsonStringifiers: Record<string, (this: any, depth: any, options: any) => string> = {
-  ObjectId: function(): string {
+  ObjectId: function(this: typeof BSON.ObjectId.prototype): string {
     return `ObjectId("${this.toHexString()}")`;
   },
 
-  DBRef: function(depth: any, options: any): string {
-    return `DBRef("${this.namespace}", ` +
+  DBRef: function(this: typeof BSON.DBRef.prototype, depth: any, options: any): string {
+    return `DBRef("${this.collection}", ` +
       inspect(this.oid, options) +
       (this.db ? `, "${this.db}"` : '') +
       ')';
   },
 
-  MaxKey: function(): string {
+  MaxKey: function(this: typeof BSON.MaxKey.prototype): string {
     return 'MaxKey()';
   },
 
-  MinKey: function(): string {
+  MinKey: function(this: typeof BSON.MinKey.prototype): string {
     return 'MinKey()';
   },
 
-  Timestamp: function(): string {
+  Timestamp: function(this: typeof BSON.Timestamp.prototype): string {
     return `Timestamp({ t: ${this.getHighBits()}, i: ${this.getLowBits()} })`;
   },
 
-  BSONSymbol: function(): string {
+  BSONSymbol: function(this: typeof BSON.BSONSymbol.prototype): string {
     return `BSONSymbol("${this.valueOf()}")`;
   },
 
-  Code: function(): string {
+  Code: function(this: typeof BSON.Code.prototype): string {
     const j = this.toJSON();
     return `Code("${j.code}"${j.scope ? `, ${JSON.stringify(j.scope)}` : ''})`;
   },
 
-  Decimal128: function(): string {
+  Decimal128: function(this: typeof BSON.Decimal128.prototype): string {
     return `Decimal128("${this.toString()}")`;
   },
 
-  Int32: function(): string {
+  Int32: function(this: typeof BSON.Int32.prototype): string {
     return `Int32(${this.valueOf()})`;
   },
 
-  Long: function(): string {
+  Long: function(this: typeof BSON.Long.prototype): string {
     return `Long("${this.toString()}"${this.unsigned ? ', true' : ''})`;
   },
 
-  BSONRegExp: function(): string {
+  BSONRegExp: function(this: typeof BSON.BSONRegExp.prototype): string {
     return `BSONRegExp(${JSON.stringify(this.pattern)}, ${JSON.stringify(this.options)})`;
   },
 
-  Binary: function(): string {
-    const asBuffer = this.value(true);
+  Binary: function(this: typeof BSON.Binary.prototype): string {
+    const hexString = this.toString('hex');
     switch (this.sub_type) {
       case BSON.Binary.SUBTYPE_MD5:
-        return `MD5("${asBuffer.toString('hex')}")`;
+        return `MD5("${hexString}")`;
       case BSON.Binary.SUBTYPE_UUID:
-        if (asBuffer.length === 16) {
+        if (hexString.length === 32) {
           // Format '0123456789abcdef0123456789abcdef' into
           // '01234567-89ab-cdef-0123-456789abcdef'.
-          const hex = asBuffer.toString('hex');
-          const asUUID = hex.match(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/)
+          const asUUID = hexString.match(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/)!
             .slice(1, 6).join('-');
           return `UUID("${asUUID}")`;
         }
         // In case somebody did something weird and used an UUID with a
         // non-standard length, fall through.
       default:
-        return `Binary(Buffer.from("${asBuffer.toString('hex')}", "hex"), ${this.sub_type})`;
+        return `Binary(Buffer.from("${hexString}", "hex"), ${this.sub_type})`;
     }
   },
 };

package/src/writable.ts

@@ -281,24 +281,6 @@ export default interface Writable {
     options?: UpdateOptions,
     dbOptions?: DbOptions): Promise<UpdateResult>;
 
-  /**
-   * Deprecated remove command.
-   *
-   * @param {String} database - The db name.
-   * @param {String} collection - The collection name.
-   * @param {Object} query - The query.
-   * @param {Object} options - The options.
-   * @param {DbOptions} dbOptions - The database options
-   *
-   * @return {Promise}
-   */
-  remove(
-    database: string,
-    collection: string,
-    query: Document,
-    options?: DeleteOptions,
-    dbOptions?: DbOptions): Promise<DeleteResult>;
-
   /**
    * Adds new indexes to a collection.
    *