diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js index 725cc2651873db..9bd09c3e4d61e4 100644 --- a/lib/_stream_readable.js +++ b/lib/_stream_readable.js @@ -29,7 +29,7 @@ const Stream = require('stream'); const { Buffer } = require('buffer'); const util = require('util'); const debug = util.debuglog('stream'); -const BufferList = require('internal/streams/BufferList'); +const BufferList = require('internal/streams/buffer_list'); const destroyImpl = require('internal/streams/destroy'); const errors = require('internal/errors'); var StringDecoder; diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js index 39333f049f6c1a..919f577a8ec71a 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -49,8 +49,9 @@ module.exports = Module; // these are below module.exports for the circular reference const asyncESM = require('internal/process/esm_loader'); -const ModuleJob = require('internal/modules/esm/ModuleJob'); -const createDynamicModule = require('internal/modules/esm/CreateDynamicModule'); +const ModuleJob = require('internal/modules/esm/module_job'); +const createDynamicModule = require( + 'internal/modules/esm/create_dynamic_module'); function stat(filename) { filename = path.toNamespacedPath(filename); diff --git a/lib/internal/modules/esm/CreateDynamicModule.js b/lib/internal/modules/esm/create_dynamic_module.js similarity index 100% rename from lib/internal/modules/esm/CreateDynamicModule.js rename to lib/internal/modules/esm/create_dynamic_module.js diff --git a/lib/internal/modules/esm/DefaultResolve.js b/lib/internal/modules/esm/default_resolve.js similarity index 100% rename from lib/internal/modules/esm/DefaultResolve.js rename to lib/internal/modules/esm/default_resolve.js diff --git a/lib/internal/modules/esm/Loader.js b/lib/internal/modules/esm/loader.js similarity index 92% rename from lib/internal/modules/esm/Loader.js rename to lib/internal/modules/esm/loader.js index 170fa23ec798ff..08acb603c2c712 100644 --- a/lib/internal/modules/esm/Loader.js +++ b/lib/internal/modules/esm/loader.js @@ -1,11 +1,12 @@ 'use strict'; const errors = require('internal/errors'); -const ModuleMap = require('internal/modules/esm/ModuleMap'); -const ModuleJob = require('internal/modules/esm/ModuleJob'); -const defaultResolve = require('internal/modules/esm/DefaultResolve'); -const createDynamicModule = require('internal/modules/esm/CreateDynamicModule'); -const translators = require('internal/modules/esm/Translators'); +const ModuleMap = require('internal/modules/esm/module_map'); +const ModuleJob = require('internal/modules/esm/module_job'); +const defaultResolve = require('internal/modules/esm/default_resolve'); +const createDynamicModule = require( + 'internal/modules/esm/create_dynamic_module'); +const translators = require('internal/modules/esm/translators'); const FunctionBind = Function.call.bind(Function.prototype.bind); diff --git a/lib/internal/modules/esm/ModuleJob.js b/lib/internal/modules/esm/module_job.js similarity index 100% rename from lib/internal/modules/esm/ModuleJob.js rename to lib/internal/modules/esm/module_job.js diff --git a/lib/internal/modules/esm/ModuleMap.js b/lib/internal/modules/esm/module_map.js similarity index 93% rename from lib/internal/modules/esm/ModuleMap.js rename to lib/internal/modules/esm/module_map.js index 7f5ee8bf9e7762..04cd3227c32652 100644 --- a/lib/internal/modules/esm/ModuleMap.js +++ b/lib/internal/modules/esm/module_map.js @@ -1,6 +1,6 @@ 'use strict'; -const ModuleJob = require('internal/modules/esm/ModuleJob'); +const ModuleJob = require('internal/modules/esm/module_job'); const { SafeMap } = require('internal/safe_globals'); const debug = require('util').debuglog('esm'); const errors = require('internal/errors'); diff --git a/lib/internal/modules/esm/ModuleWrap.js b/lib/internal/modules/esm/module_wrap.js similarity index 100% rename from lib/internal/modules/esm/ModuleWrap.js rename to lib/internal/modules/esm/module_wrap.js diff --git a/lib/internal/modules/esm/Translators.js b/lib/internal/modules/esm/translators.js similarity index 97% rename from lib/internal/modules/esm/Translators.js rename to lib/internal/modules/esm/translators.js index 2928115be515e0..d181647c4505e8 100644 --- a/lib/internal/modules/esm/Translators.js +++ b/lib/internal/modules/esm/translators.js @@ -8,7 +8,8 @@ const { } = require('internal/modules/cjs/helpers'); const CJSModule = require('internal/modules/cjs/loader'); const internalURLModule = require('internal/url'); -const createDynamicModule = require('internal/modules/esm/CreateDynamicModule'); +const createDynamicModule = require( + 'internal/modules/esm/create_dynamic_module'); const fs = require('fs'); const { _makeLong } = require('path'); const { SafeMap } = require('internal/safe_globals'); diff --git a/lib/internal/process/esm_loader.js b/lib/internal/process/esm_loader.js index ca2ce57feb54d8..36a3f4b342aafe 100644 --- a/lib/internal/process/esm_loader.js +++ b/lib/internal/process/esm_loader.js @@ -6,7 +6,7 @@ const { } = internalBinding('module_wrap'); const { getURLFromFilePath } = require('internal/url'); -const Loader = require('internal/modules/esm/Loader'); +const Loader = require('internal/modules/esm/loader'); const path = require('path'); const { URL } = require('url'); diff --git a/lib/internal/streams/BufferList.js b/lib/internal/streams/buffer_list.js similarity index 100% rename from lib/internal/streams/BufferList.js rename to lib/internal/streams/buffer_list.js diff --git a/lib/internal/vm/Module.js b/lib/internal/vm/module.js similarity index 100% rename from lib/internal/vm/Module.js rename to lib/internal/vm/module.js diff --git a/lib/vm.js b/lib/vm.js index 4da0d7c6c3c528..d79357413b3512 100644 --- a/lib/vm.js +++ b/lib/vm.js @@ -209,4 +209,4 @@ module.exports = { }; if (process.binding('config').experimentalVMModules) - module.exports.Module = require('internal/vm/Module').Module; + module.exports.Module = require('internal/vm/module').Module; diff --git a/node.gyp b/node.gyp index b35aec31dbde82..e74ba156dff0c8 100644 --- a/node.gyp +++ b/node.gyp @@ -107,13 +107,13 @@ 'lib/internal/linkedlist.js', 'lib/internal/modules/cjs/helpers.js', 'lib/internal/modules/cjs/loader.js', - 'lib/internal/modules/esm/Loader.js', - 'lib/internal/modules/esm/CreateDynamicModule.js', - 'lib/internal/modules/esm/DefaultResolve.js', - 'lib/internal/modules/esm/ModuleJob.js', - 'lib/internal/modules/esm/ModuleMap.js', - 'lib/internal/modules/esm/ModuleWrap.js', - 'lib/internal/modules/esm/Translators.js', + 'lib/internal/modules/esm/loader.js', + 'lib/internal/modules/esm/create_dynamic_module.js', + 'lib/internal/modules/esm/default_resolve.js', + 'lib/internal/modules/esm/module_job.js', + 'lib/internal/modules/esm/module_map.js', + 'lib/internal/modules/esm/module_wrap.js', + 'lib/internal/modules/esm/translators.js', 'lib/internal/safe_globals.js', 'lib/internal/net.js', 'lib/internal/os.js', @@ -142,9 +142,9 @@ 'lib/internal/http2/util.js', 'lib/internal/v8_prof_polyfill.js', 'lib/internal/v8_prof_processor.js', - 'lib/internal/vm/Module.js', + 'lib/internal/vm/module.js', 'lib/internal/streams/lazy_transform.js', - 'lib/internal/streams/BufferList.js', + 'lib/internal/streams/buffer_list.js', 'lib/internal/streams/legacy.js', 'lib/internal/streams/destroy.js', 'lib/internal/wrap_js_stream.js', diff --git a/test/es-module/test-esm-loader-modulemap.js b/test/es-module/test-esm-loader-modulemap.js index e9faa6d9f122f4..ed21afaf984d16 100644 --- a/test/es-module/test-esm-loader-modulemap.js +++ b/test/es-module/test-esm-loader-modulemap.js @@ -7,10 +7,11 @@ const common = require('../common'); const { URL } = require('url'); -const Loader = require('internal/modules/esm/Loader'); -const ModuleMap = require('internal/modules/esm/ModuleMap'); -const ModuleJob = require('internal/modules/esm/ModuleJob'); -const createDynamicModule = require('internal/modules/esm/CreateDynamicModule'); +const Loader = require('internal/modules/esm/loader'); +const ModuleMap = require('internal/modules/esm/module_map'); +const ModuleJob = require('internal/modules/esm/module_job'); +const createDynamicModule = require( + 'internal/modules/esm/create_dynamic_module'); const stubModuleUrl = new URL('file://tmp/test'); const stubModule = createDynamicModule(['default'], stubModuleUrl); diff --git a/test/es-module/test-esm-loader-search.js b/test/es-module/test-esm-loader-search.js index 5a1f5a562a0d3e..3f8044a5785d5c 100644 --- a/test/es-module/test-esm-loader-search.js +++ b/test/es-module/test-esm-loader-search.js @@ -5,7 +5,7 @@ const common = require('../common'); -const { search } = require('internal/modules/esm/DefaultResolve'); +const { search } = require('internal/modules/esm/default_resolve'); const errors = require('internal/errors'); common.expectsError( diff --git a/test/message/esm_display_syntax_error.out b/test/message/esm_display_syntax_error.out index 73c9495824038e..b82f8fc33428fa 100644 --- a/test/message/esm_display_syntax_error.out +++ b/test/message/esm_display_syntax_error.out @@ -3,5 +3,5 @@ file:///*/test/message/esm_display_syntax_error.mjs:3 await async () => 0; ^^^^^ SyntaxError: Unexpected reserved word - at translators.set (internal/modules/esm/Translators.js:*:*) + at translators.set (internal/modules/esm/translators.js:*:*) at diff --git a/test/message/esm_display_syntax_error_import.out b/test/message/esm_display_syntax_error_import.out index e257f0eb7a94e5..fc140f58d5b1c1 100644 --- a/test/message/esm_display_syntax_error_import.out +++ b/test/message/esm_display_syntax_error_import.out @@ -3,5 +3,5 @@ file:///*/test/message/esm_display_syntax_error_import.mjs:6 notfound ^^^^^^^^ SyntaxError: The requested module does not provide an export named 'notfound' - at ModuleJob._instantiate (internal/modules/esm/ModuleJob.js:*:*) + at ModuleJob._instantiate (internal/modules/esm/module_job.js:*:*) at diff --git a/test/message/esm_display_syntax_error_import_module.out b/test/message/esm_display_syntax_error_import_module.out index c6286a2a987282..40d66e7b1b546d 100644 --- a/test/message/esm_display_syntax_error_import_module.out +++ b/test/message/esm_display_syntax_error_import_module.out @@ -3,5 +3,5 @@ file:///*/test/fixtures/es-module-loaders/syntax-error-import.mjs:1 import { foo, notfound } from './module-named-exports'; ^^^^^^^^ SyntaxError: The requested module does not provide an export named 'notfound' - at ModuleJob._instantiate (internal/modules/esm/ModuleJob.js:*:*) + at ModuleJob._instantiate (internal/modules/esm/module_job.js:*:*) at diff --git a/test/message/esm_display_syntax_error_module.out b/test/message/esm_display_syntax_error_module.out index 122e352102ad0f..0ab802f8ca95f0 100644 --- a/test/message/esm_display_syntax_error_module.out +++ b/test/message/esm_display_syntax_error_module.out @@ -3,5 +3,5 @@ file:///*/test/fixtures/es-module-loaders/syntax-error.mjs:2 await async () => 0; ^^^^^ SyntaxError: Unexpected reserved word - at translators.set (internal/modules/esm/Translators.js:*:*) + at translators.set (internal/modules/esm/translators.js:*:*) at diff --git a/test/parallel/test-internal-module-map-asserts.js b/test/parallel/test-internal-module-map-asserts.js index 330f04cfd96800..4563fc605e0792 100644 --- a/test/parallel/test-internal-module-map-asserts.js +++ b/test/parallel/test-internal-module-map-asserts.js @@ -3,7 +3,7 @@ const common = require('../common'); const assert = require('assert'); -const ModuleMap = require('internal/modules/esm/ModuleMap'); +const ModuleMap = require('internal/modules/esm/module_map'); // ModuleMap.get, ModuleMap.has and ModuleMap.set should only accept string // values as url argument. diff --git a/test/parallel/test-internal-module-wrap.js b/test/parallel/test-internal-module-wrap.js index 050cc18a4dbee6..631f69b5ebb626 100644 --- a/test/parallel/test-internal-module-wrap.js +++ b/test/parallel/test-internal-module-wrap.js @@ -6,7 +6,7 @@ const common = require('../common'); common.crashOnUnhandledRejection(); const assert = require('assert'); -const ModuleWrap = require('internal/modules/esm/ModuleWrap'); +const ModuleWrap = require('internal/modules/esm/module_wrap'); const { getPromiseDetails, isPromise } = process.binding('util'); const setTimeoutAsync = require('util').promisify(setTimeout); diff --git a/test/parallel/test-stream-buffer-list.js b/test/parallel/test-stream-buffer-list.js index 6ea359b458f61b..d7728d1171caa3 100644 --- a/test/parallel/test-stream-buffer-list.js +++ b/test/parallel/test-stream-buffer-list.js @@ -2,7 +2,7 @@ 'use strict'; require('../common'); const assert = require('assert'); -const BufferList = require('internal/streams/BufferList'); +const BufferList = require('internal/streams/buffer_list'); // Test empty buffer list. const emptyList = new BufferList(); diff --git a/test/parallel/test-stream2-readable-from-list.js b/test/parallel/test-stream2-readable-from-list.js index 965f962638d586..f812f75e7ca8b5 100644 --- a/test/parallel/test-stream2-readable-from-list.js +++ b/test/parallel/test-stream2-readable-from-list.js @@ -24,7 +24,7 @@ require('../common'); const assert = require('assert'); const fromList = require('_stream_readable')._fromList; -const BufferList = require('internal/streams/BufferList'); +const BufferList = require('internal/streams/buffer_list'); function bufferListFromArray(arr) { const bl = new BufferList();