use a shell-api constant and switch to 2.3.8

gagik · gagik · commit ed9ffa1bb86a · 2025-01-10T14:08:49.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -149,24 +149,24 @@
     "packages/history",
     "packages/java-shell",
     "packages/js-multiline-to-singleline",
-    "packages/types",
-    "packages/i18n",
     "packages/logging",
+    "packages/node-runtime-worker-thread",
     "packages/service-provider-core",
-    "packages/arg-parser",
+    "packages/snippet-manager",
+    "packages/types",
+    "packages/i18n",
     "packages/service-provider-node-driver",
+    "packages/arg-parser",
     "packages/shell-api",
     "packages/autocomplete",
     "packages/shell-evaluator",
-    "packages/snippet-manager",
     "packages/browser-runtime-core",
     "packages/editor",
+    "packages/browser-repl",
     "packages/browser-runtime-electron",
     "packages/cli-repl",
     "packages/e2e-tests",
     "packages/mongosh",
-    "packages/node-runtime-worker-thread",
-    "packages/browser-repl",
     "packages/connectivity-tests"
   ],
   "overrides": {
diff --git a/packages/browser-runtime-core/package.json b/packages/browser-runtime-core/package.json
@@ -41,7 +41,7 @@
     "@mongodb-js/eslint-config-mongosh": "^1.0.0",
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
     "@mongodb-js/tsconfig-mongosh": "^1.0.0",
-    "@mongosh/types": "2.3.7",
+    "@mongosh/types": "2.3.8",
     "bson": "^6.10.1",
     "depcheck": "^1.4.7",
     "eslint": "^7.25.0",
diff --git a/packages/build/src/npm-packages/bump.ts b/packages/build/src/npm-packages/bump.ts
@@ -55,6 +55,36 @@ export async function bumpMongoshReleasePackages(): Promise<void> {
       JSON.stringify(packageJson, null, 2) + '\n'
     );
   }
+
+  await bumpShellApiMongoshVersion(version);
+}
+
+/** Sets the shell-api constant to match the mongosh version. */
+export async function bumpShellApiMongoshVersion(version: string) {
+  const shellApiVersionFilePath = path.join(
+    __dirname,
+    PROJECT_ROOT,
+    'packages',
+    'shell-api',
+    'src',
+    'mongosh-version.ts'
+  );
+
+  const versionFileContent = await fs.readFile(
+    shellApiVersionFilePath,
+    'utf-8'
+  );
+
+  // Write the updated content back to the mongosh-version file
+  await fs.writeFile(
+    shellApiVersionFilePath,
+    // Replace the version inside MONGOSH_VERSION = '...'
+    versionFileContent.replace(
+      /MONGOSH_VERSION = '.*'/,
+      `MONGOSH_VERSION = '${version}'`
+    ),
+    'utf-8'
+  );
 }
 
 /** Bumps auxiliary packages without setting a new version of mongosh. */
diff --git a/packages/logging/package.json b/packages/logging/package.json
@@ -18,9 +18,9 @@
   },
   "dependencies": {
     "@mongodb-js/devtools-connect": "^3.3.4",
-    "@mongosh/errors": "2.3.7",
-    "@mongosh/history": "2.3.7",
-    "@mongosh/types": "2.3.7",
+    "@mongosh/errors": "2.3.8",
+    "@mongosh/history": "2.3.8",
+    "@mongosh/types": "2.3.8",
     "mongodb-log-writer": "^1.4.2",
     "mongodb-redact": "^1.1.2"
   },
diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json
@@ -37,11 +37,11 @@
     "@mongodb-js/eslint-config-mongosh": "^1.0.0",
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
     "@mongodb-js/tsconfig-mongosh": "^1.0.0",
-    "@mongosh/browser-runtime-core": "2.3.7",
-    "@mongosh/browser-runtime-electron": "2.3.7",
-    "@mongosh/service-provider-core": "2.3.7",
-    "@mongosh/service-provider-node-driver": "2.3.7",
-    "@mongosh/types": "2.3.7",
+    "@mongosh/browser-runtime-core": "2.3.8",
+    "@mongosh/browser-runtime-electron": "2.3.8",
+    "@mongosh/service-provider-core": "2.3.8",
+    "@mongosh/service-provider-node-driver": "2.3.8",
+    "@mongosh/types": "2.3.8",
     "bson": "^6.10.1",
     "depcheck": "^1.4.7",
     "eslint": "^7.25.0",
diff --git a/packages/node-runtime-worker-thread/src/worker-thread-evaluation-listener.ts b/packages/node-runtime-worker-thread/src/worker-thread-evaluation-listener.ts
@@ -59,7 +59,6 @@ export class WorkerThreadEvaluationListener {
             (Promise.resolve() as Promise<never>)
           );
         },
-        version: workerRuntime.evaluationListener?.version,
       },
       worker
     );
diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@aws-sdk/credential-providers": "^3.525.0",
-    "@mongosh/errors": "2.3.7",
+    "@mongosh/errors": "2.3.8",
     "bson": "^6.10.1",
     "mongodb": "^6.12.0",
     "mongodb-build-info": "^1.7.2",
diff --git a/packages/shell-api/package.json b/packages/shell-api/package.json
@@ -51,7 +51,7 @@
     "@mongodb-js/eslint-config-mongosh": "^1.0.0",
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
     "@mongodb-js/tsconfig-mongosh": "^1.0.0",
-    "@mongosh/types": "2.3.7",
+    "@mongosh/types": "2.3.8",
     "bson": "^6.10.1",
     "depcheck": "^1.4.7",
     "eslint": "^7.25.0",
diff --git a/packages/shell-api/src/mongosh-version.ts b/packages/shell-api/src/mongosh-version.ts
@@ -0,0 +1,7 @@
+/**
+ *  NOTE: Do not manually modify this file.
+ *  The MONGOSH_VERSION gets re-generated automatically with scripts/set-mongosh-version.ts
+ **/
+
+/** Current mongosh cli-repl version. */
+export const MONGOSH_VERSION = '2.3.8';
diff --git a/packages/shell-api/src/shell-api.ts b/packages/shell-api/src/shell-api.ts
@@ -35,6 +35,7 @@ import type { ClientSideFieldLevelEncryptionOptions } from './field-level-encryp
 import { dirname } from 'path';
 import { ShellUserConfig } from '@mongosh/types';
 import i18n from '@mongosh/i18n';
+import { MONGOSH_VERSION } from './mongosh-version';
 
 const instanceStateSymbol = Symbol.for('@@mongosh.instanceState');
 const loadCallNestingLevelSymbol = Symbol.for('@@mongosh.loadCallNestingLevel');
@@ -289,11 +290,7 @@ export default class ShellApi extends ShellApiClass {
   }
 
   version(): string {
-    const version = this._instanceState.evaluationListener.version;
-    if (!version) {
-      throw new MongoshInternalError('mongosh version not known');
-    }
-    return version;
+    return MONGOSH_VERSION;
   }
 
   @returnsPromise
diff --git a/packages/shell-api/src/shell-instance-state.ts b/packages/shell-api/src/shell-instance-state.ts
@@ -116,9 +116,6 @@ export interface EvaluationListener
    * options used to access it.
    */
   getCryptLibraryOptions?: () => Promise<AutoEncryptionOptions['extraOptions']>;
-
-  /** References the mongosh version used by the EvaluationListener */
-  version?: string;
 }
 
 /**
diff --git a/packages/snippet-manager/package.json b/packages/snippet-manager/package.json
@@ -36,9 +36,9 @@
   },
   "dependencies": {
     "@mongodb-js/devtools-proxy-support": "^0.4.2",
-    "@mongosh/errors": "2.3.7",
-    "@mongosh/shell-api": "2.3.7",
-    "@mongosh/types": "2.3.7",
+    "@mongosh/errors": "2.3.8",
+    "@mongosh/shell-api": "2.3.8",
+    "@mongosh/types": "2.3.8",
     "bson": "^6.10.1",
     "cross-spawn": "^7.0.5",
     "escape-string-regexp": "^4.0.0",

Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,6 @@ export interface EvaluationListener`
`116`	`116`	`* options used to access it.`
`117`	`117`	`*/`
`118`	`118`	`getCryptLibraryOptions?: () => Promise<AutoEncryptionOptions['extraOptions']>;`
`119`		`-`
`120`		`- /** References the mongosh version used by the EvaluationListener */`
`121`		`- version?: string;`
`122`	`119`	`}`
`123`	`120`
`124`	`121`	`/**`