tools: make comma-dangle ESLint rule more stringent

.eslintrc.js

@@ -95,7 +95,13 @@ module.exports = {
         ignorePattern: '.*',
       },
     }],
-    'comma-dangle': ['error', 'only-multiline'],
+    'comma-dangle': ['error', {
+      arrays: 'always-multiline',
+      exports: 'only-multiline',
+      functions: 'only-multiline',
+      imports: 'only-multiline',
+      objects: 'only-multiline',
+    }],
     'comma-spacing': 'error',
     'comma-style': 'error',
     'computed-property-spacing': 'error',

doc/api/child_process.md

@@ -1225,7 +1225,7 @@ const subprocess = spawn(
     '-c',
     `node -e "setInterval(() => {
       console.log(process.pid, 'is alive')
-    }, 500);"`
+    }, 500);"`,
   ], {
     stdio: ['inherit', 'inherit', 'inherit']
   }
@@ -1558,7 +1558,7 @@ const subprocess = child_process.spawn('ls', {
   stdio: [
     0, // Use parent's stdin for child.
     'pipe', // Pipe child's stdout to parent.
-    fs.openSync('err.out', 'w') // Direct child's stderr to a file.
+    fs.openSync('err.out', 'w'), // Direct child's stderr to a file.
   ]
 });
 

doc/api/dns.md

@@ -155,7 +155,7 @@ section if a custom port is used.
   '4.4.4.4',
   '2001:4860:4860::8888',
   '4.4.4.4:1053',
-  '[2001:4860:4860::8888]:1053'
+  '[2001:4860:4860::8888]:1053',
 ]
 ```
 
@@ -645,7 +645,7 @@ dns.setServers([
   '4.4.4.4',
   '[2001:4860:4860::8888]',
   '4.4.4.4:1053',
-  '[2001:4860:4860::8888]:1053'
+  '[2001:4860:4860::8888]:1053',
 ]);
 ```
 
@@ -755,7 +755,7 @@ section if a custom port is used.
   '4.4.4.4',
   '2001:4860:4860::8888',
   '4.4.4.4:1053',
-  '[2001:4860:4860::8888]:1053'
+  '[2001:4860:4860::8888]:1053',
 ]
 ```
 
@@ -1148,7 +1148,7 @@ dnsPromises.setServers([
   '4.4.4.4',
   '[2001:4860:4860::8888]',
   '4.4.4.4:1053',
-  '[2001:4860:4860::8888]:1053'
+  '[2001:4860:4860::8888]:1053',
 ]);
 ```
 

doc/api/os.md

@@ -115,7 +115,7 @@ The properties included on each object include:
       idle: 1070905480,
       irq: 20
     }
-  }
+  },
 ]
 ```
 

doc/api/url.md

@@ -566,7 +566,7 @@ with [`JSON.stringify()`][].
 ```js
 const myURLs = [
   new URL('https://www.example.com'),
-  new URL('https://test.example.org')
+  new URL('https://test.example.org'),
 ];
 console.log(JSON.stringify(myURLs));
 // Prints ["https://www.example.com/","https://test.example.org/"]
@@ -703,7 +703,7 @@ let params;
 params = new URLSearchParams([
   ['user', 'abc'],
   ['query', 'first'],
-  ['query', 'second']
+  ['query', 'second'],
 ]);
 console.log(params.toString());
 // Prints 'user=abc&query=first&query=second'
@@ -728,7 +728,7 @@ console.log(params.toString());
 
 // Each key-value pair must have exactly two elements
 new URLSearchParams([
-  ['user', 'abc', 'error']
+  ['user', 'abc', 'error'],
 ]);
 // Throws TypeError [ERR_INVALID_TUPLE]:
 //        Each query pair must be an iterable [name, value] tuple

doc/api/webcrypto.md

@@ -187,15 +187,15 @@ const { subtle } = require('crypto').webcrypto;
 async function generateAndWrapHmacKey(format = 'jwk', hash = 'SHA-512') {
   const [
     key,
-    wrappingKey
+    wrappingKey,
   ] = await Promise.all([
     subtle.generateKey({
       name: 'HMAC', hash
     }, true, ['sign', 'verify']),
     subtle.generateKey({
       name: 'AES-KW',
       length: 256
-    }, true, ['wrapKey', 'unwrapKey'])
+    }, true, ['wrapKey', 'unwrapKey']),
   ]);
 
   const wrappedKey = await subtle.wrapKey(format, key, wrappingKey, 'AES-KW');

lib/assert.js

@@ -95,7 +95,7 @@ const meta = [
   '\\u000f', '\\u0010', '\\u0011', '\\u0012', '\\u0013',
   '\\u0014', '\\u0015', '\\u0016', '\\u0017', '\\u0018',
   '\\u0019', '\\u001a', '\\u001b', '\\u001c', '\\u001d',
-  '\\u001e', '\\u001f'
+  '\\u001e', '\\u001f',
 ];
 
 const escapeFn = (str) => meta[StringPrototypeCharCodeAt(str, 0)];
@@ -276,7 +276,7 @@ function parseCode(code, offset) {
     node.node.start,
     StringPrototypeReplace(StringPrototypeSlice(code,
                                                 node.node.start, node.node.end),
-                           escapeSequencesRegExp, escapeFn)
+                           escapeSequencesRegExp, escapeFn),
   ];
 }
 

lib/internal/bootstrap/loaders.js

@@ -102,7 +102,7 @@ const internalBindingAllowlist = new SafeSet([
   'util',
   'uv',
   'v8',
-  'zlib'
+  'zlib',
 ]);
 
 // Set up process.binding() and process._linkedBinding().

lib/internal/bootstrap/pre_execution.js

@@ -263,7 +263,7 @@ function initializeDeprecations() {
     'isSetIterator',
     'isTypedArray',
     'isUint8Array',
-    'isAnyArrayBuffer'
+    'isAnyArrayBuffer',
   ]) {
     utilBinding[name] = pendingDeprecation ?
       deprecate(types[name],

lib/internal/child_process/serialization.js

@@ -84,7 +84,7 @@ const advanced = {
     sizeBuffer.writeUInt32BE(serializedMessage.length);
     return channel.writeBuffer(req, Buffer.concat([
       sizeBuffer,
-      serializedMessage
+      serializedMessage,
     ]), handle);
   },
 };

lib/internal/console/constructor.js

@@ -532,7 +532,7 @@ const consoleMethods = {
         }
       }
       return final([
-        iterKey, keyKey, valuesKey
+        iterKey, keyKey, valuesKey,
       ], [
         getIndexArray(length),
         keys,

lib/internal/crypto/hkdf.js

@@ -95,7 +95,7 @@ function prepareKey(key) {
         'ArrayBuffer',
         'TypedArray',
         'DataView',
-        'Buffer'
+        'Buffer',
       ],
       key);
   }

lib/internal/crypto/keygen.js

@@ -150,7 +150,7 @@ function parseKeyEncoding(keyType, options = {}) {
     privateFormat,
     privateType,
     cipher,
-    passphrase
+    passphrase,
   ];
 }
 

lib/internal/crypto/keys.js

@@ -90,7 +90,7 @@ const [
   KeyObject,
   SecretKeyObject,
   PublicKeyObject,
-  PrivateKeyObject
+  PrivateKeyObject,
 ] = createNativeKeyObjectClass((NativeKeyObject) => {
   // Publicly visible KeyObject class.
   class KeyObject extends NativeKeyObject {

lib/internal/crypto/random.js

@@ -296,7 +296,7 @@ function getRandomValues(data) {
 
 const kHexDigits = [
   48, 49, 50, 51, 52, 53, 54, 55,
-  56, 57, 97, 98, 99, 100, 101, 102
+  56, 57, 97, 98, 99, 100, 101, 102,
 ];
 
 const kBatchSize = 128;

lib/internal/crypto/util.js

@@ -133,7 +133,7 @@ const getArrayBufferOrView = hideStackFrames((buffer, name, encoding) => {
         'ArrayBuffer',
         'Buffer',
         'TypedArray',
-        'DataView'
+        'DataView',
       ],
       buffer
     );
@@ -200,7 +200,7 @@ const kHashTypes = [
   'SHA-1',
   'SHA-256',
   'SHA-384',
-  'SHA-512'
+  'SHA-512',
 ];
 
 function validateMaxBufferLength(data, name) {
@@ -278,7 +278,7 @@ const validateByteSource = hideStackFrames((val, name) => {
       'ArrayBuffer',
       'TypedArray',
       'DataView',
-      'Buffer'
+      'Buffer',
     ],
     val);
 });

lib/internal/encoding.js

@@ -285,7 +285,7 @@ const encodings = new SafeMap([
   ['windows-949', 'euc-kr'],
   ['utf-16be', 'utf-16be'],
   ['utf-16le', 'utf-16le'],
-  ['utf-16', 'utf-16le']
+  ['utf-16', 'utf-16le'],
 ]);
 
 // Unfortunately, String.prototype.trim also removes non-ascii whitespace,

lib/internal/errors.js

@@ -70,7 +70,7 @@ const kTypes = [
   'Object',
   'boolean',
   'bigint',
-  'symbol'
+  'symbol',
 ];
 
 const MainContextError = Error;

lib/internal/freeze_intrinsics.js

@@ -203,7 +203,7 @@ module.exports = function() {
     WebAssembly.CompileError.prototype,
     WebAssembly.LinkError.prototype,
     WebAssembly.RuntimeError.prototype,
-    SharedArrayBuffer.prototype
+    SharedArrayBuffer.prototype,
   ];
   const intrinsics = [
     // Anonymous Intrinsics
@@ -317,7 +317,7 @@ module.exports = function() {
     BigInt,
     Atomics,
     WebAssembly,
-    SharedArrayBuffer
+    SharedArrayBuffer,
   ];
 
   if (typeof Intl !== 'undefined') {

lib/internal/http2/util.js

@@ -108,7 +108,7 @@ const kValidPseudoHeaders = new SafeSet([
   HTTP2_HEADER_AUTHORITY,
   HTTP2_HEADER_SCHEME,
   HTTP2_HEADER_PATH,
-  HTTP2_HEADER_PROTOCOL
+  HTTP2_HEADER_PROTOCOL,
 ]);
 
 // This set contains headers that are permitted to have only a single
@@ -153,7 +153,7 @@ const kSingleValueHeaders = new SafeSet([
   HTTP2_HEADER_TK,
   HTTP2_HEADER_UPGRADE_INSECURE_REQUESTS,
   HTTP2_HEADER_USER_AGENT,
-  HTTP2_HEADER_X_CONTENT_TYPE_OPTIONS
+  HTTP2_HEADER_X_CONTENT_TYPE_OPTIONS,
 ]);
 
 // The HTTP methods in this set are specifically defined as assigning no
@@ -163,7 +163,7 @@ const kSingleValueHeaders = new SafeSet([
 const kNoPayloadMethods = new SafeSet([
   HTTP2_METHOD_DELETE,
   HTTP2_METHOD_GET,
-  HTTP2_METHOD_HEAD
+  HTTP2_METHOD_HEAD,
 ]);
 
 // The following ArrayBuffer instances are used to share memory more efficiently

lib/internal/main/print_help.js

@@ -55,13 +55,13 @@ const envVars = new SafeMap(ArrayPrototypeConcat([
   ['NODE_V8_COVERAGE', { helpText: 'directory to output v8 coverage JSON ' +
     'to' }],
   ['UV_THREADPOOL_SIZE', { helpText: 'sets the number of threads used in ' +
-    'libuv\'s threadpool' }]
+    'libuv\'s threadpool' }],
 ], hasIntl ? [
   ['NODE_ICU_DATA', { helpText: 'data path for ICU (Intl object) data' +
-    hasSmallICU ? '' : ' (will extend linked-in data)' }]
+    hasSmallICU ? '' : ' (will extend linked-in data)' }],
 ] : []), (hasNodeOptions ? [
   ['NODE_OPTIONS', { helpText: 'set CLI options in the environment via a ' +
-    'space-separated list' }]
+    'space-separated list' }],
 ] : []), hasCrypto ? [
   ['OPENSSL_CONF', { helpText: 'load OpenSSL configuration from file' }],
   ['SSL_CERT_DIR', { helpText: 'sets OpenSSL\'s directory of trusted ' +
@@ -108,7 +108,7 @@ function format(
   let maxFirstColumnUsed = 0;
 
   for (const [
-    name, { helpText, type, value }
+    name, { helpText, type, value },
   ] of ArrayPrototypeSort([...options.entries()])) {
     if (!helpText) continue;
 

lib/internal/modules/cjs/loader.js

@@ -198,7 +198,7 @@ let wrap = function(script) {
 
 const wrapper = [
   '(function (exports, require, module, __filename, __dirname) { ',
-  '\n});'
+  '\n});',
 ];
 
 let wrapperProxy = new Proxy(wrapper, {

lib/internal/per_context/primordials.js

@@ -145,7 +145,7 @@ function copyPrototype(src, dest, prefix) {
 [
   'JSON',
   'Math',
-  'Reflect'
+  'Reflect',
 ].forEach((name) => {
   copyPropsRenamed(global[name], primordials, name);
 });

lib/internal/process/per_thread.js

@@ -72,7 +72,7 @@ function getFastAPIs(binding) {
 
     return [
       hrValues[0] * 0x100000000 + hrValues[1],
-      hrValues[2]
+      hrValues[2],
     ];
   }
 

lib/internal/querystring.js

@@ -33,7 +33,7 @@ const isHexTable = new Int8Array([
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0  // ... 256
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  // ... 256
 ]);
 
 function encodeStr(str, noEscapeTable, hexTable) {

lib/internal/streams/pipeline.js

@@ -241,7 +241,7 @@ function pipeline(...streams) {
               pt.end(val);
             }, (err) => {
               pt.destroy(err);
-            }
+            },
           ]);
         } else if (isIterable(ret, true)) {
           finishCount++;

lib/internal/tty.js

@@ -77,7 +77,7 @@ const TERM_ENVS_REG_EXP = [
   /^rxvt/,
   /^screen/,
   /^xterm/,
-  /^vt100/
+  /^vt100/,
 ];
 
 let warned = false;

lib/internal/url.js

@@ -1088,7 +1088,7 @@ const noEscape = new Int8Array([
   0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x40 - 0x4F
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, // 0x50 - 0x5F
   0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x60 - 0x6F
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0  // 0x70 - 0x7F
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,  // 0x70 - 0x7F
 ]);
 
 // Special version of hexTable that uses `+` for U+0020 SPACE.