diff --git a/eslint.config.mjs b/eslint.config.mjs index ef2924a7c47..f5dee132089 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -244,7 +244,7 @@ export default [ // src/mongo/shell/utils_auth.d.ts authutil: true, - // src/mongo/shell/utils_sh.d.ts + // src/mongo/shell/utils_sh_global.js printShardingStatus: true, // src/mongo/scripting/mozjs/bindata.d.ts diff --git a/src/mongo/scripting/engine.cpp b/src/mongo/scripting/engine.cpp index 628a49bc504..aef0aa92107 100644 --- a/src/mongo/scripting/engine.cpp +++ b/src/mongo/scripting/engine.cpp @@ -370,6 +370,7 @@ extern const JSFile session_global; extern const JSFile query; extern const JSFile utils; extern const JSFile utils_sh; +extern const JSFile utils_sh_global; extern const JSFile utils_auth; extern const JSFile error_codes; } // namespace JSFiles @@ -382,6 +383,7 @@ void Scope::execCoreFiles() { execSetup(JSFiles::explain_query); execSetup(JSFiles::explainable); execSetup(JSFiles::session); + execSetup(JSFiles::utils_sh); // globals execSetup(JSFiles::bulk_api_global); @@ -390,10 +392,10 @@ void Scope::execCoreFiles() { execSetup(JSFiles::explain_query_global); execSetup(JSFiles::explainable_global); execSetup(JSFiles::session_global); + execSetup(JSFiles::utils_sh_global); // scripts execSetup(JSFiles::utils); - execSetup(JSFiles::utils_sh); execSetup(JSFiles::utils_auth); execSetup(JSFiles::mongo); execSetup(JSFiles::query); diff --git a/src/mongo/shell/BUILD.bazel b/src/mongo/shell/BUILD.bazel index 80d561ab1d0..5db1a7e33b5 100644 --- a/src/mongo/shell/BUILD.bazel +++ b/src/mongo/shell/BUILD.bazel @@ -294,6 +294,7 @@ MONGOJS_CPP_JSFILES = [ "utils.js", "utils_auth.js", "utils_sh.js", + "utils_sh_global.js", ":error_codes_js", ] diff --git a/src/mongo/shell/utils_sh.d.ts b/src/mongo/shell/utils_sh.d.ts deleted file mode 100644 index 3963be789a9..00000000000 --- a/src/mongo/shell/utils_sh.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -// type declarations for utils_sh.js - -declare var db: DB -declare function printShardingStatus() diff --git a/src/mongo/shell/utils_sh.js b/src/mongo/shell/utils_sh.js index cc2cae27ddf..8b846c436cb 100644 --- a/src/mongo/shell/utils_sh.js +++ b/src/mongo/shell/utils_sh.js @@ -1037,3 +1037,8 @@ function printShardingSizes(configDB) { print(raw); } + +export { + sh, + printShardingStatus, +}; diff --git a/src/mongo/shell/utils_sh_global.js b/src/mongo/shell/utils_sh_global.js new file mode 100644 index 00000000000..700c5dcdb13 --- /dev/null +++ b/src/mongo/shell/utils_sh_global.js @@ -0,0 +1,9 @@ +// Populate global variables from modules for backwards compatibility + +import { + printShardingStatus, + sh, +} from "src/mongo/shell/utils_sh.js"; + +globalThis.printShardingStatus = printShardingStatus; +globalThis.sh = sh;