From 3f9270642b23fe62bb545032c8085aaf7dab9b53 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Fri, 23 Mar 2018 15:32:23 +0100 Subject: [PATCH 1/3] lib: rename BufferList.js to buffer_list.js --- lib/_stream_readable.js | 2 +- lib/internal/streams/{BufferList.js => buffer_list.js} | 0 node.gyp | 2 +- test/parallel/test-stream-buffer-list.js | 2 +- test/parallel/test-stream2-readable-from-list.js | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename lib/internal/streams/{BufferList.js => buffer_list.js} (100%) diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js index 0b6cf10aac2ec3..9f79a07a6ffbbe 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 { getHighWaterMark } = require('internal/streams/state'); const { 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/node.gyp b/node.gyp index 97dd639bc5e4df..b4ea05e87f4747 100644 --- a/node.gyp +++ b/node.gyp @@ -147,7 +147,7 @@ 'lib/internal/stream_base_commons.js', 'lib/internal/streams/lazy_transform.js', 'lib/internal/streams/async_iterator.js', - 'lib/internal/streams/BufferList.js', + 'lib/internal/streams/buffer_list.js', 'lib/internal/streams/duplex_base.js', 'lib/internal/streams/duplexpair.js', 'lib/internal/streams/legacy.js', diff --git a/test/parallel/test-stream-buffer-list.js b/test/parallel/test-stream-buffer-list.js index c151154afa3d01..ef9b1fef6dbdab 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'); const util = require('util'); // Test empty buffer list. 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(); From 31ff0be7da329627da9dcfcf4c2430fa823992c4 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Mon, 26 Mar 2018 08:53:19 +0200 Subject: [PATCH 2/3] lib: rename lib/internal/vm/Module.js to lower case --- lib/internal/vm/{Module.js => module.js} | 0 lib/vm.js | 2 +- node.gyp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename lib/internal/vm/{Module.js => module.js} (100%) 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 ca7b6f33960d2c..47eb1b851f02c5 100644 --- a/lib/vm.js +++ b/lib/vm.js @@ -240,4 +240,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 b4ea05e87f4747..c4be7c4d103412 100644 --- a/node.gyp +++ b/node.gyp @@ -143,8 +143,8 @@ 'lib/internal/v8.js', 'lib/internal/v8_prof_polyfill.js', 'lib/internal/v8_prof_processor.js', - 'lib/internal/vm/Module.js', 'lib/internal/stream_base_commons.js', + 'lib/internal/vm/module.js', 'lib/internal/streams/lazy_transform.js', 'lib/internal/streams/async_iterator.js', 'lib/internal/streams/buffer_list.js', From da58002fc65901155d04090ae1ae34851998de49 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Mon, 26 Mar 2018 09:31:09 +0200 Subject: [PATCH 3/3] lib: rename modules js source to lower snake_case This commit renames all JavaScript source files in lib/internal/modules to lower snake_case. --- lib/internal/modules/cjs/loader.js | 5 +++-- ...eateDynamicModule.js => create_dynamic_module.js} | 0 .../esm/{DefaultResolve.js => default_resolve.js} | 0 lib/internal/modules/esm/{Loader.js => loader.js} | 11 ++++++----- .../modules/esm/{ModuleJob.js => module_job.js} | 0 .../modules/esm/{ModuleMap.js => module_map.js} | 2 +- .../modules/esm/{Translators.js => translators.js} | 3 ++- lib/internal/process/esm_loader.js | 2 +- node.gyp | 12 ++++++------ test/es-module/test-esm-loader-modulemap.js | 9 +++++---- test/es-module/test-esm-loader-search.js | 2 +- test/message/esm_display_syntax_error.out | 2 +- test/message/esm_display_syntax_error_import.out | 2 +- .../esm_display_syntax_error_import_module.out | 2 +- test/message/esm_display_syntax_error_module.out | 2 +- test/parallel/test-internal-module-map-asserts.js | 2 +- 16 files changed, 30 insertions(+), 26 deletions(-) rename lib/internal/modules/esm/{CreateDynamicModule.js => create_dynamic_module.js} (100%) rename lib/internal/modules/esm/{DefaultResolve.js => default_resolve.js} (100%) rename lib/internal/modules/esm/{Loader.js => loader.js} (92%) rename lib/internal/modules/esm/{ModuleJob.js => module_job.js} (100%) rename lib/internal/modules/esm/{ModuleMap.js => module_map.js} (93%) rename lib/internal/modules/esm/{Translators.js => translators.js} (97%) diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js index 470cf741e13cdc..6fb14c6d10548e 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -54,8 +54,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'); const { CHAR_UPPERCASE_A, CHAR_LOWERCASE_A, 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 e10296cce2dace..18b0827eee0f68 100644 --- a/lib/internal/modules/esm/Loader.js +++ b/lib/internal/modules/esm/loader.js @@ -6,11 +6,12 @@ const { ERR_MISSING_DYNAMIC_INTSTANTIATE_HOOK, ERR_UNKNOWN_MODULE_FORMAT } = require('internal/errors').codes; -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 985d24dc8d3f94..f4786f8e9ef0be 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 { ERR_INVALID_ARG_TYPE } = require('internal/errors').codes; 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 e45c0faa185214..bcb6501af69eb6 100644 --- a/lib/internal/process/esm_loader.js +++ b/lib/internal/process/esm_loader.js @@ -7,7 +7,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/node.gyp b/node.gyp index c4be7c4d103412..384439b1144b65 100644 --- a/node.gyp +++ b/node.gyp @@ -106,12 +106,12 @@ '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/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/translators.js', 'lib/internal/safe_globals.js', 'lib/internal/net.js', 'lib/internal/os.js', diff --git a/test/es-module/test-esm-loader-modulemap.js b/test/es-module/test-esm-loader-modulemap.js index bf02bfcf663e57..946d54ffaaa5aa 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 0f4591a4e3fd95..0ca8990cb723ad 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'); common.expectsError( () => search('target', undefined), diff --git a/test/message/esm_display_syntax_error.out b/test/message/esm_display_syntax_error.out index 4564fe06d582ac..ed2e928eb1742d 100644 --- a/test/message/esm_display_syntax_error.out +++ b/test/message/esm_display_syntax_error.out @@ -3,4 +3,4 @@ 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:*:*) diff --git a/test/message/esm_display_syntax_error_import.out b/test/message/esm_display_syntax_error_import.out index 02050d361e101d..31ee2b6f4b1157 100644 --- a/test/message/esm_display_syntax_error_import.out +++ b/test/message/esm_display_syntax_error_import.out @@ -3,4 +3,4 @@ file:///*/test/message/esm_display_syntax_error_import.mjs:6 notfound ^^^^^^^^ SyntaxError: The requested module '../fixtures/es-module-loaders/module-named-exports' does not provide an export named 'notfound' - at ModuleJob._instantiate (internal/modules/esm/ModuleJob.js:*:*) + at ModuleJob._instantiate (internal/modules/esm/module_job.js:*:*) diff --git a/test/message/esm_display_syntax_error_import_module.out b/test/message/esm_display_syntax_error_import_module.out index ae0bf331de53ee..b067a77942fa95 100644 --- a/test/message/esm_display_syntax_error_import_module.out +++ b/test/message/esm_display_syntax_error_import_module.out @@ -3,4 +3,4 @@ file:///*/test/fixtures/es-module-loaders/syntax-error-import.mjs:1 import { foo, notfound } from './module-named-exports'; ^^^^^^^^ SyntaxError: The requested module './module-named-exports' does not provide an export named 'notfound' - at ModuleJob._instantiate (internal/modules/esm/ModuleJob.js:*:*) + at ModuleJob._instantiate (internal/modules/esm/module_job.js:*:*) diff --git a/test/message/esm_display_syntax_error_module.out b/test/message/esm_display_syntax_error_module.out index fc0581c225f485..e636abad9e464b 100644 --- a/test/message/esm_display_syntax_error_module.out +++ b/test/message/esm_display_syntax_error_module.out @@ -3,4 +3,4 @@ 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:*:*) 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.