src: put bootstrappers in lib/internal/bootstrap/

Create `lib/internal/bootstrap/` and put bootstrappers there:

Before:

```
lib/internal
├── ...
├── bootstrap_loaders.js
└── bootstrap_node.js
```

After:

```
lib/internal
├── ...
└── bootstrap
    ├── loaders.js
    └── node.js
```

PR-URL: nodejs#19177
Refs: nodejs#19112
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>

Author: joyeecheung

lib/internal/bootstrap_loaders.js lib/internal/bootstrap/loaders.jslib/internal/bootstrap_loaders.js renamed to lib/internal/bootstrap/loaders.js

@@ -2,7 +2,7 @@
 // modules. In contrast, user land modules are loaded using
 // lib/module.js (CommonJS Modules) or lib/internal/loader/* (ES Modules).
 //
-// This file is compiled and run by node.cc before bootstrap_node.js
+// This file is compiled and run by node.cc before bootstrap/node.js
 // was called, therefore the loaders are bootstraped before we start to
 // actually bootstrap Node.js. It creates the following objects:
 //
@@ -29,7 +29,7 @@
 //   so they can be loaded faster without the cost of I/O. This class makes the
 //   lib/internal/*, deps/internal/* modules and internalBinding() available by
 //   default to core modules, and lets the core modules require itself via
-//   require('internal/bootstrap_loaders') even when this file is not written in
+//   require('internal/bootstrap/loaders') even when this file is not written in
 //   CommonJS style.
 //
 // Other objects:
@@ -114,7 +114,7 @@
   // Think of this as module.exports in this file even though it is not
   // written in CommonJS style.
   const loaderExports = { internalBinding, NativeModule };
-  const loaderId = 'internal/bootstrap_loaders';
+  const loaderId = 'internal/bootstrap/loaders';
   NativeModule.require = function(id) {
     if (id === loaderId) {
       return loaderExports;
@@ -214,6 +214,6 @@
   };
 
   // This will be passed to the bootstrapNodeJSCore function in
-  // bootstrap_node.js.
+  // bootstrap/node.js.
   return loaderExports;
 });

lib/internal/bootstrap_node.js lib/internal/bootstrap/node.jslib/internal/bootstrap_node.js renamed to lib/internal/bootstrap/node.js

@@ -5,7 +5,7 @@
 // to the performance of the startup process, many dependencies are invoked
 // lazily.
 //
-// Before this file is run, lib/internal/bootstrap_loaders.js gets run first
+// Before this file is run, lib/internal/bootstrap/loaders.js gets run first
 // to bootstrap the internal binding and module loaders, including
 // process.binding(), process._linkedBinding(), internalBinding() and
 // NativeModule. And then { internalBinding, NativeModule } will be passed

lib/internal/loader/ModuleJob.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap_loaders');
+const { internalBinding } = require('internal/bootstrap/loaders');
 const { ModuleWrap } = internalBinding('module_wrap');
 const { SafeSet, SafePromise } = require('internal/safe_globals');
 const assert = require('assert');

lib/internal/loader/ModuleRequest.js

@@ -5,7 +5,7 @@ const internalCJSModule = require('internal/module');
 const CJSModule = require('module');
 const internalURLModule = require('internal/url');
 const internalFS = require('internal/fs');
-const { NativeModule } = require('internal/bootstrap_loaders');
+const { NativeModule } = require('internal/bootstrap/loaders');
 const { extname, _makeLong } = require('path');
 const { URL } = require('url');
 const { realpathSync } = require('fs');

lib/internal/loader/ModuleWrap.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap_loaders');
+const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   ModuleWrap,
   setImportModuleDynamicallyCallback

lib/internal/loader/search.js

@@ -3,7 +3,7 @@
 const { URL } = require('url');
 const CJSmodule = require('module');
 const errors = require('internal/errors');
-const { internalBinding } = require('internal/bootstrap_loaders');
+const { internalBinding } = require('internal/bootstrap/loaders');
 const { resolve } = internalBinding('module_wrap');
 
 module.exports = (target, base) => {

lib/module.js

@@ -21,7 +21,7 @@
 
 'use strict';
 
-const { NativeModule } = require('internal/bootstrap_loaders');
+const { NativeModule } = require('internal/bootstrap/loaders');
 const util = require('util');
 const internalModule = require('internal/module');
 const { getURLFromFilePath } = require('internal/url');

node.gyp

@@ -25,8 +25,8 @@
     'node_lib_target_name%': 'node_lib',
     'node_intermediate_lib_type%': 'static_library',
     'library_files': [
-      'lib/internal/bootstrap_loaders.js',
-      'lib/internal/bootstrap_node.js',
+      'lib/internal/bootstrap/loaders.js',
+      'lib/internal/bootstrap/node.js',
       'lib/async_hooks.js',
       'lib/assert.js',
       'lib/buffer.js',

src/node.cc

@@ -240,7 +240,7 @@ bool config_experimental_modules = false;
 
 // Set in node.cc by ParseArgs when --loader is used.
 // Used in node_config.cc to set a constant on process.binding('config')
-// that is used by lib/internal/bootstrap_node.js
+// that is used by lib/internal/bootstrap/node.js
 std::string config_userland_loader;  // NOLINT(runtime/string)
 
 // Set by ParseArgs when --pending-deprecation or NODE_PENDING_DEPRECATION
@@ -253,7 +253,7 @@ std::string config_warning_file;  // NOLINT(runtime/string)
 // Set in node.cc by ParseArgs when --expose-internals or --expose_internals is
 // used.
 // Used in node_config.cc to set a constant on process.binding('config')
-// that is used by lib/internal/bootstrap_node.js
+// that is used by lib/internal/bootstrap/node.js
 bool config_expose_internals = false;
 
 // Set to false in node.cc when NODE_NO_HTTP2=1 is used.
@@ -3685,23 +3685,23 @@ static Local<Function> GetBootstrapper(Environment* env, Local<String> source,
   // are not safe to ignore.
   try_catch.SetVerbose(false);
 
-  // Execute the factory javascript file
-  Local<Value> factory_v = ExecuteString(env, source, script_name);
+  // Execute the bootstrapper javascript file
+  Local<Value> bootstrapper_v = ExecuteString(env, source, script_name);
   if (try_catch.HasCaught())  {
     ReportException(env, try_catch);
     exit(10);
   }
 
-  CHECK(factory_v->IsFunction());
-  Local<Function> factory = Local<Function>::Cast(factory_v);
+  CHECK(bootstrapper_v->IsFunction());
+  Local<Function> bootstrapper = Local<Function>::Cast(bootstrapper_v);
 
-  return scope.Escape(factory);
+  return scope.Escape(bootstrapper);
 }
 
-static bool ExecuteBootstrapper(Environment* env, Local<Function> factory,
+static bool ExecuteBootstrapper(Environment* env, Local<Function> bootstrapper,
                                 int argc, Local<Value> argv[],
                                 Local<Value>* out) {
-  bool ret = factory->Call(
+  bool ret = bootstrapper->Call(
       env->context(), Null(env->isolate()), argc, argv).ToLocal(out);
 
   // If there was an error during bootstrap then it was either handled by the
@@ -3728,16 +3728,18 @@ void LoadEnvironment(Environment* env) {
   // are not safe to ignore.
   try_catch.SetVerbose(false);
 
-  // The factory scripts are lib/internal/bootstrap_loaders.js and
-  // lib/internal/bootstrap_node.js, each included as a static C string
+  // The bootstrapper scripts are lib/internal/bootstrap/loaders.js and
+  // lib/internal/bootstrap/node.js, each included as a static C string
   // defined in node_javascript.h, generated in node_javascript.cc by
   // node_js2c.
+  Local<String> loaders_name =
+      FIXED_ONE_BYTE_STRING(env->isolate(), "internal/bootstrap/loaders.js");
   Local<Function> loaders_bootstrapper =
-      GetBootstrapper(env, LoadersBootstrapperSource(env),
-                 FIXED_ONE_BYTE_STRING(env->isolate(), "bootstrap_loaders.js"));
+      GetBootstrapper(env, LoadersBootstrapperSource(env), loaders_name);
+  Local<String> node_name =
+      FIXED_ONE_BYTE_STRING(env->isolate(), "internal/bootstrap/node.js");
   Local<Function> node_bootstrapper =
-      GetBootstrapper(env, NodeBootstrapperSource(env),
-                 FIXED_ONE_BYTE_STRING(env->isolate(), "bootstrap_node.js"));
+      GetBootstrapper(env, NodeBootstrapperSource(env), node_name);
 
   // Add a reference to the global object
   Local<Object> global = env->context()->Global();

src/node_internals.h

@@ -158,13 +158,13 @@ extern bool config_experimental_modules;
 
 // Set in node.cc by ParseArgs when --loader is used.
 // Used in node_config.cc to set a constant on process.binding('config')
-// that is used by lib/internal/bootstrap_node.js
+// that is used by lib/internal/bootstrap/node.js
 extern std::string config_userland_loader;
 
 // Set in node.cc by ParseArgs when --expose-internals or --expose_internals is
 // used.
 // Used in node_config.cc to set a constant on process.binding('config')
-// that is used by lib/internal/bootstrap_node.js
+// that is used by lib/internal/bootstrap/node.js
 extern bool config_expose_internals;
 
 // Set in node.cc by ParseArgs when --redirect-warnings= is used.