@mongosh/browser-runtime-core 3.13.0 → 3.16.0

package/lib/autocompleter/shell-api-autocompleter.d.ts

@@ -1,7 +1,15 @@
+import type { AutocompletionContext } from '@mongodb-js/mongodb-ts-autocomplete';
 import type { AutocompleteParameters } from '@mongosh/autocomplete';
 import type { Autocompleter, Completion } from './autocompleter';
+type AutocompleteShellInstanceState = {
+    getAutocompleteParameters: () => AutocompleteParameters;
+    getAutocompletionContext: () => AutocompletionContext;
+};
 export declare class ShellApiAutocompleter implements Autocompleter {
+    private shellInstanceState;
     private parameters;
-    constructor(parameters: AutocompleteParameters);
+    private newMongoshCompleter;
+    constructor(shellInstanceState: AutocompleteShellInstanceState);
     getCompletions(code: string): Promise<Completion[]>;
 }
+export {};

package/lib/autocompleter/shell-api-autocompleter.js

@@ -1,19 +1,28 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShellApiAutocompleter = void 0;
-const autocomplete_1 = __importDefault(require("@mongosh/autocomplete"));
+const autocomplete_1 = require("@mongosh/autocomplete");
 class ShellApiAutocompleter {
-    constructor(parameters) {
-        this.parameters = parameters;
+    constructor(shellInstanceState) {
+        this.shellInstanceState = shellInstanceState;
     }
     async getCompletions(code) {
         if (!code) {
             return [];
         }
-        const completions = await (0, autocomplete_1.default)(this.parameters, code);
+        let completions;
+        if (process.env.USE_NEW_AUTOCOMPLETE) {
+            if (!this.newMongoshCompleter) {
+                this.newMongoshCompleter = await (0, autocomplete_1.initNewAutocompleter)(this.shellInstanceState);
+            }
+            completions = await this.newMongoshCompleter(code);
+        }
+        else {
+            if (!this.parameters) {
+                this.parameters = this.shellInstanceState.getAutocompleteParameters();
+            }
+            completions = await (0, autocomplete_1.completer)(this.parameters, code);
+        }
         if (!completions || !completions.length) {
             return [];
         }

package/lib/autocompleter/shell-api-autocompleter.js.map

@@ -1 +1 @@
-{"version":3,"file":"shell-api-autocompleter.js","sourceRoot":"","sources":["../../src/autocompleter/shell-api-autocompleter.ts"],"names":[],"mappings":";;;;;;AACA,yEAAqD;AAGrD,MAAa,qBAAqB;IAGhC,YAAY,UAAkC;QAC5C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAY;QAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,sBAAgB,EAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAElE,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YACxC,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;YAChD,OAAO;gBACL,UAAU;aACX,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AA1BD,sDA0BC"}
+{"version":3,"file":"shell-api-autocompleter.js","sourceRoot":"","sources":["../../src/autocompleter/shell-api-autocompleter.ts"],"names":[],"mappings":";;;AAKA,wDAAwE;AAQxE,MAAa,qBAAqB;IAWhC,YAAY,kBAAkD;QAC5D,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAY;QAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,WAA8B,CAAC;QAEnC,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;YACrC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC9B,IAAI,CAAC,mBAAmB,GAAG,MAAM,IAAA,mCAAoB,EACnD,IAAI,CAAC,kBAAkB,CACxB,CAAC;YACJ,CAAC;YAED,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBACrB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,yBAAyB,EAAE,CAAC;YACxE,CAAC;YACD,WAAW,GAAG,MAAM,IAAA,wBAAS,EAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YACxC,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;YAChD,OAAO;gBACL,UAAU;aACX,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAjDD,sDAiDC"}

package/lib/open-context-runtime.js

@@ -19,7 +19,7 @@ class OpenContextRuntime {
     async getCompletions(code) {
         var _a;
         if (!this.autocompleter) {
-            this.autocompleter = new shell_api_autocompleter_1.ShellApiAutocompleter(this.instanceState.getAutocompleteParameters());
+            this.autocompleter = new shell_api_autocompleter_1.ShellApiAutocompleter(this.instanceState);
             (_a = this.updatedConnectionInfoPromise) !== null && _a !== void 0 ? _a : (this.updatedConnectionInfoPromise = this.instanceState.fetchConnectionInfo());
             await this.updatedConnectionInfoPromise;
         }

package/lib/open-context-runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"open-context-runtime.js","sourceRoot":"","sources":["../src/open-context-runtime.ts"],"names":[],"mappings":";;;AAEA,qFAAgF;AAMhF,mCAAsC;AACtC,kDAAwD;AAExD,8DAA0D;AAkB1D,MAAa,kBAAkB;IAQ7B,YACE,eAAgC,EAChC,sBAA8C,EAC9C,UAAuB;QATjB,kBAAa,GAAiC,IAAI,CAAC;QAGnD,uBAAkB,GAAqC,IAAI,CAAC;QAC5D,iCAA4B,GAA4B,IAAI,CAAC;QAOnE,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QACrD,IAAI,CAAC,aAAa,GAAG,IAAI,8BAAkB,CACzC,eAAe,EACf,UAAU,IAAI,IAAI,qBAAY,EAAE,CACjC,CAAC;QACF,IAAI,CAAC,aAAa,CAAC,aAAa,GAAG,IAAI,CAAC;QACxC,IAAI,CAAC,cAAc,GAAG,IAAI,gCAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC7D,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAY;;QAC/B,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,IAAI,CAAC,aAAa,GAAG,IAAI,+CAAqB,CAC5C,IAAI,CAAC,aAAa,CAAC,yBAAyB,EAAE,CAC/C,CAAC;YACF,MAAA,IAAI,CAAC,4BAA4B,oCAAjC,IAAI,CAAC,4BAA4B,GAC/B,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,EAAC;YAC3C,MAAM,IAAI,CAAC,4BAA4B,CAAC;QAC1C,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAY;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,IAAI,CACxD,IAAI,CAAC,sBAAsB,CAC5B,CAAC;QACF,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CACtE,MAAM,EACN,IAAI,EACJ,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,EAC9C,EAAE,CACH,CAAC;QACF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;IACrC,CAAC;IAED,qBAAqB,CACnB,QAAmC;QAEnC,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACrC,IAAI,CAAC,kBAAkB,GAAG,QAAQ,CAAC;QACnC,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,cAAc;;QAClB,MAAA,IAAI,CAAC,4BAA4B,oCAAjC,IAAI,CAAC,4BAA4B,GAC/B,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,EAAC;QAC3C,MAAM,IAAI,CAAC,4BAA4B,CAAC;QACxC,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC;IACrD,CAAC;CACF;AAhED,gDAgEC"}
+{"version":3,"file":"open-context-runtime.js","sourceRoot":"","sources":["../src/open-context-runtime.ts"],"names":[],"mappings":";;;AAEA,qFAAgF;AAMhF,mCAAsC;AACtC,kDAAwD;AAExD,8DAA0D;AAkB1D,MAAa,kBAAkB;IAQ7B,YACE,eAAgC,EAChC,sBAA8C,EAC9C,UAAuB;QATjB,kBAAa,GAAiC,IAAI,CAAC;QAGnD,uBAAkB,GAAqC,IAAI,CAAC;QAC5D,iCAA4B,GAA4B,IAAI,CAAC;QAOnE,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QACrD,IAAI,CAAC,aAAa,GAAG,IAAI,8BAAkB,CACzC,eAAe,EACf,UAAU,IAAI,IAAI,qBAAY,EAAE,CACjC,CAAC;QACF,IAAI,CAAC,aAAa,CAAC,aAAa,GAAG,IAAI,CAAC;QACxC,IAAI,CAAC,cAAc,GAAG,IAAI,gCAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC7D,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAY;;QAC/B,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,IAAI,CAAC,aAAa,GAAG,IAAI,+CAAqB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACnE,MAAA,IAAI,CAAC,4BAA4B,oCAAjC,IAAI,CAAC,4BAA4B,GAC/B,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,EAAC;YAC3C,MAAM,IAAI,CAAC,4BAA4B,CAAC;QAC1C,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAY;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,IAAI,CACxD,IAAI,CAAC,sBAAsB,CAC5B,CAAC;QACF,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CACtE,MAAM,EACN,IAAI,EACJ,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,EAC9C,EAAE,CACH,CAAC;QACF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;IACrC,CAAC;IAED,qBAAqB,CACnB,QAAmC;QAEnC,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACrC,IAAI,CAAC,kBAAkB,GAAG,QAAQ,CAAC;QACnC,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,cAAc;;QAClB,MAAA,IAAI,CAAC,4BAA4B,oCAAjC,IAAI,CAAC,4BAA4B,GAC/B,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,EAAC;QAC3C,MAAM,IAAI,CAAC,4BAA4B,CAAC;QACxC,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC;IACrD,CAAC;CACF;AA9DD,gDA8DC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/browser-runtime-core",
-  "version": "3.13.0",
+  "version": "3.16.0",
   "description": "Mongosh browser runtime core",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -39,9 +39,10 @@
   },
   "devDependencies": {
     "@mongodb-js/eslint-config-mongosh": "^1.0.0",
+    "@mongodb-js/mongodb-ts-autocomplete": "^0.2.5",
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
     "@mongodb-js/tsconfig-mongosh": "^1.0.0",
-    "@mongosh/types": "3.8.0",
+    "@mongosh/types": "3.8.2",
     "bson": "^6.10.3",
     "depcheck": "^1.4.7",
     "eslint": "^7.25.0",
@@ -49,10 +50,10 @@
     "rimraf": "^3.0.2"
   },
   "dependencies": {
-    "@mongosh/autocomplete": "^3.13.0",
+    "@mongosh/autocomplete": "^3.16.0",
     "@mongosh/service-provider-core": "3.3.3",
-    "@mongosh/shell-api": "^3.13.0",
-    "@mongosh/shell-evaluator": "^3.13.0"
+    "@mongosh/shell-api": "^3.16.0",
+    "@mongosh/shell-evaluator": "^3.16.0"
   },
-  "gitHead": "5068f4cea2aa8056f458246804ddcbefbd5a1aae"
+  "gitHead": "ac4db1326a3c7ad18fff9a6ac06d1ca4604b0467"
 }

package/src/autocompleter/shell-api-autocompleter.spec.ts

@@ -1,8 +1,10 @@
 import { ShellApiAutocompleter } from './shell-api-autocompleter';
 import { expect } from 'chai';
 import { Topologies } from '@mongosh/shell-api';
+import type { AutocompleteParameters } from '@mongosh/autocomplete';
+import type { AutocompletionContext } from '@mongodb-js/mongodb-ts-autocomplete';
 
-const standalone440 = {
+const standalone440Parameters: AutocompleteParameters = {
   topology: () => Topologies.Standalone,
   apiVersionInfo: () => undefined,
   connectionInfo: () => ({
@@ -11,8 +13,23 @@ const standalone440 = {
     server_version: '4.4.0',
     is_local_atlas: false,
   }),
-  getCollectionCompletionsForCurrentDb: () => ['bananas'],
-  getDatabaseCompletions: () => ['databaseOne'],
+  getCollectionCompletionsForCurrentDb: () => Promise.resolve(['bananas']),
+  getDatabaseCompletions: () => Promise.resolve(['databaseOne']),
+};
+
+const standalone440Context: AutocompletionContext = {
+  currentDatabaseAndConnection: () => ({
+    connectionId: 'connection-1',
+    databaseName: 'databaseOne',
+  }),
+  databasesForConnection: () => Promise.resolve(['databaseOne']),
+  collectionsForDatabase: () => Promise.resolve(['bananas', 'coll1']),
+  schemaInformationForCollection: () => Promise.resolve({}),
+};
+
+const shellInstanceState = {
+  getAutocompleteParameters: () => standalone440Parameters,
+  getAutocompletionContext: () => standalone440Context,
 };
 
 describe('Autocompleter', function () {
@@ -20,7 +37,7 @@ describe('Autocompleter', function () {
     let autocompleter: ShellApiAutocompleter;
 
     beforeEach(function () {
-      autocompleter = new ShellApiAutocompleter(standalone440);
+      autocompleter = new ShellApiAutocompleter(shellInstanceState);
     });
 
     it('returns completions for text before cursor', async function () {

package/src/autocompleter/shell-api-autocompleter.ts

@@ -1,12 +1,29 @@
-import type { AutocompleteParameters } from '@mongosh/autocomplete';
-import cliReplCompleter from '@mongosh/autocomplete';
+import type { AutocompletionContext } from '@mongodb-js/mongodb-ts-autocomplete';
+import type {
+  AutocompleteParameters,
+  CompletionResults,
+} from '@mongosh/autocomplete';
+import { completer, initNewAutocompleter } from '@mongosh/autocomplete';
 import type { Autocompleter, Completion } from './autocompleter';
 
+type AutocompleteShellInstanceState = {
+  getAutocompleteParameters: () => AutocompleteParameters;
+  getAutocompletionContext: () => AutocompletionContext;
+};
+
 export class ShellApiAutocompleter implements Autocompleter {
-  private parameters: AutocompleteParameters;
+  private shellInstanceState: AutocompleteShellInstanceState;
+
+  // old autocomplete only:
+  private parameters: AutocompleteParameters | undefined;
+
+  // new autocomplete only:
+  private newMongoshCompleter:
+    | ((line: string) => Promise<CompletionResults>)
+    | undefined;
 
-  constructor(parameters: AutocompleteParameters) {
-    this.parameters = parameters;
+  constructor(shellInstanceState: AutocompleteShellInstanceState) {
+    this.shellInstanceState = shellInstanceState;
   }
 
   async getCompletions(code: string): Promise<Completion[]> {
@@ -14,7 +31,22 @@ export class ShellApiAutocompleter implements Autocompleter {
       return [];
     }
 
-    const completions = await cliReplCompleter(this.parameters, code);
+    let completions: CompletionResults;
+
+    if (process.env.USE_NEW_AUTOCOMPLETE) {
+      if (!this.newMongoshCompleter) {
+        this.newMongoshCompleter = await initNewAutocompleter(
+          this.shellInstanceState
+        );
+      }
+
+      completions = await this.newMongoshCompleter(code);
+    } else {
+      if (!this.parameters) {
+        this.parameters = this.shellInstanceState.getAutocompleteParameters();
+      }
+      completions = await completer(this.parameters, code);
+    }
 
     if (!completions || !completions.length) {
       return [];

package/src/open-context-runtime.ts

@@ -52,9 +52,7 @@ export class OpenContextRuntime implements Runtime {
 
   async getCompletions(code: string): Promise<Completion[]> {
     if (!this.autocompleter) {
-      this.autocompleter = new ShellApiAutocompleter(
-        this.instanceState.getAutocompleteParameters()
-      );
+      this.autocompleter = new ShellApiAutocompleter(this.instanceState);
       this.updatedConnectionInfoPromise ??=
         this.instanceState.fetchConnectionInfo();
       await this.updatedConnectionInfoPromise;