Merge remote-tracking branch 'origin/main' into MONGOSH-1851-create-vector-search-index-w-description

Author: alenakhineika

.github/workflows/merge-release-tag.yml

@@ -0,0 +1,33 @@
+name: Merge Release Tag
+
+on:
+  push:
+    tags:
+      - 'mongosh@[0-9]+.[0-9]+.[0-9]+'
+      - 'mongosh@[0-9]+.[0-9]+.[0-9]-rc.[0-9]+'
+  workflow_dispatch:
+
+permissions:
+  contents: none # We use the github app to checkout and push changes
+
+jobs:
+  merge-release-tag:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: mongodb-js/devtools-shared/actions/setup-bot-token@main
+        id: app-token
+        with:
+          app-id: ${{ vars.DEVTOOLS_BOT_APP_ID }}
+          private-key: ${{ secrets.DEVTOOLS_BOT_PRIVATE_KEY }}
+
+      - uses: actions/checkout@v4
+        with:
+          ref: main
+          fetch-depth: "0"
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Merge release tag into main
+        run: |
+          git merge ${{ github.ref }} -m "chore(release): merge changes from ${{ github.ref_name }}"
+          git push origin main

THIRD_PARTY_NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **mongosh**.
-This document was automatically generated on Tue Feb 18 2025.
+This document was automatically generated on Fri Feb 21 2025.
 
 ## List of dependencies
 
@@ -172,7 +172,7 @@ Package|Version|License
 **[bplist-parser](#a012056f1b32796d923573a3b1ef72cf36943d95e5e2f6af0f7eeab57a21be24)**|0.2.0|MIT
 **[brace-expansion](#2ba3ee23cc6a2718243e9c0c59ce154058f292965f563aa291b459a414e863cb)**|1.1.11|MIT
 **[browserslist](#a95274c46e5fc3c90b90fdf6cc259a6b44331ddca76e255afd128465621592ed)**|4.23.3|MIT
-**[bson](#88bcf6ee33d70cc1bf263aac89726781fb724e29ba9647909ffb24584ef23cf4)**|6.10.1|Apache-2.0
+**[bson](#c2a71e4ed4c66bf769b189dcac6ccdf5afec76968be4a1cc63105fda1d2b2132)**|6.10.3|Apache-2.0
 **[buffer-alloc-unsafe](#1022220a813dd092d3ced592ac36121a00bd08a9c2020e08ad370dc29ed217f0)**|1.1.0|MIT
 **[buffer-alloc](#d5cbc95b9dde4a46cd45334630efe3bc9025c904074bee845376bd60651441c0)**|1.2.0|MIT
 **[buffer-fill](#c3747dfd267829ceeb564a1717d0c65d88d2b366e215f640067abefac59e3fd4)**|1.0.0|MIT
@@ -20471,8 +20471,8 @@ License files:
 
 
 
-<a id="88bcf6ee33d70cc1bf263aac89726781fb724e29ba9647909ffb24584ef23cf4"></a>
-### [bson](https://www.npmjs.com/package/bson) (version 6.10.1)
+<a id="c2a71e4ed4c66bf769b189dcac6ccdf5afec76968be4a1cc63105fda1d2b2132"></a>
+### [bson](https://www.npmjs.com/package/bson) (version 6.10.3)
 License tags: Apache-2.0
 
 License files:

package-lock.json

@@ -42,7 +42,7 @@
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
     "@mongodb-js/tsconfig-mongosh": "^1.0.0",
     "@mongosh/types": "3.2.0",
-    "bson": "^6.10.1",
+    "bson": "^6.10.3",
     "depcheck": "^1.4.7",
     "eslint": "^7.25.0",
     "prettier": "^2.8.8",

packages/browser-runtime-core/package.json

@@ -39,7 +39,7 @@ Execute the following steps to publish a new release:
    ```
    Follow the instructions and verify the inferred release version is correct.
 7. Wait for Evergreen to finish the publication stage.
-8. The previous step will have pushed tags for the npm publishes. Check out the tag for `mongosh@<version>` (not `v<version>`), create a branch for it, push that branch and open a PR with it. Then immediately merge that branch **using the `git merge` CLI command into main** and push to main. **NEVER** use the Github PR merge functionality, since that would squash the commit and give it a new commit hash that is different from the one in the tag.
+8. Ensure that the version bump was automatically merged into main and that it is synced up with the `[email protected]` tag.
 9. Close the Jira ticket for the release, post an update in the `#mongosh` Slack channel and ping the docs team.
 
 ### Branches and Tags

packages/build/README.md

@@ -10,7 +10,7 @@ import type { Duplex } from 'stream';
 import { PassThrough } from 'stream';
 import type { StubbedInstance } from 'ts-sinon';
 import { stubInterface } from 'ts-sinon';
-import { promisify } from 'util';
+import { inspect, promisify } from 'util';
 import {
   expect,
   fakeTTYProps,
@@ -526,18 +526,48 @@ describe('MongoshNodeRepl', function () {
       ]) {
         context(mode, function () {
           let getHistory: () => string[];
+          let getAllHistoryItems: () => string[];
 
           beforeEach(function () {
             const { history } = mongoshRepl.runtimeState().repl as unknown as {
               history: string[];
             };
             getHistory = () =>
               history.filter((line) => !line.startsWith('prefill-'));
+            getAllHistoryItems = () => history;
             for (let i = 0; i < prefill; i++) {
               history.unshift(`prefill-${i}`);
             }
           });
 
+          describe('history() command', function () {
+            it('returns a formatted array of history', async function () {
+              output = '';
+              input.write('history()\n');
+              await waitEval(bus);
+              expect(output).includes(
+                inspect(
+                  getAllHistoryItems()
+                    .slice(1, getAllHistoryItems().length)
+                    .reverse(),
+                  { maxArrayLength: Infinity }
+                )
+              );
+            });
+
+            it('works with array operations', async function () {
+              output = '';
+              input.write('history().slice(history().length-10).reverse()\n');
+              await waitEval(bus);
+              const history = getAllHistoryItems().slice(1).reverse();
+              expect(output).includes(
+                inspect(history.slice(history.length - 10).reverse(), {
+                  maxArrayLength: Infinity,
+                })
+              );
+            });
+          });
+
           it('looks up existing entries, if there are any', async function () {
             output = '';
             input.write(arrowUp);

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

@@ -47,6 +47,7 @@ import { markTime } from './startup-timing';
 import type { Context } from 'vm';
 import { Script, createContext, runInContext } from 'vm';
 import { installPasteSupport } from './repl-paste-support';
+import util from 'util';
 
 declare const __non_webpack_require__: any;
 
@@ -365,6 +366,8 @@ class MongoshNodeRepl implements EvaluationListener {
     await this.finishInitializingNodeRepl();
     instanceState.setCtx(context);
 
+    this.setupHistoryCommand();
+
     if (!this.shellCliOptions.nodb && !this.shellCliOptions.quiet) {
       // cf. legacy shell:
       // https://github.com/mongodb/mongo/blob/a6df396047a77b90bf1ce9463eecffbee16fb864/src/mongo/shell/mongo_main.cpp#L1003-L1026
@@ -391,6 +394,35 @@ class MongoshNodeRepl implements EvaluationListener {
     return { __initialized: 'yes' };
   }
 
+  setupHistoryCommand(): void {
+    const history = () => {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const replHistory: string[] = (this.runtimeState().repl as any).history;
+      const formattedHistory =
+        // Remove the history call from the formatted history
+        replHistory.slice(1).reverse();
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      formattedHistory[util.inspect.custom as any] = ((
+        depth: number | null,
+        options: util.InspectOptions,
+        inspect: typeof util.inspect
+      ) => {
+        // We pass a copy of the array without the util.inspect.custom set
+        // to prevent infinite recursion.
+        return inspect(formattedHistory.concat(), {
+          ...options,
+          depth,
+          maxArrayLength: Infinity,
+        });
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      }) as any;
+      return formattedHistory;
+    };
+
+    this.runtimeState().context.history = history;
+  }
+
   private async finishInitializingNodeRepl(): Promise<void> {
     const { repl, instanceState } = this.runtimeState();
     if (!repl) return;

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

@@ -41,7 +41,7 @@
     "@types/chai-as-promised": "^7.1.3",
     "@types/node": "^14.14.6",
     "@types/rimraf": "^3.0.0",
-    "bson": "^6.10.1",
+    "bson": "^6.10.3",
     "chai-as-promised": "^7.1.1",
     "depcheck": "^1.4.7",
     "eslint": "^7.25.0",