tools: enable sort-requires rule

nodejs · cola119 · Aug 7, 2022 · Aug 7, 2022 · Aug 7, 2022 · a4c2d41d2983a70b7c9507ff013d06e880a6026b
commit a4c2d41d2983a70b7c9507ff013d06e880a6026b
diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml
@@ -166,6 +166,7 @@ rules:
   node-core/lowercase-name-for-primitive: error
   node-core/non-ascii-character: error
   node-core/no-array-destructuring: error
+  node-core/sort-requires: error
   node-core/prefer-primordials:
     - error
     - name: AggregateError

diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -48,31 +48,31 @@ const {
   once,
 } = require('internal/util');
 const {
+  HTTPParser,
   _checkIsHttpToken: checkIsHttpToken,
   freeParser,
-  parsers,
-  HTTPParser,
   isLenient,
+  parsers,
   prepareError,
 } = require('_http_common');
 const {
+  OutgoingMessage,
   kUniqueHeaders,
-  parseUniqueHeadersOption,
-  OutgoingMessage
+  parseUniqueHeadersOption
 } = require('_http_outgoing');
 const Agent = require('_http_agent');
 const { Buffer } = require('buffer');
 const { defaultTriggerAsyncIdScope } = require('internal/async_hooks');
-const { URL, urlToHttpOptions, searchParamsSymbol } = require('internal/url');
+const { URL, searchParamsSymbol, urlToHttpOptions } = require('internal/url');
 const {
-  kOutHeaders,
-  kNeedDrain,
+  getNextTraceEventId,
   isTraceHTTPEnabled,
+  kNeedDrain,
+  kOutHeaders,
   traceBegin,
   traceEnd,
-  getNextTraceEventId,
 } = require('internal/http');
-const { connResetException, codes } = require('internal/errors');
+const { codes, connResetException } = require('internal/errors');
 const {
   ERR_HTTP_HEADERS_SENT,
   ERR_INVALID_ARG_TYPE,

diff --git a/lib/_http_common.js b/lib/_http_common.js
@@ -23,8 +23,8 @@
 
 const {
   MathMin,
-  Symbol,
   RegExpPrototypeExec,
+  Symbol,
 } = primordials;
 const { setImmediate } = require('timers');
 

diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
@@ -30,9 +30,9 @@ const {
   ObjectCreate,
   ObjectDefineProperty,
   ObjectKeys,
-  ObjectValues,
   ObjectPrototypeHasOwnProperty,
   ObjectSetPrototypeOf,
+  ObjectValues,
   RegExpPrototypeExec,
   SafeSet,
   StringPrototypeToLowerCase,
@@ -44,12 +44,12 @@ const assert = require('internal/assert');
 const EE = require('events');
 const Stream = require('stream');
 const internalUtil = require('internal/util');
-const { kOutHeaders, utcDate, kNeedDrain } = require('internal/http');
+const { kNeedDrain, kOutHeaders, utcDate } = require('internal/http');
 const { Buffer } = require('buffer');
 const {
-  _checkIsHttpToken: checkIsHttpToken,
-  _checkInvalidHeaderChar: checkInvalidHeaderChar,
   chunkExpression: RE_TE_CHUNKED,
+  _checkInvalidHeaderChar: checkInvalidHeaderChar,
+  _checkIsHttpToken: checkIsHttpToken,
 } = require('_http_common');
 const {
   defaultTriggerAsyncIdScope,

diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -26,8 +26,8 @@ const {
   Error,
   ObjectKeys,
   ObjectSetPrototypeOf,
-  RegExpPrototypeExec,
   ReflectApply,
+  RegExpPrototypeExec,
   Symbol,
   SymbolFor,
 } = primordials;
@@ -36,38 +36,38 @@ const net = require('net');
 const EE = require('events');
 const assert = require('internal/assert');
 const {
-  parsers,
-  freeParser,
-  continueExpression,
-  chunkExpression,
-  kIncomingMessage,
   HTTPParser,
-  isLenient,
   _checkInvalidHeaderChar: checkInvalidHeaderChar,
+  chunkExpression,
+  continueExpression,
+  freeParser,
+  isLenient,
+  kIncomingMessage,
+  parsers,
   prepareError,
 } = require('_http_common');
 const { ConnectionsList } = internalBinding('http_parser');
 const {
+  OutgoingMessage,
   kUniqueHeaders,
-  parseUniqueHeadersOption,
-  OutgoingMessage
+  parseUniqueHeadersOption
 } = require('_http_outgoing');
 const {
-  kOutHeaders,
-  kNeedDrain,
+  getNextTraceEventId,
   isTraceHTTPEnabled,
+  kNeedDrain,
+  kOutHeaders,
   traceBegin,
   traceEnd,
-  getNextTraceEventId,
 } = require('internal/http');
 const {
   defaultTriggerAsyncIdScope,
   getOrSetAsyncId
 } = require('internal/async_hooks');
 const { IncomingMessage } = require('_http_incoming');
 const {
-  connResetException,
-  codes
+  codes,
+  connResetException
 } = require('internal/errors');
 const {
   ERR_HTTP_REQUEST_TIMEOUT,
@@ -79,11 +79,11 @@ const {
   ERR_INVALID_CHAR
 } = codes;
 const {
-  validateInteger,
-  validateBoolean
+  validateBoolean,
+  validateInteger
 } = require('internal/validators');
 const Buffer = require('buffer').Buffer;
-const { setInterval, clearInterval } = require('timers');
+const { clearInterval, setInterval } = require('timers');
 let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
   debug = fn;
 });

diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -65,7 +65,7 @@ const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
 const { owner_symbol } = require('internal/async_hooks').symbols;
 const { isArrayBufferView } = require('internal/util/types');
 const { SecureContext: NativeSecureContext } = internalBinding('crypto');
-const { connResetException, codes } = require('internal/errors');
+const { codes, connResetException } = require('internal/errors');
 const {
   ERR_INVALID_ARG_TYPE,
   ERR_INVALID_ARG_VALUE,
@@ -82,8 +82,8 @@ const {
 } = codes;
 const { onpskexchange: kOnPskExchange } = internalBinding('symbols');
 const {
-  getOptionValue,
   getAllowUnauthorized,
+  getOptionValue,
 } = require('internal/options');
 const {
   validateBoolean,

diff --git a/lib/assert.js b/lib/assert.js
@@ -61,7 +61,7 @@ const {
   overrideStackTrace,
 } = require('internal/errors');
 const AssertionError = require('internal/assert/assertion_error');
-const { openSync, closeSync, readSync } = require('fs');
+const { closeSync, openSync, readSync } = require('fs');
 const { inspect } = require('internal/util/inspect');
 const { isPromise, isRegExp } = require('internal/util/types');
 const { EOL } = require('internal/constants');

diff --git a/lib/async_hooks.js b/lib/async_hooks.js
@@ -9,10 +9,10 @@ const {
   FunctionPrototypeBind,
   NumberIsSafeInteger,
   ObjectDefineProperties,
+  ObjectFreeze,
   ObjectIs,
   ReflectApply,
   Symbol,
-  ObjectFreeze,
 } = primordials;
 
 const {

diff --git a/lib/buffer.js b/lib/buffer.js
@@ -44,8 +44,8 @@ const {
   StringPrototypeTrim,
   SymbolSpecies,
   SymbolToPrimitive,
-  TypedArrayPrototypeGetByteLength,
   TypedArrayPrototypeFill,
+  TypedArrayPrototypeGetByteLength,
   TypedArrayPrototypeSet,
   Uint8Array,
   Uint8ArrayPrototype,
@@ -76,9 +76,9 @@ const {
 const {
   customInspectSymbol,
   isInsideNodeModules,
+  kIsEncodingSymbol,
   lazyDOMException,
-  normalizeEncoding,
-  kIsEncodingSymbol
+  normalizeEncoding
 } = require('internal/util');
 const {
   isAnyArrayBuffer,
@@ -106,8 +106,8 @@ const {
 const {
   validateArray,
   validateBuffer,
-  validateNumber,
   validateInteger,
+  validateNumber,
   validateString
 } = require('internal/validators');
 // Provide validateInteger() but with kMaxLength as the default maximum value.
@@ -116,9 +116,9 @@ const validateOffset = (value, name, min = 0, max = kMaxLength) =>
 
 const {
   FastBuffer,
-  markAsUntransferable,
   addBufferPrototypeMethods,
-  createUnsafeBuffer
+  createUnsafeBuffer,
+  markAsUntransferable
 } = require('internal/buffer');
 
 const {

diff --git a/lib/child_process.js b/lib/child_process.js
@@ -28,11 +28,11 @@ const {
   ArrayPrototypeJoin,
   ArrayPrototypeLastIndexOf,
   ArrayPrototypePush,
+  ArrayPrototypePushApply,
   ArrayPrototypeSlice,
   ArrayPrototypeSort,
   ArrayPrototypeSplice,
   ArrayPrototypeUnshift,
-  ArrayPrototypePushApply,
   NumberIsInteger,
   ObjectAssign,
   ObjectDefineProperty,

diff --git a/lib/crypto.js b/lib/crypto.js
@@ -25,8 +25,8 @@
 'use strict';
 
 const {
-  ObjectDefineProperty,
   ObjectDefineProperties,
+  ObjectDefineProperty,
 } = primordials;
 
 const {
@@ -70,16 +70,16 @@ const {
   hkdfSync
 } = require('internal/crypto/hkdf');
 const {
+  generateKey,
   generateKeyPair,
   generateKeyPairSync,
-  generateKey,
   generateKeySync,
 } = require('internal/crypto/keygen');
 const {
-  createSecretKey,
-  createPublicKey,
-  createPrivateKey,
   KeyObject,
+  createPrivateKey,
+  createPublicKey,
+  createSecretKey,
 } = require('internal/crypto/keys');
 const {
   DiffieHellman,
@@ -92,16 +92,16 @@ const {
   Cipheriv,
   Decipher,
   Decipheriv,
+  getCipherInfo,
   privateDecrypt,
   privateEncrypt,
   publicDecrypt,
   publicEncrypt,
-  getCipherInfo,
 } = require('internal/crypto/cipher');
 const {
   Sign,
-  signOneShot,
   Verify,
+  signOneShot,
   verifyOneShot
 } = require('internal/crypto/sig');
 const {
@@ -116,9 +116,9 @@ const {
   getCurves,
   getDefaultEncoding,
   getHashes,
+  secureHeapUsed,
   setDefaultEncoding,
   setEngine,
-  secureHeapUsed,
 } = require('internal/crypto/util');
 const Certificate = require('internal/crypto/certificate');
 

diff --git a/lib/dgram.js b/lib/dgram.js
@@ -34,8 +34,8 @@ const {
 
 const errors = require('internal/errors');
 const {
-  kStateSymbol,
   _createSocketHandle,
+  kStateSymbol,
   newHandle,
 } = require('internal/dgram');
 const { guessHandleType } = internalBinding('util');
@@ -54,9 +54,9 @@ const {
 const {
   isInt32,
   validateAbortSignal,
-  validateString,
   validateNumber,
   validatePort,
+  validateString,
 } = require('internal/validators');
 const { Buffer } = require('buffer');
 const { deprecate } = require('internal/util');

diff --git a/lib/dns.js b/lib/dns.js
@@ -36,15 +36,15 @@ const { isIP } = require('internal/net');
 const { customPromisifyArgs } = require('internal/util');
 const errors = require('internal/errors');
 const {
-  bindDefaultResolver,
-  getDefaultResolver,
-  setDefaultResolver,
   Resolver,
-  validateHints,
+  bindDefaultResolver,
+  errorCodes: dnsErrorCodes,
   emitInvalidHostnameWarning,
+  getDefaultResolver,
   getDefaultVerbatim,
+  setDefaultResolver,
   setDefaultResultOrder,
-  errorCodes: dnsErrorCodes,
+  validateHints,
 } = require('internal/dns/utils');
 const {
   NODATA,

diff --git a/lib/events.js b/lib/events.js
@@ -34,8 +34,8 @@ const {
   FunctionPrototypeCall,
   NumberIsNaN,
   ObjectCreate,
-  ObjectDefineProperty,
   ObjectDefineProperties,
+  ObjectDefineProperty,
   ObjectGetPrototypeOf,
   ObjectSetPrototypeOf,
   Promise,
@@ -46,16 +46,16 @@ const {
   String,
   StringPrototypeSplit,
   Symbol,
-  SymbolFor,
   SymbolAsyncIterator,
+  SymbolFor,
 } = primordials;
 const kRejection = SymbolFor('nodejs.rejection');
 
 const { kEmptyObject } = require('internal/util');
 
 const {
-  inspect,
   identicalSequenceRange,
+  inspect,
 } = require('internal/util/inspect');
 
 let spliceOne;