@mongosh/types 1.2.3 → 1.4.1

package/lib/index.d.ts

@@ -64,15 +64,16 @@ export interface GlobalConfigFileLoadEvent {
     filename: string;
     found: boolean;
 }
-export interface MongocryptdTrySpawnEvent {
-    spawnPath: string[];
-    path: string;
+export interface CSFLELibrarySkipEvent {
+    csflePath: string;
+    reason: string;
+    details?: any;
 }
-export interface MongocryptdErrorEvent {
-    cause: string;
-    error?: Error;
-    stderr?: string;
-    pid?: number;
+export interface CSFLELibraryFoundEvent {
+    csflePath: string;
+    expectedVersion: {
+        versionStr: string;
+    };
 }
 export interface MongocryptdLogEvent {
     pid: number;
@@ -138,8 +139,14 @@ export interface EditorReadVscodeExtensionsFailedEvent {
 }
 export interface MongoshBusEventsMap extends ConnectEventMap {
     'mongosh:connect': (ev: ConnectEvent) => void;
-    'mongosh:new-user': (id: string) => void;
-    'mongosh:update-user': (id: string) => void;
+    'mongosh:new-user': (identity: {
+        userId: string;
+        anonymousId: string;
+    }) => void;
+    'mongosh:update-user': (identity: {
+        userId: string;
+        anonymousId?: string;
+    }) => void;
     'mongosh:error': (error: Error, component: string) => void;
     'mongosh:evaluate-input': (ev: EvaluateInputEvent) => void;
     'mongosh:evaluate-started': () => void;
@@ -159,9 +166,8 @@ export interface MongoshBusEventsMap extends ConnectEventMap {
     'mongosh:mongoshrc-mongorc-warn': () => void;
     'mongosh:eval-cli-script': () => void;
     'mongosh:eval-interrupted': () => void;
-    'mongosh:mongocryptd-tryspawn': (ev: MongocryptdTrySpawnEvent) => void;
-    'mongosh:mongocryptd-error': (ev: MongocryptdErrorEvent) => void;
-    'mongosh:mongocryptd-log': (ev: MongocryptdLogEvent) => void;
+    'mongosh:csfle-load-skip': (ev: CSFLELibrarySkipEvent) => void;
+    'mongosh:csfle-load-found': (ev: CSFLELibraryFoundEvent) => void;
     'mongosh:closed': () => void;
     'mongosh:eval-complete': () => void;
     'mongosh:autocompletion-complete': () => void;
@@ -209,6 +215,7 @@ export declare class SnippetShellUserConfigValidator extends ShellUserConfigVali
 }
 export declare class CliUserConfig extends SnippetShellUserConfig {
     userId: string;
+    telemetryAnonymousId: string;
     disableGreetingMessage: boolean;
     forceDisableTelemetry: boolean;
     inspectCompact: number | boolean;

package/lib/index.js

@@ -76,6 +76,7 @@ class CliUserConfig extends SnippetShellUserConfig {
     constructor() {
         super(...arguments);
         this.userId = '';
+        this.telemetryAnonymousId = '';
         this.disableGreetingMessage = false;
         this.forceDisableTelemetry = false;
         this.inspectCompact = 3;
@@ -90,6 +91,7 @@ class CliUserConfigValidator extends SnippetShellUserConfigValidator {
     static async validate(key, value) {
         switch (key) {
             case 'userId':
+            case 'telemetryAnonymousId':
             case 'disableGreetingMessage':
                 return null;
             case 'inspectCompact':

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAqVA,MAAa,eAAe;IAA5B;QACE,qBAAgB,GAAG,EAAE,CAAC;QACtB,cAAS,GAAkB,IAAI,CAAC;QAChC,oBAAe,GAAG,KAAK,CAAC;QACxB,WAAM,GAAkB,IAAI,CAAC;IAC/B,CAAC;CAAA;AALD,0CAKC;AAED,MAAa,wBAAwB;IAEnC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAkC,GAAM,EAAE,KAAyB;QACtF,QAAQ,GAAG,EAAE;YACX,KAAK,kBAAkB;gBACrB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,IAAI,CAAC,EAAE;oBAC3C,OAAO,GAAG,GAAG,6BAA6B,CAAC;iBAC5C;gBACD,OAAO,IAAI,CAAC;YACd,KAAK,WAAW;gBACd,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,IAAI,CAAC,CAAC,EAAE;oBAC/D,OAAO,GAAG,GAAG,qCAAqC,CAAC;iBACpD;gBACD,OAAO,IAAI,CAAC;YACd,KAAK,iBAAiB;gBACpB,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE;oBAC9B,OAAO,GAAG,GAAG,oBAAoB,CAAC;iBACnC;gBACD,OAAO,IAAI,CAAC;YACd,KAAK,QAAQ;gBACX,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;oBAC/C,OAAO,GAAG,GAAG,2BAA2B,CAAC;iBAC1C;gBACD,OAAO,IAAI,CAAC;YACd;gBACE,OAAO,GAAG,GAAG,+BAA+B,CAAC;SAChD;IACH,CAAC;CACF;AA5BD,4DA4BC;AAED,MAAa,sBAAuB,SAAQ,eAAe;IAA3D;;QACE,2BAAsB,GAAG,4DAA4D,CAAC;QACtF,uBAAkB,GAAG,4BAA4B,CAAC;QAClD,oBAAe,GAAG,IAAI,CAAC;IACzB,CAAC;CAAA;AAJD,wDAIC;AAED,MAAa,+BAAgC,SAAQ,wBAAwB;IAC3E,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAyC,GAAM,EAAE,KAAgC;QACpG,QAAQ,GAAG,EAAE;YACX,KAAK,wBAAwB;gBAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE;oBACtF,OAAO,GAAG,GAAG,2CAA2C,CAAC;iBAC1D;gBACD,OAAO,IAAI,CAAC;YACd,KAAK,oBAAoB;gBACvB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;oBACnD,OAAO,GAAG,GAAG,sBAAsB,CAAC;iBACrC;gBACD,OAAO,IAAI,CAAC;YACd,KAAK,iBAAiB;gBACpB,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE;oBAC9B,OAAO,GAAG,GAAG,oBAAoB,CAAC;iBACnC;gBACD,OAAO,IAAI,CAAC;YACd;gBACE,OAAO,KAAK,CAAC,QAAQ,CAAC,GAA4B,EAAE,KAAY,CAAC,CAAC;SACrE;IACH,CAAC;CACF;AAtBD,0EAsBC;AAED,MAAa,aAAc,SAAQ,sBAAsB;IAAzD;;QACE,WAAM,GAAG,EAAE,CAAC;QACZ,yBAAoB,GAAG,EAAE,CAAC;QAC1B,2BAAsB,GAAG,KAAK,CAAC;QAC/B,0BAAqB,GAAG,KAAK,CAAC;QAC9B,mBAAc,GAAqB,CAAC,CAAC;QACrC,iBAAY,GAAG,CAAC,CAAC;QACjB,kBAAa,GAAG,IAAI,CAAC;QACrB,oBAAe,GAAG,KAAK,CAAC;QACxB,kBAAa,GAAwC,QAAQ,CAAC;IAChE,CAAC;CAAA;AAVD,sCAUC;AAED,MAAa,sBAAuB,SAAQ,+BAA+B;IAEzE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAgC,GAAM,EAAE,KAAuB;QAClF,QAAQ,GAAG,EAAE;YACX,KAAK,QAAQ,CAAC;YACd,KAAK,sBAAsB,CAAC;YAC5B,KAAK,wBAAwB;gBAC3B,OAAO,IAAI,CAAC;YACd,KAAK,gBAAgB;gBACnB,IAAI,OAAO,KAAK,KAAK,SAAS,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;oBAC1E,OAAO,GAAG,GAAG,0CAA0C,CAAC;iBACzD;gBACD,OAAO,IAAI,CAAC;YACd,KAAK,cAAc,CAAC;YACpB,KAAK,eAAe;gBAClB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,GAAG,CAAC,EAAE;oBAC1C,OAAO,GAAG,GAAG,6BAA6B,CAAC;iBAC5C;gBACD,OAAO,IAAI,CAAC;YACd,KAAK,uBAAuB,CAAC;YAC7B,KAAK,iBAAiB;gBACpB,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE;oBAC9B,OAAO,GAAG,GAAG,oBAAoB,CAAC;iBACnC;gBACD,OAAO,IAAI,CAAC;YACd,KAAK,eAAe;gBAClB,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,eAAe,EAAE;oBACvE,OAAO,GAAG,GAAG,sDAAsD,CAAC;iBACrE;gBACD,OAAO,IAAI,CAAC;YACd;gBACE,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAmC,EAAE,KAAY,CAAC,CAAC;SAC5E;IACH,CAAC;CACF;AAlCD,wDAkCC;AAUD,SAAS,UAAU,CAAC,GAAW;IAM7B,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE;QAC7B,IAAI;YAEF,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YACb,OAAO,IAAI,CAAC;SACb;QAAC,WAAM;YACN,OAAO,KAAK,CAAC;SACd;KACF;IAGD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/types",
-  "version": "1.2.3",
+  "version": "1.4.1",
   "description": "Types for mongosh internals",
   "author": "Anna Henningsen <anna.henningsen@mongodb.com>",
   "homepage": "https://github.com/mongodb-js/mongosh/tree/main/packages/types#readme",
@@ -32,7 +32,7 @@
     "unitTestsOnly": true
   },
   "dependencies": {
-    "@mongodb-js/devtools-connect": "^1.2.4"
+    "@mongodb-js/devtools-connect": "^1.4.2"
   },
-  "gitHead": "b715268260871b62ac628cef3eb1009203a91264"
+  "gitHead": "4e88ce238c93af5f2eb5ad9f9e3a2ac5ef1eb2e0"
 }

package/src/index.spec.ts

@@ -5,6 +5,7 @@ describe('config validation', () => {
   it('validates config option values', async() => {
     const { validate } = CliUserConfigValidator as any;
     expect(await validate('userId', 'foo')).to.equal(null);
+    expect(await validate('telemetryAnonymousId', 'foo')).to.equal(null);
     expect(await validate('disableGreetingMessage', 'foo')).to.equal(null);
     expect(await validate('inspectDepth', 'foo')).to.equal('inspectDepth must be a positive integer');
     expect(await validate('inspectDepth', -1)).to.equal('inspectDepth must be a positive integer');

package/src/index.ts

@@ -77,16 +77,15 @@ export interface GlobalConfigFileLoadEvent {
   found: boolean;
 }
 
-export interface MongocryptdTrySpawnEvent {
-  spawnPath: string[];
-  path: string;
+export interface CSFLELibrarySkipEvent {
+  csflePath: string;
+  reason: string;
+  details?: any;
 }
 
-export interface MongocryptdErrorEvent {
-  cause: string;
-  error?: Error;
-  stderr?: string;
-  pid?: number;
+export interface CSFLELibraryFoundEvent {
+  csflePath: string;
+  expectedVersion: { versionStr: string };
 }
 
 export interface MongocryptdLogEvent {
@@ -176,11 +175,11 @@ export interface MongoshBusEventsMap extends ConnectEventMap {
   /**
    * Signals that the shell is started by a new user.
    */
-  'mongosh:new-user': (id: string) => void;
+  'mongosh:new-user': (identity: { userId: string; anonymousId: string }) => void;
   /**
    * Signals a change of the user telemetry settings.
    */
-  'mongosh:update-user': (id: string) => void;
+  'mongosh:update-user': (identity: { userId: string; anonymousId?: string }) => void;
   /**
    * Signals an error that should be logged or potentially tracked by analytics.
    */
@@ -262,17 +261,13 @@ export interface MongoshBusEventsMap extends ConnectEventMap {
    */
   'mongosh:eval-interrupted': () => void;
   /**
-   * Signals the start of trying to spawn a `mongocryptd` process.
+   * Signals that a potential CSFLE library search path was skipped.
    */
-  'mongosh:mongocryptd-tryspawn': (ev: MongocryptdTrySpawnEvent) => void;
+  'mongosh:csfle-load-skip': (ev: CSFLELibrarySkipEvent) => void;
   /**
-   * Signals an error while interfacing with a `mongocryptd` process.
+   * Signals that a potential CSFLE library search path was accepted.
    */
-  'mongosh:mongocryptd-error': (ev: MongocryptdErrorEvent) => void;
-  /**
-   * Signals an event to be logged for a `mongocryptd` process.
-   */
-  'mongosh:mongocryptd-log': (ev: MongocryptdLogEvent) => void;
+  'mongosh:csfle-load-found': (ev: CSFLELibraryFoundEvent) => void;
   /**
    * Signals that the CLI REPL's `close` method has completed.
    * _ONLY AVAILABLE FOR TESTING._
@@ -413,6 +408,7 @@ export class SnippetShellUserConfigValidator extends ShellUserConfigValidator {
 
 export class CliUserConfig extends SnippetShellUserConfig {
   userId = '';
+  telemetryAnonymousId = '';
   disableGreetingMessage = false;
   forceDisableTelemetry = false;
   inspectCompact: number | boolean = 3;
@@ -427,6 +423,7 @@ export class CliUserConfigValidator extends SnippetShellUserConfigValidator {
   static async validate<K extends keyof CliUserConfig>(key: K, value: CliUserConfig[K]): Promise<string | null> {
     switch (key) {
       case 'userId':
+      case 'telemetryAnonymousId':
       case 'disableGreetingMessage':
         return null; // Not modifiable by the user anyway.
       case 'inspectCompact':