[WIP DO NOT MERGE] Autocomplete2 demo

packages/autocomplete/src/index.spec.ts

@@ -294,7 +294,7 @@ describe('completer.completer', function () {
 
     it('returns all suggestions', async function () {
       const i = 'db.';
-      const attr = shellSignatures.Database.attributes as any;
+      const attr = shellSignatures.DatabaseImpl.attributes as any;
       const dbComplete = Object.keys(attr);
       const adjusted = dbComplete
         .filter((c) => !attr[c].deprecated)
@@ -347,7 +347,7 @@ describe('completer.completer', function () {
     it('returns all suggestions', async function () {
       const i = 'db.shipwrecks.';
       const collComplete = Object.keys(
-        shellSignatures.Collection.attributes as any
+        shellSignatures.CollectionImpl.attributes as any
       );
       const adjusted = collComplete
         .filter(

packages/autocomplete/src/index.ts

@@ -84,9 +84,9 @@ async function completer(
 ): Promise<[string[], string, 'exclusive'] | [string[], string]> {
   const SHELL_COMPLETIONS = shellSignatures.ShellApi
     .attributes as TypeSignatureAttributes;
-  const COLL_COMPLETIONS = shellSignatures.Collection
+  const COLL_COMPLETIONS = shellSignatures.CollectionImpl
     .attributes as TypeSignatureAttributes;
-  const DB_COMPLETIONS = shellSignatures.Database
+  const DB_COMPLETIONS = shellSignatures.DatabaseImpl
     .attributes as TypeSignatureAttributes;
   const AGG_CURSOR_COMPLETIONS = shellSignatures.AggregationCursor
     .attributes as TypeSignatureAttributes;

packages/browser-runtime-core/src/open-context-runtime.ts

@@ -29,6 +29,7 @@ export interface InterpreterEnvironment {
  */
 export class OpenContextRuntime implements Runtime {
   private interpreterEnvironment: InterpreterEnvironment;
+  // TODO: we have to also port this to the new autocomplete
   private autocompleter: ShellApiAutocompleter | null = null;
   private shellEvaluator: ShellEvaluator;
   private instanceState: ShellInstanceState;

packages/build/src/packaging/package/helpers.ts

@@ -13,7 +13,9 @@ export async function execFile(
 ): Promise<ReturnType<typeof execFileWithoutLogging>> {
   const joinedCommand = [args[0], ...(args[1] ?? [])].join(' ');
   console.info(
-    'Running "' + joinedCommand + '" in ' + args[2]?.cwd ?? process.cwd()
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore TS2869 Right operand of ?? is unreachable because the left operand is never nullish.
+    `Running "${joinedCommand}" in ${args[2]?.cwd ?? process.cwd()}`
   );
   const result = await execFileWithoutLogging(...args);
   console.info('"' + joinedCommand + '" resulted in:', {

packages/cli-repl/src/cli-repl.spec.ts

@@ -1667,7 +1667,7 @@ describe('CliRepl', function () {
             )
             .flat();
           expect(apiEvents).to.have.lengthOf(1);
-          expect(apiEvents[0].properties.class).to.equal('Database');
+          expect(apiEvents[0].properties.class).to.equal('DatabaseImpl');
           expect(apiEvents[0].properties.method).to.equal(
             'printShardingStatus'
           );
@@ -1738,8 +1738,8 @@ describe('CliRepl', function () {
               e.properties.count,
             ])
           ).to.deep.equal([
-            ['Database', 'hello', 2],
-            ['Database', 'hello', 1],
+            ['DatabaseImpl', 'hello', 2],
+            ['DatabaseImpl', 'hello', 1],
           ]);
         });
 
@@ -2466,8 +2466,8 @@ describe('CliRepl', function () {
       });
 
       afterEach(async function () {
-        expect(output).not.to.include('Tab completion error');
-        expect(output).not.to.include(
+        expect(output, output).not.to.include('Tab completion error');
+        expect(output, output).not.to.include(
           'listCollections requires authentication'
         );
         await cliRepl.mongoshRepl.close();

packages/cli-repl/src/mongosh-repl.spec.ts

@@ -1,8 +1,11 @@
 /* eslint-disable no-control-regex */
 import { MongoshCommandFailed } from '@mongosh/errors';
-import type { ServiceProvider } from '@mongosh/service-provider-core';
+import type {
+  AggregationCursor,
+  ServiceProvider,
+} from '@mongosh/service-provider-core';
 import { bson } from '@mongosh/service-provider-core';
-import { ADMIN_DB } from '@mongosh/shell-api/lib/enums';
+import { ADMIN_DB } from '../../shell-api/lib/enums';
 import { CliUserConfig } from '@mongosh/types';
 import { EventEmitter, once } from 'events';
 import path from 'path';
@@ -89,6 +92,14 @@ describe('MongoshNodeRepl', function () {
       },
     });
     sp.runCommandWithCheck.resolves({ ok: 1 });
+
+    if (process.env.USE_NEW_AUTOCOMPLETE) {
+      sp.listCollections.resolves([{ name: 'coll' }]);
+      const aggCursor = stubInterface<AggregationCursor>();
+      aggCursor.toArray.resolves([{ foo: 1, bar: 2 }]);
+      sp.aggregate.returns(aggCursor);
+    }
+
     serviceProvider = sp;
     calledServiceProviderFunctions = () =>
       Object.fromEntries(
@@ -352,6 +363,14 @@ describe('MongoshNodeRepl', function () {
     };
     const tabtab = async () => {
       await tab();
+      if (process.env.USE_NEW_AUTOCOMPLETE) {
+        // TODO: This is because autocomplete() is async and will either list
+        // databases or collections or sample documents, any of which takes time
+        // to complete and can time out. There is probably a better way.
+        await new Promise((resolve) => {
+          setTimeout(resolve, 210);
+        });
+      }
       await tab();
     };
 
@@ -379,19 +398,28 @@ describe('MongoshNodeRepl', function () {
       expect(output).to.include('65537');
     });
 
-    it('does not stop input when autocompleting during .editor', async function () {
-      input.write('.editor\n');
-      await tick();
-      expect(output).to.include('Entering editor mode');
-      output = '';
-      input.write('db.');
-      await tabtab();
-      await tick();
-      input.write('version()\n');
-      input.write('\u0004'); // Ctrl+D
-      await waitEval(bus);
-      expect(output).to.include('Error running command serverBuildInfo');
-    });
+    context(
+      `autocompleting during .editor [${
+        process.env.USE_NEW_AUTOCOMPLETE ?? 'old'
+      }]`,
+      function () {
+        it('does not stop input when autocompleting during .editor', async function () {
+          input.write('.editor\n');
+          await tick();
+          expect(output).to.include('Entering editor mode');
+          output = '';
+          input.write('db.');
+          await tabtab();
+          await tick();
+          input.write('version()\n');
+          input.write('\u0004'); // Ctrl+D
+          await waitEval(bus);
+          expect(output, output).to.include(
+            'Error running command serverBuildInfo'
+          );
+        });
+      }
+    );
 
     it('can enter multiline code', async function () {
       for (const line of multilineCode.split('\n')) {
@@ -449,73 +477,86 @@ describe('MongoshNodeRepl', function () {
       expect(code).to.equal(undefined);
     });
 
-    context('autocompletion', function () {
-      it('autocompletes collection methods', async function () {
-        input.write('db.coll.');
-        await tabtab();
-        await tick();
-        expect(output).to.include('db.coll.updateOne');
-      });
-      it('autocompletes shell-api methods (once)', async function () {
-        input.write('vers');
-        await tabtab();
-        await tick();
-        expect(output).to.include('version');
-        expect(output).to.not.match(/version[ \t]+version/);
-      });
-      it('autocompletes async shell api methods', async function () {
-        input.write('db.coll.find().');
-        await tabtab();
-        await tick();
-        expect(output).to.include('db.coll.find().close');
-      });
-      it('autocompletes local variables', async function () {
-        input.write('let somelongvariable = 0\n');
-        await waitEval(bus);
-        output = '';
-        input.write('somelong');
-        await tabtab();
-        await tick();
-        expect(output).to.include('somelongvariable');
-      });
-      it('autocompletes partial repl commands', async function () {
-        input.write('.e');
-        await tabtab();
-        await tick();
-        expect(output).to.include('editor');
-        expect(output).to.include('exit');
-      });
-      it('autocompletes full repl commands', async function () {
-        input.write('.ed');
-        await tabtab();
-        await tick();
-        expect(output).to.include('.editor');
-        expect(output).not.to.include('exit');
-      });
-      it('autocompletion during .editor does not reset the prompt', async function () {
-        input.write('.editor\n');
-        await tick();
-        output = '';
-        expect((mongoshRepl.runtimeState().repl as any)._prompt).to.equal('');
-        input.write('db.');
-        await tabtab();
-        await tick();
-        input.write('foo\nbar\n');
-        expect((mongoshRepl.runtimeState().repl as any)._prompt).to.equal('');
-        input.write('\u0003'); // Ctrl+C for abort
-        await tick();
-        expect((mongoshRepl.runtimeState().repl as any)._prompt).to.equal(
-          'test> '
-        );
-        expect(stripAnsi(output)).to.equal('db.foo\r\nbar\r\n\r\ntest> ');
-      });
-      it('does not autocomplete tab-indented code', async function () {
-        output = '';
-        input.write('\t\tfoo');
-        await tick();
-        expect(output).to.equal('\t\tfoo');
-      });
-    });
+    context(
+      `autocompletion [${process.env.USE_NEW_AUTOCOMPLETE ?? 'old'}]`,
+      function () {
+        it('autocompletes collection methods', async function () {
+          input.write('db.coll.');
+          await tabtab();
+          await tick();
+          expect(output, output).to.include('db.coll.updateOne');
+        });
+        it('autocompletes collection schema fields', async function () {
+          if (!process.env.USE_NEW_AUTOCOMPLETE) {
+            // not supported in the old autocomplete
+            this.skip();
+          }
+          input.write('db.coll.find({');
+          await tabtab();
+          await tick();
+          expect(output, output).to.include('db.coll.find({foo');
+        });
+        it('autocompletes shell-api methods (once)', async function () {
+          input.write('vers');
+          await tabtab();
+          await tick();
+          expect(output, output).to.include('version');
+          expect(output, output).to.not.match(/version[ \t]+version/);
+        });
+        it('autocompletes async shell api methods', async function () {
+          input.write('db.coll.find().');
+          await tabtab();
+          await tick();
+          expect(output, output).to.include('db.coll.find().toArray');
+        });
+        it('autocompletes local variables', async function () {
+          input.write('let somelongvariable = 0\n');
+          await waitEval(bus);
+          output = '';
+          input.write('somelong');
+          await tabtab();
+          await tick();
+          expect(output, output).to.include('somelongvariable');
+        });
+        it('autocompletes partial repl commands', async function () {
+          input.write('.e');
+          await tabtab();
+          await tick();
+          expect(output, output).to.include('editor');
+          expect(output, output).to.include('exit');
+        });
+        it('autocompletes full repl commands', async function () {
+          input.write('.ed');
+          await tabtab();
+          await tick();
+          expect(output, output).to.include('.editor');
+          expect(output, output).not.to.include('exit');
+        });
+        it('autocompletion during .editor does not reset the prompt', async function () {
+          input.write('.editor\n');
+          await tick();
+          output = '';
+          expect((mongoshRepl.runtimeState().repl as any)._prompt).to.equal('');
+          input.write('db.');
+          await tabtab();
+          await tick();
+          input.write('foo\nbar\n');
+          expect((mongoshRepl.runtimeState().repl as any)._prompt).to.equal('');
+          input.write('\u0003'); // Ctrl+C for abort
+          await tick();
+          expect((mongoshRepl.runtimeState().repl as any)._prompt).to.equal(
+            'test> '
+          );
+          expect(stripAnsi(output)).to.equal('db.foo\r\nbar\r\n\r\ntest> ');
+        });
+        it('does not autocomplete tab-indented code', async function () {
+          output = '';
+          input.write('\t\tfoo');
+          await tick();
+          expect(output, output).to.equal('\t\tfoo');
+        });
+      }
+    );
 
     context('history support', function () {
       const arrowUp = '\x1b[A';