lib: remove use of array destructuring

aduh95 · targos · commit 1ce81079df05 · 2021-09-01T23:24:52.000+02:00
PR-URL: #36818 Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -395,7 +395,7 @@ Server.prototype.setTimeout = function setTimeout(msecs, callback) {
 Server.prototype[EE.captureRejectionSymbol] = function(err, event, ...args) {
   switch (event) {
     case 'request':
-      const [ , res] = args;
+      const { 1: res } = args;
       if (!res.headersSent && !res.writableEnded) {
         // Don't leak headers.
         const names = res.getHeaderNames();
diff --git a/lib/assert.js b/lib/assert.js
@@ -339,15 +339,15 @@ function getErrMessage(message, fn) {
       }
       fd = openSync(filename, 'r', 0o666);
       // Reset column and message.
-      [column, message] = getCode(fd, line, column);
+      ({ 0: column, 1: message } = getCode(fd, line, column));
       // Flush unfinished multi byte characters.
       decoder.end();
     } else {
       for (let i = 0; i < line; i++) {
         code = StringPrototypeSlice(code,
                                     StringPrototypeIndexOf(code, '\n') + 1);
       }
-      [column, message] = parseCode(code, column);
+      ({ 0: column, 1: message } = parseCode(code, column));
     }
     // Always normalize indentation, otherwise the message could look weird.
     if (StringPrototypeIncludes(message, '\n')) {
diff --git a/lib/events.js b/lib/events.js
@@ -330,7 +330,7 @@ function enhanceStackTrace(err, own) {
   const errStack = err.stack.split('\n').slice(1);
   const ownStack = own.stack.split('\n').slice(1);
 
-  const [ len, off ] = identicalSequenceRange(ownStack, errStack);
+  const { 0: len, 1: off } = identicalSequenceRange(ownStack, errStack);
   if (len > 0) {
     ownStack.splice(off + 1, len - 2,
                     '    [... lines matching original stack trace ...]');
diff --git a/lib/fs.js b/lib/fs.js
@@ -2066,7 +2066,8 @@ function copyFileSync(src, dest, mode) {
 function lazyLoadStreams() {
   if (!ReadStream) {
     ({ ReadStream, WriteStream } = require('internal/fs/streams'));
-    [ FileReadStream, FileWriteStream ] = [ ReadStream, WriteStream ];
+    FileReadStream = ReadStream;
+    FileWriteStream = WriteStream;
   }
 }
 
diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
@@ -199,7 +199,7 @@ class NativeModule {
   // To be called during pre-execution when --expose-internals is on.
   // Enables the user-land module loader to access internal modules.
   static exposeInternals() {
-    for (const [id, mod] of NativeModule.map) {
+    for (const { 0: id, 1: mod } of NativeModule.map) {
       // Do not expose this to user land even with --expose-internals.
       if (id !== loaderId) {
         mod.canBeRequiredByUsers = true;
diff --git a/lib/internal/cluster/round_robin_handle.js b/lib/internal/cluster/round_robin_handle.js
@@ -93,10 +93,11 @@ RoundRobinHandle.prototype.remove = function(worker) {
 
 RoundRobinHandle.prototype.distribute = function(err, handle) {
   ArrayPrototypePush(this.handles, handle);
-  const [ workerEntry ] = this.free;
+  // eslint-disable-next-line node-core/no-array-destructuring
+  const [ workerEntry ] = this.free; // this.free is a SafeMap
 
   if (ArrayIsArray(workerEntry)) {
-    const [ workerId, worker ] = workerEntry;
+    const { 0: workerId, 1: worker } = workerEntry;
     this.free.delete(workerId);
     this.handoff(worker);
   }
diff --git a/lib/internal/console/constructor.js b/lib/internal/console/constructor.js
@@ -519,7 +519,7 @@ const consoleMethods = {
           length++;
         }
       } else {
-        for (const [k, v] of tabularData) {
+        for (const { 0: k, 1: v } of tabularData) {
           ArrayPrototypePush(keys, _inspect(k));
           ArrayPrototypePush(values, _inspect(v));
           length++;
diff --git a/lib/internal/crypto/keys.js b/lib/internal/crypto/keys.js
@@ -48,12 +48,12 @@ for (const m of [[kKeyEncodingPKCS1, 'pkcs1'], [kKeyEncodingPKCS8, 'pkcs8'],
 // which requires the KeyObject base class to be implemented in C++.
 // The creation requires a callback to make sure that the NativeKeyObject
 // base class cannot exist without the other KeyObject implementations.
-const [
-  KeyObject,
-  SecretKeyObject,
-  PublicKeyObject,
-  PrivateKeyObject
-] = createNativeKeyObjectClass((NativeKeyObject) => {
+const {
+  0: KeyObject,
+  1: SecretKeyObject,
+  2: PublicKeyObject,
+  3: PrivateKeyObject,
+} = createNativeKeyObjectClass((NativeKeyObject) => {
   // Publicly visible KeyObject class.
   class KeyObject extends NativeKeyObject {
     constructor(type, handle) {
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
@@ -421,7 +421,7 @@ function uvErrmapGet(name) {
  * @returns {Error}
  */
 function uvException(ctx) {
-  const [ code, uvmsg ] = uvErrmapGet(ctx.errno) || uvUnmappedError;
+  const { 0: code, 1: uvmsg } = uvErrmapGet(ctx.errno) || uvUnmappedError;
   let message = `${code}: ${ctx.message || uvmsg}, ${ctx.syscall}`;
 
   let path;
@@ -476,7 +476,7 @@ function uvException(ctx) {
  * @returns {Error}
  */
 function uvExceptionWithHostPort(err, syscall, address, port) {
-  const [ code, uvmsg ] = uvErrmapGet(err) || uvUnmappedError;
+  const { 0: code, 1: uvmsg } = uvErrmapGet(err) || uvUnmappedError;
   const message = `${syscall} ${code}: ${uvmsg}`;
   let details = '';
 
@@ -1235,7 +1235,8 @@ E('ERR_MANIFEST_ASSERT_INTEGRITY',
     }" does not match the expected integrity.`;
     if (realIntegrities.size) {
       const sri = ArrayPrototypeJoin(
-        ArrayFrom(realIntegrities.entries(), ([alg, dgs]) => `${alg}-${dgs}`),
+        ArrayFrom(realIntegrities.entries(),
+                  ({ 0: alg, 1: dgs }) => `${alg}-${dgs}`),
         ' '
       );
       msg += ` Integrities found are: ${sri}`;
diff --git a/lib/internal/main/print_help.js b/lib/internal/main/print_help.js
@@ -110,17 +110,17 @@ function format(
   let text = '';
   let maxFirstColumnUsed = 0;
 
-  for (const [
-    name, { helpText, type, value }
-  ] of ArrayPrototypeSort([...options.entries()])) {
+  for (const {
+    0: name, 1: { helpText, type, value }
+  } of ArrayPrototypeSort([...options.entries()])) {
     if (!helpText) continue;
 
     let displayName = name;
     const argDescription = getArgDescription(type);
     if (argDescription)
       displayName += `=${argDescription}`;
 
-    for (const [ from, to ] of aliases) {
+    for (const { 0: from, 1: to } of aliases) {
       // For cases like e.g. `-e, --eval`.
       if (to[0] === name && to.length === 1) {
         displayName = `${from}, ${displayName}`;
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -172,7 +172,7 @@ function Module(id = '', parent) {
 }
 
 const builtinModules = [];
-for (const [id, mod] of NativeModule.map) {
+for (const { 0: id, 1: mod } of NativeModule.map) {
   if (mod.canBeRequiredByUsers) {
     ArrayPrototypePush(builtinModules, id);
   }
diff --git a/lib/internal/policy/manifest.js b/lib/internal/policy/manifest.js
@@ -350,7 +350,8 @@ class Manifest {
     };
 
     for (let i = 0; i < jsonResourcesEntries.length; i++) {
-      const [originalHREF, resourceDescriptor] = jsonResourcesEntries[i];
+      const { 0: originalHREF, 1: resourceDescriptor } =
+        jsonResourcesEntries[i];
       const cascade = resourceDescriptor.cascade;
       const dependencyMap = resourceDescriptor.dependencies;
       const resourceHREF = resolve(originalHREF);
@@ -380,7 +381,7 @@ class Manifest {
 
     const scopeIntegrities = this.#scopeIntegrities;
     for (let i = 0; i < jsonScopesEntries.length; i++) {
-      const [originalHREF, scopeDescriptor] = jsonScopesEntries[i];
+      const { 0: originalHREF, 1: scopeDescriptor } = jsonScopesEntries[i];
       const integrity = scopeDescriptor.integrity;
       const cascade = scopeDescriptor.cascade;
       const dependencyMap = scopeDescriptor.dependencies;
diff --git a/lib/internal/util/comparisons.js b/lib/internal/util/comparisons.js
@@ -518,7 +518,7 @@ function mapHasEqualEntry(set, map, key1, item1, strict, memo) {
 function mapEquiv(a, b, strict, memo) {
   let set = null;
 
-  for (const [key, item1] of a) {
+  for (const { 0: key, 1: item1 } of a) {
     if (typeof key === 'object' && key !== null) {
       if (set === null) {
         set = new Set();
@@ -545,7 +545,7 @@ function mapEquiv(a, b, strict, memo) {
   }
 
   if (set !== null) {
-    for (const [key, item] of b) {
+    for (const { 0: key, 1: item } of b) {
       if (typeof key === 'object' && key !== null) {
         if (!mapHasEqualEntry(set, a, key, item, strict, memo))
           return false;
diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
@@ -1536,7 +1536,7 @@ function formatSet(value, ctx, ignored, recurseTimes) {
 function formatMap(value, ctx, ignored, recurseTimes) {
   const output = [];
   ctx.indentationLvl += 2;
-  for (const [k, v] of value) {
+  for (const { 0: k, 1: v } of value) {
     output.push(`${formatValue(ctx, k, recurseTimes)} => ` +
                 formatValue(ctx, v, recurseTimes));
   }
@@ -1619,7 +1619,7 @@ function formatWeakMap(ctx, value, recurseTimes) {
 }
 
 function formatIterator(braces, ctx, value, recurseTimes) {
-  const [entries, isKeyValue] = previewEntries(value, true);
+  const { 0: entries, 1: isKeyValue } = previewEntries(value, true);
   if (isKeyValue) {
     // Mark entry iterators as such.
     braces[0] = braces[0].replace(/ Iterator] {$/, ' Entries] {');
@@ -1631,7 +1631,7 @@ function formatIterator(braces, ctx, value, recurseTimes) {
 
 function formatPromise(ctx, value, recurseTimes) {
   let output;
-  const [state, result] = getPromiseDetails(value);
+  const { 0: state, 1: result } = getPromiseDetails(value);
   if (state === kPending) {
     output = [ctx.stylize('<pending>', 'special')];
   } else {
diff --git a/lib/internal/worker/js_transferable.js b/lib/internal/worker/js_transferable.js
@@ -19,7 +19,7 @@ function setup() {
   // from .postMessage() calls. The format of `deserializeInfo` is generally
   // 'module:Constructor', e.g. 'internal/fs/promises:FileHandle'.
   setDeserializerCreateObjectFunction((deserializeInfo) => {
-    const [ module, ctor ] = StringPrototypeSplit(deserializeInfo, ':');
+    const { 0: module, 1: ctor } = StringPrototypeSplit(deserializeInfo, ':');
     const Ctor = require(module)[ctor];
     if (typeof Ctor !== 'function' ||
         !(Ctor.prototype instanceof JSTransferable)) {
diff --git a/lib/os.js b/lib/os.js
@@ -71,11 +71,11 @@ function getCheckedFunction(fn) {
   });
 }
 
-const [
-  type,
-  version,
-  release
-] = _getOSInformation();
+const {
+  0: type,
+  1: version,
+  2: release,
+} = _getOSInformation();
 
 const getHomeDirectory = getCheckedFunction(_getHomeDirectory);
 const getHostname = getCheckedFunction(_getHostname);
diff --git a/lib/repl.js b/lib/repl.js
@@ -381,10 +381,10 @@ function REPLServer(prompt,
     let entry;
     const tmpCompletionEnabled = self.isCompletionEnabled;
     while (entry = ArrayPrototypeShift(pausedBuffer)) {
-      const [type, payload, isCompletionEnabled] = entry;
+      const { 0: type, 1: payload, 2: isCompletionEnabled } = entry;
       switch (type) {
         case 'key': {
-          const [d, key] = payload;
+          const { 0: d, 1: key } = payload;
           self.isCompletionEnabled = isCompletionEnabled;
           self._ttyWrite(d, key);
           break;
@@ -1453,7 +1453,7 @@ function complete(line, callback) {
 REPLServer.prototype.completeOnEditorMode = (callback) => (err, results) => {
   if (err) return callback(err);
 
-  const [completions, completeOn = ''] = results;
+  const { 0: completions, 1: completeOn = '' } = results;
   let result = ArrayPrototypeFilter(completions, Boolean);
 
   if (completeOn && result.length !== 0) {

Original file line number	Diff line number	Diff line change
`@@ -339,15 +339,15 @@ function getErrMessage(message, fn) {`
`339`	`339`	`}`
`340`	`340`	`fd = openSync(filename, 'r', 0o666);`
`341`	`341`	`// Reset column and message.`
`342`		`- [column, message] = getCode(fd, line, column);`
	`342`	`+ ({ 0: column, 1: message } = getCode(fd, line, column));`
`343`	`343`	`// Flush unfinished multi byte characters.`
`344`	`344`	`decoder.end();`
`345`	`345`	`} else {`
`346`	`346`	`for (let i = 0; i < line; i++) {`
`347`	`347`	`code = StringPrototypeSlice(code,`
`348`	`348`	`StringPrototypeIndexOf(code, '\n') + 1);`
`349`	`349`	`}`
`350`		`- [column, message] = parseCode(code, column);`
	`350`	`+ ({ 0: column, 1: message } = parseCode(code, column));`
`351`	`351`	`}`
`352`	`352`	`// Always normalize indentation, otherwise the message could look weird.`
`353`	`353`	`if (StringPrototypeIncludes(message, '\n')) {`
Original file line number	Diff line number	Diff line change
`@@ -2066,7 +2066,8 @@ function copyFileSync(src, dest, mode) {`
`2066`	`2066`	`function lazyLoadStreams() {`
`2067`	`2067`	`if (!ReadStream) {`
`2068`	`2068`	`({ ReadStream, WriteStream } = require('internal/fs/streams'));`
`2069`		`- [ FileReadStream, FileWriteStream ] = [ ReadStream, WriteStream ];`
	`2069`	`+ FileReadStream = ReadStream;`
	`2070`	`+ FileWriteStream = WriteStream;`
`2070`	`2071`	`}`
`2071`	`2072`	`}`
`2072`	`2073`
Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ const consoleMethods = {`
`519`	`519`	`length++;`
`520`	`520`	`}`
`521`	`521`	`} else {`
`522`		`- for (const [k, v] of tabularData) {`
	`522`	`+ for (const { 0: k, 1: v } of tabularData) {`
`523`	`523`	`ArrayPrototypePush(keys, _inspect(k));`
`524`	`524`	`ArrayPrototypePush(values, _inspect(v));`
`525`	`525`	`length++;`