Skip to content

Commit

Permalink
doc,lib: prepare for stricter multi-line array linting
Browse files Browse the repository at this point in the history
We're about to turn on a requirement for dangling commas.

PR-URL: #37088
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Trott committed Feb 19, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 08a2383 commit b461a1b
Showing 35 changed files with 59 additions and 59 deletions.
4 changes: 2 additions & 2 deletions doc/api/child_process.md
Original file line number Diff line number Diff line change
@@ -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.
]
});

8 changes: 4 additions & 4 deletions doc/api/dns.md
Original file line number Diff line number Diff line change
@@ -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',
]);
```

2 changes: 1 addition & 1 deletion doc/api/os.md
Original file line number Diff line number Diff line change
@@ -115,7 +115,7 @@ The properties included on each object include:
idle: 1070905480,
irq: 20
}
}
},
]
```

6 changes: 3 additions & 3 deletions doc/api/url.md
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions doc/api/webcrypto.md
Original file line number Diff line number Diff line change
@@ -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');
4 changes: 2 additions & 2 deletions lib/assert.js
Original file line number Diff line number Diff line change
@@ -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),
];
}

2 changes: 1 addition & 1 deletion lib/internal/bootstrap/loaders.js
Original file line number Diff line number Diff line change
@@ -102,7 +102,7 @@ const internalBindingAllowlist = new SafeSet([
'util',
'uv',
'v8',
'zlib'
'zlib',
]);

// Set up process.binding() and process._linkedBinding().
2 changes: 1 addition & 1 deletion lib/internal/bootstrap/pre_execution.js
Original file line number Diff line number Diff line change
@@ -263,7 +263,7 @@ function initializeDeprecations() {
'isSetIterator',
'isTypedArray',
'isUint8Array',
'isAnyArrayBuffer'
'isAnyArrayBuffer',
]) {
utilBinding[name] = pendingDeprecation ?
deprecate(types[name],
2 changes: 1 addition & 1 deletion lib/internal/child_process/serialization.js
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ const advanced = {
sizeBuffer.writeUInt32BE(serializedMessage.length);
return channel.writeBuffer(req, Buffer.concat([
sizeBuffer,
serializedMessage
serializedMessage,
]), handle);
},
};
2 changes: 1 addition & 1 deletion lib/internal/console/constructor.js
Original file line number Diff line number Diff line change
@@ -532,7 +532,7 @@ const consoleMethods = {
}
}
return final([
iterKey, keyKey, valuesKey
iterKey, keyKey, valuesKey,
], [
getIndexArray(length),
keys,
2 changes: 1 addition & 1 deletion lib/internal/crypto/hkdf.js
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ function prepareKey(key) {
'ArrayBuffer',
'TypedArray',
'DataView',
'Buffer'
'Buffer',
],
key);
}
2 changes: 1 addition & 1 deletion lib/internal/crypto/keygen.js
Original file line number Diff line number Diff line change
@@ -150,7 +150,7 @@ function parseKeyEncoding(keyType, options = {}) {
privateFormat,
privateType,
cipher,
passphrase
passphrase,
];
}

2 changes: 1 addition & 1 deletion lib/internal/crypto/keys.js
Original file line number Diff line number Diff line change
@@ -90,7 +90,7 @@ const [
KeyObject,
SecretKeyObject,
PublicKeyObject,
PrivateKeyObject
PrivateKeyObject,
] = createNativeKeyObjectClass((NativeKeyObject) => {
// Publicly visible KeyObject class.
class KeyObject extends NativeKeyObject {
2 changes: 1 addition & 1 deletion lib/internal/crypto/random.js
Original file line number Diff line number Diff line change
@@ -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;
6 changes: 3 additions & 3 deletions lib/internal/crypto/util.js
Original file line number Diff line number Diff line change
@@ -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);
});
2 changes: 1 addition & 1 deletion lib/internal/encoding.js
Original file line number Diff line number Diff line change
@@ -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,
2 changes: 1 addition & 1 deletion lib/internal/errors.js
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ const kTypes = [
'Object',
'boolean',
'bigint',
'symbol'
'symbol',
];

const MainContextError = Error;
4 changes: 2 additions & 2 deletions lib/internal/freeze_intrinsics.js
Original file line number Diff line number Diff line change
@@ -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') {
6 changes: 3 additions & 3 deletions lib/internal/http2/util.js
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions lib/internal/main/print_help.js
Original file line number Diff line number Diff line change
@@ -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;

2 changes: 1 addition & 1 deletion lib/internal/modules/cjs/loader.js
Original file line number Diff line number Diff line change
@@ -198,7 +198,7 @@ let wrap = function(script) {

const wrapper = [
'(function (exports, require, module, __filename, __dirname) { ',
'\n});'
'\n});',
];

let wrapperProxy = new Proxy(wrapper, {
2 changes: 1 addition & 1 deletion lib/internal/per_context/primordials.js
Original file line number Diff line number Diff line change
@@ -145,7 +145,7 @@ function copyPrototype(src, dest, prefix) {
[
'JSON',
'Math',
'Reflect'
'Reflect',
].forEach((name) => {
copyPropsRenamed(global[name], primordials, name);
});
2 changes: 1 addition & 1 deletion lib/internal/process/per_thread.js
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ function getFastAPIs(binding) {

return [
hrValues[0] * 0x100000000 + hrValues[1],
hrValues[2]
hrValues[2],
];
}

2 changes: 1 addition & 1 deletion lib/internal/querystring.js
Original file line number Diff line number Diff line change
@@ -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) {
2 changes: 1 addition & 1 deletion lib/internal/streams/pipeline.js
Original file line number Diff line number Diff line change
@@ -241,7 +241,7 @@ function pipeline(...streams) {
pt.end(val);
}, (err) => {
pt.destroy(err);
}
},
]);
} else if (isIterable(ret, true)) {
finishCount++;
2 changes: 1 addition & 1 deletion lib/internal/tty.js
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ const TERM_ENVS_REG_EXP = [
/^rxvt/,
/^screen/,
/^xterm/,
/^vt100/
/^vt100/,
];

let warned = false;
2 changes: 1 addition & 1 deletion lib/internal/url.js
Original file line number Diff line number Diff line change
@@ -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.
8 changes: 4 additions & 4 deletions lib/internal/util/inspect.js
Original file line number Diff line number Diff line change
@@ -707,7 +707,7 @@ function formatProxy(ctx, proxy, recurseTimes) {
ctx.indentationLvl += 2;
const res = [
formatValue(ctx, proxy[0], recurseTimes),
formatValue(ctx, proxy[1], recurseTimes)
formatValue(ctx, proxy[1], recurseTimes),
];
ctx.indentationLvl -= 2;
return reduceToSingleString(
@@ -1529,7 +1529,7 @@ function formatTypedArray(value, length, ctx, ignored, recurseTimes) {
'length',
'byteLength',
'byteOffset',
'buffer'
'buffer',
]) {
const str = formatValue(ctx, value[key], recurseTimes, true);
ArrayPrototypePush(output, `[${key}]: ${str}`);
@@ -1608,7 +1608,7 @@ function formatMapIterInner(ctx, recurseTimes, entries, state) {
const pos = i * 2;
const res = [
formatValue(ctx, entries[pos], recurseTimes),
formatValue(ctx, entries[pos + 1], recurseTimes)
formatValue(ctx, entries[pos + 1], recurseTimes),
];
output[i] = reduceToSingleString(
ctx, res, '', ['[', ']'], kArrayExtrasType, recurseTimes);
@@ -1658,7 +1658,7 @@ function formatPromise(ctx, value, recurseTimes) {
output = [
state === kRejected ?
`${ctx.stylize('<rejected>', 'special')} ${str}` :
str
str,
];
}
return output;
2 changes: 1 addition & 1 deletion lib/internal/v8_prof_processor.js
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ const scriptFiles = [
'internal/deps/v8/tools/arguments',
'internal/deps/v8/tools/tickprocessor',
'internal/deps/v8/tools/SourceMap',
'internal/deps/v8/tools/tickprocessor-driver'
'internal/deps/v8/tools/tickprocessor-driver',
];
let script = '';

2 changes: 1 addition & 1 deletion lib/os.js
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ function getCheckedFunction(fn) {
const [
type,
version,
release
release,
] = _getOSInformation();

const getHomeDirectory = getCheckedFunction(_getHomeDirectory);
2 changes: 1 addition & 1 deletion lib/perf_hooks.js
Original file line number Diff line number Diff line change
@@ -98,7 +98,7 @@ const observerableTypes = [
'gc',
'function',
'http2',
'http'
'http',
];

const IDX_STREAM_STATS_ID = 0;
4 changes: 2 additions & 2 deletions lib/querystring.js
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ const unhexTable = new Int8Array([
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 // ... 255
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // ... 255
]);
// A safe fast alternative to decodeURIComponent
function unescapeBuffer(s, decodeSpaces) {
@@ -143,7 +143,7 @@ const noEscape = new Int8Array([
0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 64 - 79
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, // 80 - 95
0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 96 - 111
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0 // 112 - 127
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, // 112 - 127
]);
// QueryString.escape() replaces encodeURIComponent()
// https://www.ecma-international.org/ecma-262/5.1/#sec-15.1.3.4
2 changes: 1 addition & 1 deletion lib/readline.js
Original file line number Diff line number Diff line change
@@ -144,7 +144,7 @@ function Interface(input, output, completer, terminal) {
this.escapeCodeTimeout = ESCAPE_CODE_TIMEOUT;
this.tabSize = 8;

FunctionPrototypeCall(EventEmitter, this,);
FunctionPrototypeCall(EventEmitter, this);
let history;
let historySize;
let removeHistoryDuplicates = false;
2 changes: 1 addition & 1 deletion lib/repl.js
Original file line number Diff line number Diff line change
@@ -1595,7 +1595,7 @@ function addCommonWords(completionGroups) {
'debugger', 'default', 'delete', 'do', 'else', 'export', 'false',
'finally', 'for', 'function', 'if', 'import', 'in', 'instanceof', 'let',
'new', 'null', 'return', 'switch', 'this', 'throw', 'true', 'try',
'typeof', 'var', 'void', 'while', 'with', 'yield'
'typeof', 'var', 'void', 'while', 'with', 'yield',
]);
}

10 changes: 5 additions & 5 deletions lib/url.js
Original file line number Diff line number Diff line change
@@ -86,12 +86,12 @@ const hostnameMaxLen = 255;
// Protocols that can allow "unsafe" and "unwise" chars.
const unsafeProtocol = new SafeSet([
'javascript',
'javascript:'
'javascript:',
]);
// Protocols that never have a hostname.
const hostlessProtocol = new SafeSet([
'javascript',
'javascript:'
'javascript:',
]);
// Protocols that always contain a // bit.
const slashedProtocol = new SafeSet([
@@ -108,7 +108,7 @@ const slashedProtocol = new SafeSet([
'ws',
'ws:',
'wss',
'wss:'
'wss:',
]);
const {
CHAR_SPACE,
@@ -516,7 +516,7 @@ const escapedCodes = [
/* 90 - 99 */ '', '', '%5C', '', '%5E', '', '%60', '', '', '',
/* 100 - 109 */ '', '', '', '', '', '', '', '', '', '',
/* 110 - 119 */ '', '', '', '', '', '', '', '', '', '',
/* 120 - 125 */ '', '', '', '%7B', '%7C', '%7D'
/* 120 - 125 */ '', '', '', '%7B', '%7C', '%7D',
];

// Automatically escape all delimiters and unwise characters from RFC 2396.
@@ -580,7 +580,7 @@ const noEscapeAuth = 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, 1, 0 // 0x70 - 0x7F
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, // 0x70 - 0x7F
]);

Url.prototype.format = function format() {

0 comments on commit b461a1b

Please sign in to comment.