SERVER-105602: Make utils_sh.js a module (#38614)

GitOrigin-RevId: 5a0e32479fcd4d9d702fa7fadd3c872758170aca
This commit is contained in:
Steve McClure 2025-07-17 12:53:42 -04:00 committed by MongoDB Bot
parent d5019d9d82
commit 0c85dbda95
6 changed files with 19 additions and 6 deletions

View File

@ -244,7 +244,7 @@ export default [
// src/mongo/shell/utils_auth.d.ts // src/mongo/shell/utils_auth.d.ts
authutil: true, authutil: true,
// src/mongo/shell/utils_sh.d.ts // src/mongo/shell/utils_sh_global.js
printShardingStatus: true, printShardingStatus: true,
// src/mongo/scripting/mozjs/bindata.d.ts // src/mongo/scripting/mozjs/bindata.d.ts

View File

@ -370,6 +370,7 @@ extern const JSFile session_global;
extern const JSFile query; extern const JSFile query;
extern const JSFile utils; extern const JSFile utils;
extern const JSFile utils_sh; extern const JSFile utils_sh;
extern const JSFile utils_sh_global;
extern const JSFile utils_auth; extern const JSFile utils_auth;
extern const JSFile error_codes; extern const JSFile error_codes;
} // namespace JSFiles } // namespace JSFiles
@ -382,6 +383,7 @@ void Scope::execCoreFiles() {
execSetup(JSFiles::explain_query); execSetup(JSFiles::explain_query);
execSetup(JSFiles::explainable); execSetup(JSFiles::explainable);
execSetup(JSFiles::session); execSetup(JSFiles::session);
execSetup(JSFiles::utils_sh);
// globals // globals
execSetup(JSFiles::bulk_api_global); execSetup(JSFiles::bulk_api_global);
@ -390,10 +392,10 @@ void Scope::execCoreFiles() {
execSetup(JSFiles::explain_query_global); execSetup(JSFiles::explain_query_global);
execSetup(JSFiles::explainable_global); execSetup(JSFiles::explainable_global);
execSetup(JSFiles::session_global); execSetup(JSFiles::session_global);
execSetup(JSFiles::utils_sh_global);
// scripts // scripts
execSetup(JSFiles::utils); execSetup(JSFiles::utils);
execSetup(JSFiles::utils_sh);
execSetup(JSFiles::utils_auth); execSetup(JSFiles::utils_auth);
execSetup(JSFiles::mongo); execSetup(JSFiles::mongo);
execSetup(JSFiles::query); execSetup(JSFiles::query);

View File

@ -294,6 +294,7 @@ MONGOJS_CPP_JSFILES = [
"utils.js", "utils.js",
"utils_auth.js", "utils_auth.js",
"utils_sh.js", "utils_sh.js",
"utils_sh_global.js",
":error_codes_js", ":error_codes_js",
] ]

View File

@ -1,4 +0,0 @@
// type declarations for utils_sh.js
declare var db: DB
declare function printShardingStatus()

View File

@ -1037,3 +1037,8 @@ function printShardingSizes(configDB) {
print(raw); print(raw);
} }
export {
sh,
printShardingStatus,
};

View File

@ -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;