diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml index 2cfbf0894f2a3a..d09cb68948fa6a 100644 --- 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 index ef58f66f6a97e5..721f721d236788 100644 --- 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 index 526901cb5f9681..bbee8e170dcf4f 100644 --- 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 index dcdea29968590a..415505e332a920 100644 --- 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 index a2eba953cfc2ba..25add35332f31f 100644 --- 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,29 +36,29 @@ 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, @@ -66,8 +66,8 @@ const { } = 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 index 11ff14d725b36b..8cdd035d24295f 100644 --- 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 index fc3127f3bf4214..888db24aa7350a 100644 --- 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 index 8638bb4d7b3497..03f829bdb7839f 100644 --- 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 index d5fde6debc2f74..82761a224ea083 100644 --- 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 index 6ce21363e1ee6a..bf2a47c000d015 100644 --- 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 index 35d54b5efb3af7..0a4b6ad9f01391 100644 --- 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 index 9a11a2287c6155..5e882c42004e58 100644 --- 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 index 5fe34b4b049358..96daaba888f33a 100644 --- 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 index 7abf18f42c0064..9118784d6eb474 100644 --- 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; diff --git a/lib/fs.js b/lib/fs.js index ffa216f35388e0..bb1bc67b7db3e6 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -83,32 +83,28 @@ const { const { FSReqCallback } = binding; const { toPathIfFileURL } = require('internal/url'); const { - customPromisifyArgs: kCustomPromisifyArgsSymbol, - deprecate, - kEmptyObject, + SideEffectFreeRegExpPrototypeExec, promisify: { custom: kCustomPromisifiedSymbol, }, - SideEffectFreeRegExpPrototypeExec, + deprecate, + customPromisifyArgs: kCustomPromisifyArgsSymbol, + kEmptyObject, } = require('internal/util'); const { - constants: { - kIoMaxLength, - kMaxUserId, - }, - copyObject, Dirent, + Stats, + copyObject, emitRecursiveRmdirWarning, getDirents, getOptions, + getStatsFromBinding, + getValidMode, getValidatedFd, getValidatedPath, - getValidMode, handleErrorFromBinding, nullCheck, preprocessSymlinkDestination, - Stats, - getStatsFromBinding, realpathCacheKey, stringToFlags, stringToSymlinkType, @@ -119,12 +115,16 @@ const { validateOffsetLengthWrite, validatePath, validatePosition, + validatePrimitiveStringAfterArrayBufferView, validateRmOptions, validateRmOptionsSync, validateRmdirOptions, validateStringAfterArrayBufferView, - validatePrimitiveStringAfterArrayBufferView, - warnOnNonPortableTemplate + warnOnNonPortableTemplate, + constants: { + kIoMaxLength, + kMaxUserId, + } } = require('internal/fs/utils'); const { Dir, @@ -132,8 +132,8 @@ const { opendirSync } = require('internal/fs/dir'); const { - CHAR_FORWARD_SLASH, CHAR_BACKWARD_SLASH, + CHAR_FORWARD_SLASH, } = require('internal/constants'); const { isUint32, diff --git a/lib/http.js b/lib/http.js index d7acafe4f317b8..505503d5022547 100644 --- a/lib/http.js +++ b/lib/http.js @@ -33,15 +33,15 @@ const { ClientRequest } = require('_http_client'); const { methods, parsers } = require('_http_common'); const { IncomingMessage } = require('_http_incoming'); const { + OutgoingMessage, validateHeaderName, - validateHeaderValue, - OutgoingMessage + validateHeaderValue } = require('_http_outgoing'); const { - _connectionListener, STATUS_CODES, Server, - ServerResponse + ServerResponse, + _connectionListener } = require('_http_server'); let maxHeaderSize; diff --git a/lib/http2.js b/lib/http2.js index 14b4f57acdabd1..d3a4bec44dbdd7 100644 --- a/lib/http2.js +++ b/lib/http2.js @@ -1,16 +1,16 @@ 'use strict'; const { + Http2ServerRequest, + Http2ServerResponse, connect, constants, - createServer, createSecureServer, + createServer, getDefaultSettings, getPackedSettings, getUnpackedSettings, - sensitiveHeaders, - Http2ServerRequest, - Http2ServerResponse + sensitiveHeaders } = require('internal/http2/core'); module.exports = { diff --git a/lib/https.js b/lib/https.js index 0ecd13b1dd36ed..305bbbfea9377b 100644 --- a/lib/https.js +++ b/lib/https.js @@ -44,15 +44,15 @@ const tls = require('tls'); const { Agent: HttpAgent } = require('_http_agent'); const { Server: HttpServer, + _connectionListener, setupConnectionsTracking, storeHTTPOptions, - _connectionListener, } = require('_http_server'); const { ClientRequest } = require('_http_client'); let debug = require('internal/util/debuglog').debuglog('https', (fn) => { debug = fn; }); -const { URL, urlToHttpOptions, searchParamsSymbol } = require('internal/url'); +const { URL, searchParamsSymbol, urlToHttpOptions } = require('internal/url'); function Server(opts, requestListener) { if (!(this instanceof Server)) return new Server(opts, requestListener); diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js index 4e138457adf8a6..dc458b5c211644 100644 --- a/lib/internal/abort_controller.js +++ b/lib/internal/abort_controller.js @@ -6,8 +6,8 @@ const { ObjectAssign, ObjectDefineProperties, - ObjectSetPrototypeOf, ObjectDefineProperty, + ObjectSetPrototypeOf, SafeFinalizationRegistry, SafeSet, Symbol, @@ -16,17 +16,17 @@ const { } = primordials; const { - defineEventHandler, - EventTarget, Event, - kTrustEvent, + EventTarget, + defineEventHandler, kNewListener, kRemoveListener, + kTrustEvent, } = require('internal/event_target'); const { customInspectSymbol, - kEnumerableProperty, kEmptyObject, + kEnumerableProperty, } = require('internal/util'); const { inspect } = require('internal/util/inspect'); const { diff --git a/lib/internal/async_hooks.js b/lib/internal/async_hooks.js index 25f0075bf45a07..eff2e9cb7f0f2c 100644 --- a/lib/internal/async_hooks.js +++ b/lib/internal/async_hooks.js @@ -3,8 +3,8 @@ const { ArrayPrototypeSlice, ErrorCaptureStackTrace, - ObjectPrototypeHasOwnProperty, ObjectDefineProperty, + ObjectPrototypeHasOwnProperty, Symbol, } = primordials; diff --git a/lib/internal/blob.js b/lib/internal/blob.js index 8014a1bb5b0349..d640e6a2b301d3 100644 --- a/lib/internal/blob.js +++ b/lib/internal/blob.js @@ -5,14 +5,14 @@ const { MathMax, MathMin, ObjectDefineProperty, - PromiseResolve, PromiseReject, - SafePromisePrototypeFinally, + PromiseResolve, ReflectConstruct, RegExpPrototypeExec, RegExpPrototypeSymbolReplace, - StringPrototypeToLowerCase, + SafePromisePrototypeFinally, StringPrototypeSplit, + StringPrototypeToLowerCase, Symbol, SymbolIterator, SymbolToStringTag, @@ -31,9 +31,9 @@ const { } = require('internal/encoding'); const { - makeTransferable, kClone, kDeserialize, + makeTransferable, } = require('internal/worker/js_transferable'); const { @@ -43,8 +43,8 @@ const { const { createDeferredPromise, - customInspectSymbol: kInspect, kEmptyObject, + customInspectSymbol: kInspect, } = require('internal/util'); const { inspect } = require('internal/util/inspect'); @@ -59,8 +59,8 @@ const { } = require('internal/errors'); const { - validateObject, isUint32, + validateObject, } = require('internal/validators'); const kHandle = Symbol('kHandle'); diff --git a/lib/internal/bootstrap/browser.js b/lib/internal/bootstrap/browser.js index 4df2fa0a495749..18d90229c88d1a 100644 --- a/lib/internal/bootstrap/browser.js +++ b/lib/internal/bootstrap/browser.js @@ -29,7 +29,7 @@ exposeGetterAndSetter(globalThis, }); const { - TextEncoder, TextDecoder + TextDecoder, TextEncoder } = require('internal/encoding'); // https://encoding.spec.whatwg.org/#textencoder exposeInterface(globalThis, 'TextEncoder', TextEncoder); @@ -44,15 +44,15 @@ exposeInterface(globalThis, 'AbortController', AbortController); exposeInterface(globalThis, 'AbortSignal', AbortSignal); const { - EventTarget, Event, + EventTarget, } = require('internal/event_target'); exposeInterface(globalThis, 'EventTarget', EventTarget); exposeInterface(globalThis, 'Event', Event); const { MessageChannel, - MessagePort, MessageEvent, + MessagePort, } = require('internal/worker/io'); exposeInterface(globalThis, 'MessageChannel', MessageChannel); exposeInterface(globalThis, 'MessagePort', MessagePort); @@ -136,12 +136,12 @@ const { } = require('internal/webstreams/writablestream'); const { + ReadableByteStreamController, ReadableStream, - ReadableStreamDefaultReader, ReadableStreamBYOBReader, ReadableStreamBYOBRequest, - ReadableByteStreamController, ReadableStreamDefaultController, + ReadableStreamDefaultReader, } = require('internal/webstreams/readablestream'); const { @@ -150,8 +150,8 @@ const { } = require('internal/webstreams/queuingstrategies'); const { - TextEncoderStream, TextDecoderStream, + TextEncoderStream, } = require('internal/webstreams/encoding'); const { diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index 14eb4bbcca472d..5667bf4e46843e 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -224,8 +224,8 @@ const { nativeHooks } = require('internal/async_hooks'); internalBinding('async_wrap').setupHooks(nativeHooks); const { - setupTaskQueue, - queueMicrotask + queueMicrotask, + setupTaskQueue } = require('internal/process/task_queues'); // Non-standard extensions: @@ -308,9 +308,9 @@ ObjectDefineProperty(process, 'features', { { const { + hasUncaughtExceptionCaptureCallback, onGlobalUncaughtException, - setUncaughtExceptionCaptureCallback, - hasUncaughtExceptionCaptureCallback + setUncaughtExceptionCaptureCallback } = require('internal/process/execution'); // For legacy reasons this is still called `_fatalException`, even diff --git a/lib/internal/child_process/serialization.js b/lib/internal/child_process/serialization.js index 497bf233d77897..62beda91b6a061 100644 --- a/lib/internal/child_process/serialization.js +++ b/lib/internal/child_process/serialization.js @@ -1,10 +1,10 @@ 'use strict'; const { + ArrayPrototypePush, JSONParse, JSONStringify, StringPrototypeSplit, - ArrayPrototypePush, Symbol, TypedArrayPrototypeSubarray, } = primordials; diff --git a/lib/internal/console/constructor.js b/lib/internal/console/constructor.js index d8434f2311a375..3a143792d5d0d4 100644 --- a/lib/internal/console/constructor.js +++ b/lib/internal/console/constructor.js @@ -55,17 +55,17 @@ const { const { previewEntries } = internalBinding('util'); const { Buffer: { isBuffer } } = require('buffer'); const { - inspect, - formatWithOptions + formatWithOptions, + inspect } = require('internal/util/inspect'); const { - isTypedArray, isSet, isMap, isSetIterator, isMapIterator, + isMap, isMapIterator, isSet, isSetIterator, isTypedArray, } = require('internal/util/types'); const { CHAR_LOWERCASE_B: kTraceBegin, + CHAR_UPPERCASE_C: kTraceCount, CHAR_LOWERCASE_E: kTraceEnd, CHAR_LOWERCASE_N: kTraceInstant, - CHAR_UPPERCASE_C: kTraceCount, } = require('internal/constants'); const kCounts = Symbol('counts'); diff --git a/lib/internal/crypto/aes.js b/lib/internal/crypto/aes.js index 324662e1f8b1b4..8b2b38d0df12a9 100644 --- a/lib/internal/crypto/aes.js +++ b/lib/internal/crypto/aes.js @@ -36,12 +36,12 @@ const { getArrayBufferOrView, hasAnyNotIn, jobPromise, - validateByteLength, - validateKeyOps, - validateMaxBufferLength, kAesKeyLengths, kHandle, kKeyObject, + validateByteLength, + validateKeyOps, + validateMaxBufferLength, } = require('internal/crypto/util'); const { diff --git a/lib/internal/crypto/cfrg.js b/lib/internal/crypto/cfrg.js index ba39bc117b89ff..291dc6ea1f4158 100644 --- a/lib/internal/crypto/cfrg.js +++ b/lib/internal/crypto/cfrg.js @@ -23,9 +23,9 @@ const { getUsagesUnion, hasAnyNotIn, jobPromise, - validateKeyOps, kHandle, kKeyObject, + validateKeyOps, } = require('internal/crypto/util'); const { diff --git a/lib/internal/crypto/cipher.js b/lib/internal/crypto/cipher.js index d85606ba52b5ac..545a6f6cebb160 100644 --- a/lib/internal/crypto/cipher.js +++ b/lib/internal/crypto/cipher.js @@ -44,8 +44,8 @@ const { } = require('internal/crypto/keys'); const { - getDefaultEncoding, getArrayBufferOrView, + getDefaultEncoding, getStringOption, kHandle, } = require('internal/crypto/util'); diff --git a/lib/internal/crypto/diffiehellman.js b/lib/internal/crypto/diffiehellman.js index 036f661fad6be2..2835340cc5e254 100644 --- a/lib/internal/crypto/diffiehellman.js +++ b/lib/internal/crypto/diffiehellman.js @@ -41,8 +41,8 @@ const { } = require('internal/validators'); const { - isArrayBufferView, isAnyArrayBuffer, + isArrayBufferView, } = require('internal/util/types'); const { @@ -57,9 +57,9 @@ const { const { getArrayBufferOrView, getDefaultEncoding, - toBuf, kHandle, kKeyObject, + toBuf, } = require('internal/crypto/util'); const { diff --git a/lib/internal/crypto/ec.js b/lib/internal/crypto/ec.js index 809f531069bf8b..b034c10da984ce 100644 --- a/lib/internal/crypto/ec.js +++ b/lib/internal/crypto/ec.js @@ -33,11 +33,11 @@ const { getUsagesUnion, hasAnyNotIn, jobPromise, - normalizeHashName, - validateKeyOps, kHandle, kKeyObject, kNamedCurveAliases, + normalizeHashName, + validateKeyOps, } = require('internal/crypto/util'); const { diff --git a/lib/internal/crypto/hash.js b/lib/internal/crypto/hash.js index 956053af0a8c2c..d98b5c1c0a2d3e 100644 --- a/lib/internal/crypto/hash.js +++ b/lib/internal/crypto/hash.js @@ -18,10 +18,10 @@ const { getDefaultEncoding, getStringOption, jobPromise, + kHandle, normalizeAlgorithm, normalizeHashName, validateMaxBufferLength, - kHandle, } = require('internal/crypto/util'); const { diff --git a/lib/internal/crypto/hkdf.js b/lib/internal/crypto/hkdf.js index 724217c08eb2f4..0946f3d80d7bfc 100644 --- a/lib/internal/crypto/hkdf.js +++ b/lib/internal/crypto/hkdf.js @@ -23,10 +23,10 @@ const { kMaxLength } = require('buffer'); const { getArrayBufferOrView, + kKeyObject, normalizeHashName, toBuf, validateByteSource, - kKeyObject, } = require('internal/crypto/util'); const { diff --git a/lib/internal/crypto/keygen.js b/lib/internal/crypto/keygen.js index 8f8fbfb1c0893d..87a0358d320a3a 100644 --- a/lib/internal/crypto/keygen.js +++ b/lib/internal/crypto/keygen.js @@ -26,12 +26,12 @@ const { } = internalBinding('crypto'); const { - PublicKeyObject, PrivateKeyObject, + PublicKeyObject, SecretKeyObject, - parsePublicKeyEncoding, + isJwk, parsePrivateKeyEncoding, - isJwk + parsePublicKeyEncoding } = require('internal/crypto/keys'); const { @@ -44,13 +44,13 @@ const { } = require('internal/util'); const { - validateFunction, validateBuffer, - validateString, + validateFunction, + validateInt32, validateInteger, validateObject, validateOneOf, - validateInt32, + validateString, validateUint32, } = require('internal/validators'); diff --git a/lib/internal/crypto/keys.js b/lib/internal/crypto/keys.js index 881cf00f051fcd..23930aae73bfc9 100644 --- a/lib/internal/crypto/keys.js +++ b/lib/internal/crypto/keys.js @@ -43,10 +43,10 @@ const { } = require('internal/errors'); const { + bigIntArrayToUnsignedBigInt, + getArrayBufferOrView, kHandle, kKeyObject, - getArrayBufferOrView, - bigIntArrayToUnsignedBigInt, } = require('internal/crypto/util'); const { diff --git a/lib/internal/crypto/mac.js b/lib/internal/crypto/mac.js index 3054f66b27d4f2..3499106b7398db 100644 --- a/lib/internal/crypto/mac.js +++ b/lib/internal/crypto/mac.js @@ -18,11 +18,11 @@ const { getHashLength, hasAnyNotIn, jobPromise, + kHandle, + kKeyObject, normalizeHashName, validateBitLength, validateKeyOps, - kHandle, - kKeyObject, } = require('internal/crypto/util'); const { diff --git a/lib/internal/crypto/pbkdf2.js b/lib/internal/crypto/pbkdf2.js index b3a6303136f506..add20295a8bef7 100644 --- a/lib/internal/crypto/pbkdf2.js +++ b/lib/internal/crypto/pbkdf2.js @@ -25,8 +25,8 @@ const { ERR_MISSING_OPTION } = require('internal/errors').codes; const { getArrayBufferOrView, getDefaultEncoding, - normalizeHashName, kKeyObject, + normalizeHashName, } = require('internal/crypto/util'); const { diff --git a/lib/internal/crypto/random.js b/lib/internal/crypto/random.js index 6705bcd2e7d592..76e4e83be60f0c 100644 --- a/lib/internal/crypto/random.js +++ b/lib/internal/crypto/random.js @@ -41,20 +41,20 @@ const { } = require('internal/errors'); const { - validateNumber, validateBoolean, validateFunction, validateInt32, + validateNumber, validateObject, validateUint32, } = require('internal/validators'); const { - isArrayBufferView, isAnyArrayBuffer, - isTypedArray, + isArrayBufferView, isFloat32Array, isFloat64Array, + isTypedArray, } = require('internal/util/types'); const { FastBuffer } = require('internal/buffer'); diff --git a/lib/internal/crypto/rsa.js b/lib/internal/crypto/rsa.js index 728e4bd951cdc5..ecfbb4138e6269 100644 --- a/lib/internal/crypto/rsa.js +++ b/lib/internal/crypto/rsa.js @@ -40,11 +40,11 @@ const { getUsagesUnion, hasAnyNotIn, jobPromise, + kHandle, + kKeyObject, normalizeHashName, validateKeyOps, validateMaxBufferLength, - kHandle, - kKeyObject, } = require('internal/crypto/util'); const { @@ -59,8 +59,8 @@ const { InternalCryptoKey, PrivateKeyObject, PublicKeyObject, - createPublicKey, createPrivateKey, + createPublicKey, } = require('internal/crypto/keys'); const { diff --git a/lib/internal/crypto/scrypt.js b/lib/internal/crypto/scrypt.js index 3e6565b85d36f0..4340362e96309d 100644 --- a/lib/internal/crypto/scrypt.js +++ b/lib/internal/crypto/scrypt.js @@ -14,8 +14,8 @@ const { const { validateFunction, - validateInteger, validateInt32, + validateInteger, validateUint32, } = require('internal/validators'); diff --git a/lib/internal/crypto/sig.js b/lib/internal/crypto/sig.js index f68606c8655163..d50c85e396749b 100644 --- a/lib/internal/crypto/sig.js +++ b/lib/internal/crypto/sig.js @@ -15,8 +15,8 @@ const { } = require('internal/errors'); const { - validateFunction, validateEncoding, + validateFunction, validateString, } = require('internal/validators'); diff --git a/lib/internal/crypto/util.js b/lib/internal/crypto/util.js index 40a677606bf3f0..67c63cab2bd503 100644 --- a/lib/internal/crypto/util.js +++ b/lib/internal/crypto/util.js @@ -55,8 +55,8 @@ const { } = require('internal/util'); const { - isArrayBufferView, isAnyArrayBuffer, + isArrayBufferView, } = require('internal/util/types'); const kHandle = Symbol('kHandle'); diff --git a/lib/internal/crypto/webcrypto.js b/lib/internal/crypto/webcrypto.js index b7760efaa234c8..9d039d70acba9c 100644 --- a/lib/internal/crypto/webcrypto.js +++ b/lib/internal/crypto/webcrypto.js @@ -8,8 +8,8 @@ const { ReflectApply, ReflectConstruct, SafeSet, - SymbolToStringTag, StringPrototypeRepeat, + SymbolToStringTag, } = primordials; const { @@ -52,13 +52,13 @@ const { const { getArrayBufferOrView, hasAnyNotIn, + kExportFormats, + kHandle, + kKeyObject, lazyRequire, normalizeAlgorithm, normalizeHashName, validateMaxBufferLength, - kExportFormats, - kHandle, - kKeyObject, } = require('internal/crypto/util'); const { diff --git a/lib/internal/crypto/x509.js b/lib/internal/crypto/x509.js index d08893d959f73a..8de8315361b8b6 100644 --- a/lib/internal/crypto/x509.js +++ b/lib/internal/crypto/x509.js @@ -22,8 +22,8 @@ const { } = require('internal/crypto/keys'); const { - customInspectSymbol: kInspect, kEmptyObject, + customInspectSymbol: kInspect, } = require('internal/util'); const { diff --git a/lib/internal/dns/promises.js b/lib/internal/dns/promises.js index ac40bc5541b997..3bfb2a4d1fa8a3 100644 --- a/lib/internal/dns/promises.js +++ b/lib/internal/dns/promises.js @@ -9,16 +9,16 @@ const { } = primordials; const { - bindDefaultResolver, Resolver: CallbackResolver, - validateHints, - validateTimeout, - validateTries, + bindDefaultResolver, + errorCodes: dnsErrorCodes, emitInvalidHostnameWarning, getDefaultVerbatim, - errorCodes: dnsErrorCodes, - setDefaultResultOrder, setDefaultResolver, + setDefaultResultOrder, + validateHints, + validateTimeout, + validateTries, } = require('internal/dns/utils'); const { NODATA, diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js index f9fa43228d5f57..5c8dc78d758aa1 100644 --- a/lib/internal/encoding.js +++ b/lib/internal/encoding.js @@ -44,8 +44,8 @@ const { } = require('internal/util/types'); const { - validateString, validateObject, + validateString, } = require('internal/validators'); const { diff --git a/lib/internal/errors.js b/lib/internal/errors.js index df079d2952b47e..937f7f65823727 100644 --- a/lib/internal/errors.js +++ b/lib/internal/errors.js @@ -34,10 +34,10 @@ const { Number, NumberIsInteger, ObjectAssign, - ObjectDefineProperty, ObjectDefineProperties, - ObjectIsExtensible, + ObjectDefineProperty, ObjectGetOwnPropertyDescriptor, + ObjectIsExtensible, ObjectKeys, ObjectPrototypeHasOwnProperty, RangeError, diff --git a/lib/internal/freeze_intrinsics.js b/lib/internal/freeze_intrinsics.js index 508b071c7c0f88..dc8bf7a68d5a2d 100644 --- a/lib/internal/freeze_intrinsics.js +++ b/lib/internal/freeze_intrinsics.js @@ -101,6 +101,8 @@ const { TypeErrorPrototype, TypedArray, TypedArrayPrototype, + URIError, + URIErrorPrototype, Uint16Array, Uint16ArrayPrototype, Uint32Array, @@ -109,8 +111,6 @@ const { Uint8ArrayPrototype, Uint8ClampedArray, Uint8ClampedArrayPrototype, - URIError, - URIErrorPrototype, WeakMap, WeakMapPrototype, WeakRef, diff --git a/lib/internal/fs/promises.js b/lib/internal/fs/promises.js index 34fd0f586766dd..d105af75cb7deb 100644 --- a/lib/internal/fs/promises.js +++ b/lib/internal/fs/promises.js @@ -8,8 +8,8 @@ const { NumberIsSafeInteger, Promise, PromisePrototypeThen, - PromiseResolve, PromiseReject, + PromiseResolve, SafeArrayIterator, SafePromisePrototypeFinally, Symbol, @@ -41,20 +41,13 @@ const { const { isArrayBufferView } = require('internal/util/types'); const { rimrafPromises } = require('internal/fs/rimraf'); const { - constants: { - kIoMaxLength, - kMaxUserId, - kReadFileBufferLength, - kReadFileUnknownBufferLength, - kWriteFileMaxChunkSize, - }, copyObject, emitRecursiveRmdirWarning, getDirents, getOptions, getStatsFromBinding, - getValidatedPath, getValidMode, + getValidatedPath, nullCheck, preprocessSymlinkDestination, stringToFlags, @@ -64,10 +57,17 @@ const { validateCpOptions, validateOffsetLengthRead, validateOffsetLengthWrite, + validatePrimitiveStringAfterArrayBufferView, validateRmOptions, validateRmdirOptions, - validatePrimitiveStringAfterArrayBufferView, warnOnNonPortableTemplate, + constants: { + kIoMaxLength, + kMaxUserId, + kReadFileBufferLength, + kReadFileUnknownBufferLength, + kWriteFileMaxChunkSize, + }, } = require('internal/fs/utils'); const { opendir } = require('internal/fs/dir'); const { diff --git a/lib/internal/fs/streams.js b/lib/internal/fs/streams.js index c5bc567a8409bf..c0c05b5e28c8f2 100644 --- a/lib/internal/fs/streams.js +++ b/lib/internal/fs/streams.js @@ -26,7 +26,7 @@ const { } = require('internal/validators'); const { errorOrDestroy } = require('internal/streams/destroy'); const fs = require('fs'); -const { kRef, kUnref, FileHandle } = require('internal/fs/promises'); +const { FileHandle, kRef, kUnref } = require('internal/fs/promises'); const { Buffer } = require('buffer'); const { copyObject, diff --git a/lib/internal/fs/utils.js b/lib/internal/fs/utils.js index d1e521426f0bd3..8a77f24a257eb5 100644 --- a/lib/internal/fs/utils.js +++ b/lib/internal/fs/utils.js @@ -8,11 +8,11 @@ const { DatePrototypeGetTime, ErrorCaptureStackTrace, FunctionPrototypeCall, + MathMin, + MathRound, Number, NumberIsFinite, NumberIsInteger, - MathMin, - MathRound, ObjectIs, ObjectPrototypeHasOwnProperty, ObjectSetPrototypeOf, diff --git a/lib/internal/histogram.js b/lib/internal/histogram.js index ca540e555e0160..db9038afbb3967 100644 --- a/lib/internal/histogram.js +++ b/lib/internal/histogram.js @@ -2,8 +2,8 @@ const { MapPrototypeEntries, - NumberIsNaN, NumberIsInteger, + NumberIsNaN, NumberMAX_SAFE_INTEGER, ObjectFromEntries, ReflectConstruct, @@ -16,8 +16,8 @@ const { } = internalBinding('performance'); const { - customInspectSymbol: kInspect, kEmptyObject, + customInspectSymbol: kInspect, } = require('internal/util'); const { inspect } = require('util'); diff --git a/lib/internal/http.js b/lib/internal/http.js index b20b3cd229efcd..da1e8d3332de0e 100644 --- a/lib/internal/http.js +++ b/lib/internal/http.js @@ -1,10 +1,10 @@ 'use strict'; const { - Symbol, Date, DatePrototypeGetMilliseconds, DatePrototypeToUTCString, + Symbol, } = primordials; const { setUnrefTimeout } = require('internal/timers'); diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js index 0bda29233d5bca..6efeb833cd6e74 100644 --- a/lib/internal/http2/compat.js +++ b/lib/internal/http2/compat.js @@ -12,8 +12,8 @@ const { Proxy, ReflectApply, ReflectGetPrototypeOf, - StringPrototypeIncludes, SafeArrayIterator, + StringPrototypeIncludes, StringPrototypeToLowerCase, StringPrototypeTrim, Symbol, @@ -57,11 +57,11 @@ const { validateString, } = require('internal/validators'); const { - kSocket, - kRequest, - kProxySocket, assertValidPseudoHeader, - getAuthority + getAuthority, + kProxySocket, + kRequest, + kSocket } = require('internal/http2/util'); const { _checkIsHttpToken: checkIsHttpToken } = require('_http_common'); diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js index c6915e903e9d01..6b1463fb92123e 100644 --- a/lib/internal/http2/core.js +++ b/lib/internal/http2/core.js @@ -13,8 +13,8 @@ const { MathMin, ObjectAssign, ObjectCreate, - ObjectKeys, ObjectDefineProperty, + ObjectKeys, ObjectPrototypeHasOwnProperty, Promise, PromisePrototypeThen, @@ -36,8 +36,8 @@ const { const { assertCrypto, - customInspectSymbol: kInspect, kEmptyObject, + customInspectSymbol: kInspect, promisify, } = require('internal/util'); @@ -52,11 +52,11 @@ const { URL } = require('internal/url'); const net = require('net'); const { Duplex } = require('stream'); const tls = require('tls'); -const { setImmediate, setTimeout, clearTimeout } = require('timers'); +const { clearTimeout, setImmediate, setTimeout } = require('timers'); const { - kIncomingMessage, - _checkIsHttpToken: checkIsHttpToken + _checkIsHttpToken: checkIsHttpToken, + kIncomingMessage } = require('_http_common'); const { kServerResponse } = require('_http_server'); const JSStreamSocket = require('internal/js_stream_socket'); @@ -69,7 +69,8 @@ const { }, } = require('internal/async_hooks'); const { - aggregateTwoErrors, + AbortError, + hideStackFrames, codes: { ERR_HTTP2_ALTSVC_INVALID_ORIGIN, ERR_HTTP2_ALTSVC_LENGTH, @@ -116,18 +117,17 @@ const { ERR_OUT_OF_RANGE, ERR_SOCKET_CLOSED }, - hideStackFrames, - AbortError + aggregateTwoErrors } = require('internal/errors'); const { isUint32, + validateAbortSignal, validateFunction, validateInt32, validateInteger, validateNumber, validateString, - validateUint32, - validateAbortSignal + validateUint32 } = require('internal/validators'); const fsPromisesInternal = require('internal/fs/promises'); const { utcDate } = require('internal/http'); @@ -138,6 +138,7 @@ const { } = require('internal/http2/compat'); const { + NghttpError, assertIsObject, assertValidPseudoHeader, assertValidPseudoHeaderResponse, @@ -149,27 +150,26 @@ const { getSettings, getStreamState, isPayloadMeaningless, + kProxySocket, + kRequest, kSensitiveHeaders, kSocket, - kRequest, - kProxySocket, mapToHeaders, - NghttpError, sessionName, toHeaderObject, updateOptionsBuffer, updateSettingsBuffer } = require('internal/http2/util'); const { - writeGeneric, - writevGeneric, - onStreamRead, kAfterAsyncWrite, - kMaybeDestroy, - kUpdateTimer, kHandle, + kMaybeDestroy, kSession, - setStreamTimeout + kUpdateTimer, + onStreamRead, + setStreamTimeout, + writeGeneric, + writevGeneric } = require('internal/stream_base_commons'); const { kTimeout } = require('internal/timers'); const { isArrayBufferView } = require('internal/util/types'); diff --git a/lib/internal/legacy/processbinding.js b/lib/internal/legacy/processbinding.js index 3d48e3c9882e58..59113426cdefd1 100644 --- a/lib/internal/legacy/processbinding.js +++ b/lib/internal/legacy/processbinding.js @@ -2,8 +2,8 @@ const { ArrayPrototypeFilter, ArrayPrototypeIncludes, - ObjectFromEntries, ObjectEntries, + ObjectFromEntries, SafeArrayIterator, } = primordials; const { types } = require('util'); diff --git a/lib/internal/main/check_syntax.js b/lib/internal/main/check_syntax.js index 65f578be50fe1e..bbeea3a1900e56 100644 --- a/lib/internal/main/check_syntax.js +++ b/lib/internal/main/check_syntax.js @@ -5,8 +5,8 @@ const { getOptionValue } = require('internal/options'); const { - prepareMainThreadExecution, - markBootstrapComplete + markBootstrapComplete, + prepareMainThreadExecution } = require('internal/process/pre_execution'); const { diff --git a/lib/internal/main/environment.js b/lib/internal/main/environment.js index 0be982bfb6d25d..57a6a82b5ef5b9 100644 --- a/lib/internal/main/environment.js +++ b/lib/internal/main/environment.js @@ -5,8 +5,8 @@ // It is currently only intended for preparing contexts for embedders. const { - prepareMainThreadExecution, - markBootstrapComplete + markBootstrapComplete, + prepareMainThreadExecution } = require('internal/process/pre_execution'); prepareMainThreadExecution(); diff --git a/lib/internal/main/eval_stdin.js b/lib/internal/main/eval_stdin.js index 0a6d9906019ee0..09485bbfb96e77 100644 --- a/lib/internal/main/eval_stdin.js +++ b/lib/internal/main/eval_stdin.js @@ -3,8 +3,8 @@ // Stdin is not a TTY, we will read it and execute it. const { - prepareMainThreadExecution, - markBootstrapComplete + markBootstrapComplete, + prepareMainThreadExecution } = require('internal/process/pre_execution'); const { getOptionValue } = require('internal/options'); diff --git a/lib/internal/main/eval_string.js b/lib/internal/main/eval_string.js index e7baef452632dc..6b547bdb21800e 100644 --- a/lib/internal/main/eval_string.js +++ b/lib/internal/main/eval_string.js @@ -8,8 +8,8 @@ const { } = primordials; const { - prepareMainThreadExecution, - markBootstrapComplete + markBootstrapComplete, + prepareMainThreadExecution } = require('internal/process/pre_execution'); const { evalModule, evalScript } = require('internal/process/execution'); const { addBuiltinLibsToObject } = require('internal/modules/cjs/helpers'); diff --git a/lib/internal/main/inspect.js b/lib/internal/main/inspect.js index 6c4cc7cc36bcda..e7339d1fae328c 100644 --- a/lib/internal/main/inspect.js +++ b/lib/internal/main/inspect.js @@ -3,8 +3,8 @@ // `node inspect ...` or `node debug ...` const { - prepareMainThreadExecution, - markBootstrapComplete + markBootstrapComplete, + prepareMainThreadExecution } = require('internal/process/pre_execution'); prepareMainThreadExecution(); diff --git a/lib/internal/main/mksnapshot.js b/lib/internal/main/mksnapshot.js index fdf0e021204858..741ffdbf0c7ebc 100644 --- a/lib/internal/main/mksnapshot.js +++ b/lib/internal/main/mksnapshot.js @@ -2,8 +2,8 @@ const { Error, - SafeSet, - SafeArrayIterator + SafeArrayIterator, + SafeSet } = primordials; const binding = internalBinding('mksnapshot'); diff --git a/lib/internal/main/print_help.js b/lib/internal/main/print_help.js index bfef215ace8db5..2a60a9f73c40e6 100644 --- a/lib/internal/main/print_help.js +++ b/lib/internal/main/print_help.js @@ -9,19 +9,19 @@ const { ObjectKeys, RegExp, RegExpPrototypeSymbolReplace, + SafeMap, StringPrototypeLocaleCompare, + StringPrototypeRepeat, StringPrototypeSlice, StringPrototypeTrimLeft, - StringPrototypeRepeat, - SafeMap, } = primordials; const { types } = internalBinding('options'); const hasCrypto = Boolean(process.versions.openssl); const { - prepareMainThreadExecution, - markBootstrapComplete + markBootstrapComplete, + prepareMainThreadExecution } = require('internal/process/pre_execution'); const typeLookup = []; diff --git a/lib/internal/main/prof_process.js b/lib/internal/main/prof_process.js index 3d56e3ec57fa46..d90dee4de177f8 100644 --- a/lib/internal/main/prof_process.js +++ b/lib/internal/main/prof_process.js @@ -1,8 +1,8 @@ 'use strict'; const { - prepareMainThreadExecution, - markBootstrapComplete + markBootstrapComplete, + prepareMainThreadExecution } = require('internal/process/pre_execution'); prepareMainThreadExecution(); diff --git a/lib/internal/main/repl.js b/lib/internal/main/repl.js index 7da68dc05e84b4..dc09af9fe92849 100644 --- a/lib/internal/main/repl.js +++ b/lib/internal/main/repl.js @@ -4,8 +4,8 @@ // the main module is not specified and stdin is a TTY. const { - prepareMainThreadExecution, - markBootstrapComplete + markBootstrapComplete, + prepareMainThreadExecution } = require('internal/process/pre_execution'); const esmLoader = require('internal/process/esm_loader'); diff --git a/lib/internal/main/run_main_module.js b/lib/internal/main/run_main_module.js index b7347c4d457bd7..e99e48f1683944 100644 --- a/lib/internal/main/run_main_module.js +++ b/lib/internal/main/run_main_module.js @@ -3,8 +3,8 @@ const { RegExpPrototypeExec } = primordials; const { - prepareMainThreadExecution, - markBootstrapComplete + markBootstrapComplete, + prepareMainThreadExecution } = require('internal/process/pre_execution'); prepareMainThreadExecution(true); diff --git a/lib/internal/main/test_runner.js b/lib/internal/main/test_runner.js index d28311f3ab5dcd..551adfe4377827 100644 --- a/lib/internal/main/test_runner.js +++ b/lib/internal/main/test_runner.js @@ -11,8 +11,8 @@ const { SafeSet, } = primordials; const { - prepareMainThreadExecution, - markBootstrapComplete + markBootstrapComplete, + prepareMainThreadExecution } = require('internal/process/pre_execution'); const { spawn } = require('child_process'); const { readdirSync, statSync } = require('fs'); @@ -25,8 +25,8 @@ const { const { test } = require('internal/test_runner/harness'); const { kSubtestsFailed } = require('internal/test_runner/test'); const { - isSupportedFileType, doesPathMatchFilter, + isSupportedFileType, } = require('internal/test_runner/utils'); const { basename, join, resolve } = require('path'); const { once } = require('events'); diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js index 41cf85ccda8ff2..674f144c0582ca 100644 --- a/lib/internal/main/worker_thread.js +++ b/lib/internal/main/worker_thread.js @@ -14,25 +14,25 @@ const { } = primordials; const { - patchProcessObject, - setupCoverageHooks, - setupInspectorHooks, - setupWarningHandler, - setupFetch, - setupWebCrypto, - setupCustomEvent, - setupDebugEnv, - setupPerfHooks, - initializeDeprecations, - initializeWASI, initializeCJSLoader, + initializeDeprecations, initializeESMLoader, initializeFrozenIntrinsics, initializeReport, initializeSourceMapsHandlers, + initializeWASI, loadPreloadModules, + markBootstrapComplete, + patchProcessObject, + setupCoverageHooks, + setupCustomEvent, + setupDebugEnv, + setupFetch, + setupInspectorHooks, + setupPerfHooks, setupTraceCategoryState, - markBootstrapComplete + setupWarningHandler, + setupWebCrypto } = require('internal/process/pre_execution'); const { diff --git a/lib/internal/modules/cjs/helpers.js b/lib/internal/modules/cjs/helpers.js index 20c167f8599f7b..0220860a14e6c0 100644 --- a/lib/internal/modules/cjs/helpers.js +++ b/lib/internal/modules/cjs/helpers.js @@ -21,7 +21,7 @@ const { NativeModule } = require('internal/bootstrap/loaders'); const { validateString } = require('internal/validators'); const path = require('path'); -const { pathToFileURL, fileURLToPath, URL } = require('internal/url'); +const { URL, fileURLToPath, pathToFileURL } = require('internal/url'); const { getOptionValue } = require('internal/options'); const { setOwnProperty } = require('internal/util'); diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js index 7c08ff8df31883..c0827642817a36 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -25,6 +25,7 @@ const { ArrayIsArray, ArrayPrototypeConcat, ArrayPrototypeFilter, + ArrayPrototypeFlatMap, ArrayPrototypeIncludes, ArrayPrototypeIndexOf, ArrayPrototypeJoin, @@ -33,7 +34,6 @@ const { ArrayPrototypeSplice, ArrayPrototypeUnshift, ArrayPrototypeUnshiftApply, - ArrayPrototypeFlatMap, Boolean, Error, JSONParse, @@ -57,8 +57,8 @@ const { StringPrototypeCharAt, StringPrototypeCharCodeAt, StringPrototypeEndsWith, - StringPrototypeLastIndexOf, StringPrototypeIndexOf, + StringPrototypeLastIndexOf, StringPrototypeRepeat, StringPrototypeSlice, StringPrototypeSplit, @@ -78,8 +78,8 @@ const { NativeModule } = require('internal/bootstrap/loaders'); const { maybeCacheSourceMap, } = require('internal/source_map/source_map_cache'); -const { pathToFileURL, fileURLToPath, isURLInstance } = require('internal/url'); -const { deprecate, kEmptyObject, filterOwnProperties, setOwnProperty } = require('internal/util'); +const { fileURLToPath, isURLInstance, pathToFileURL } = require('internal/url'); +const { deprecate, filterOwnProperties, kEmptyObject, setOwnProperty } = require('internal/util'); const vm = require('vm'); const assert = require('internal/assert'); const fs = require('fs'); @@ -122,9 +122,9 @@ const { validateString } = require('internal/validators'); const pendingDeprecation = getOptionValue('--pending-deprecation'); const { - CHAR_FORWARD_SLASH, CHAR_BACKWARD_SLASH, - CHAR_COLON + CHAR_COLON, + CHAR_FORWARD_SLASH } = require('internal/constants'); const { diff --git a/lib/internal/modules/esm/assert.js b/lib/internal/modules/esm/assert.js index f0f8387bea1cbf..49c2a0d84fcc9c 100644 --- a/lib/internal/modules/esm/assert.js +++ b/lib/internal/modules/esm/assert.js @@ -4,8 +4,8 @@ const { ArrayPrototypeFilter, ArrayPrototypeIncludes, ObjectCreate, - ObjectValues, ObjectPrototypeHasOwnProperty, + ObjectValues, } = primordials; const { validateString } = require('internal/validators'); diff --git a/lib/internal/modules/esm/get_format.js b/lib/internal/modules/esm/get_format.js index 950a769227c03f..2afd4f00746eae 100644 --- a/lib/internal/modules/esm/get_format.js +++ b/lib/internal/modules/esm/get_format.js @@ -1,11 +1,11 @@ 'use strict'; const { - RegExpPrototypeExec, ObjectAssign, ObjectCreate, ObjectPrototypeHasOwnProperty, PromisePrototypeThen, PromiseResolve, + RegExpPrototypeExec, StringPrototypeSlice, } = primordials; const { basename, extname, relative } = require('path'); @@ -21,7 +21,7 @@ const experimentalNetworkImports = getOptionValue('--experimental-network-imports'); const experimentalSpecifierResolution = getOptionValue('--experimental-specifier-resolution'); -const { getPackageType, getPackageScopeConfig } = require('internal/modules/esm/resolve'); +const { getPackageScopeConfig, getPackageType } = require('internal/modules/esm/resolve'); const { URL, fileURLToPath } = require('internal/url'); const { ERR_UNKNOWN_FILE_EXTENSION } = require('internal/errors').codes; diff --git a/lib/internal/modules/esm/loader.js b/lib/internal/modules/esm/loader.js index f2d5600fba657c..a181d69efc8f17 100644 --- a/lib/internal/modules/esm/loader.js +++ b/lib/internal/modules/esm/loader.js @@ -33,7 +33,7 @@ const { ERR_INVALID_RETURN_VALUE, ERR_UNKNOWN_MODULE_FORMAT, } = require('internal/errors').codes; -const { pathToFileURL, isURLInstance, URL } = require('internal/url'); +const { URL, isURLInstance, pathToFileURL } = require('internal/url'); const { emitExperimentalWarning } = require('internal/util'); const { isAnyArrayBuffer, @@ -47,8 +47,8 @@ const ModuleMap = require('internal/modules/esm/module_map'); const ModuleJob = require('internal/modules/esm/module_job'); const { - defaultResolve, DEFAULT_CONDITIONS, + defaultResolve, } = require('internal/modules/esm/resolve'); const { initializeImportMeta diff --git a/lib/internal/modules/esm/module_job.js b/lib/internal/modules/esm/module_job.js index 2dd69b32f77cb5..e81327434c7e1a 100644 --- a/lib/internal/modules/esm/module_job.js +++ b/lib/internal/modules/esm/module_job.js @@ -7,8 +7,8 @@ const { FunctionPrototype, ObjectCreate, ObjectSetPrototypeOf, - PromiseResolve, PromisePrototypeThen, + PromiseResolve, ReflectApply, RegExpPrototypeExec, RegExpPrototypeSymbolReplace, diff --git a/lib/internal/modules/esm/resolve.js b/lib/internal/modules/esm/resolve.js index 64a566d6edcc47..07784c272d0cbc 100644 --- a/lib/internal/modules/esm/resolve.js +++ b/lib/internal/modules/esm/resolve.js @@ -28,22 +28,22 @@ const { const internalFS = require('internal/fs/utils'); const { NativeModule } = require('internal/bootstrap/loaders'); const { + Stats, realpathSync, statSync, - Stats, } = require('fs'); const { getOptionValue } = require('internal/options'); // Do not eagerly grab .manifest, it may be in TDZ const policy = getOptionValue('--experimental-policy') ? require('internal/process/policy') : null; -const { sep, relative, resolve } = require('path'); +const { relative, resolve, sep } = require('path'); const preserveSymlinks = getOptionValue('--preserve-symlinks'); const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main'); const experimentalNetworkImports = getOptionValue('--experimental-network-imports'); const typeFlag = getOptionValue('--input-type'); -const { URL, pathToFileURL, fileURLToPath } = require('internal/url'); +const { URL, fileURLToPath, pathToFileURL } = require('internal/url'); const { ERR_INPUT_TYPE_NOT_ALLOWED, ERR_INVALID_ARG_VALUE, diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js index 1211974ba9cf9d..bd86e8653ea910 100644 --- a/lib/internal/modules/esm/translators.js +++ b/lib/internal/modules/esm/translators.js @@ -1,13 +1,14 @@ 'use strict'; const { + globalThis: { WebAssembly }, ArrayPrototypeForEach, ArrayPrototypeMap, Boolean, JSONParse, ObjectGetPrototypeOf, - ObjectPrototypeHasOwnProperty, ObjectKeys, + ObjectPrototypeHasOwnProperty, SafeArrayIterator, SafeMap, SafeSet, @@ -15,7 +16,6 @@ const { StringPrototypeSlice, StringPrototypeStartsWith, SyntaxErrorPrototype, - globalThis: { WebAssembly }, } = primordials; let _TYPES = null; @@ -38,7 +38,7 @@ const { const internalURLModule = require('internal/url'); const createDynamicModule = require( 'internal/modules/esm/create_dynamic_module'); -const { fileURLToPath, URL } = require('url'); +const { URL, fileURLToPath } = require('url'); let debug = require('internal/util/debuglog').debuglog('esm', (fn) => { debug = fn; }); diff --git a/lib/internal/per_context/domexception.js b/lib/internal/per_context/domexception.js index 917e2c00bccda9..c7ce22d7220322 100644 --- a/lib/internal/per_context/domexception.js +++ b/lib/internal/per_context/domexception.js @@ -6,9 +6,9 @@ const { ObjectDefineProperties, ObjectDefineProperty, ObjectSetPrototypeOf, - SafeWeakMap, SafeMap, SafeSet, + SafeWeakMap, SymbolToStringTag, TypeError, } = primordials; diff --git a/lib/internal/perf/nodetiming.js b/lib/internal/perf/nodetiming.js index b0ab9df4473d63..0b9aca09b108de 100644 --- a/lib/internal/perf/nodetiming.js +++ b/lib/internal/perf/nodetiming.js @@ -8,8 +8,8 @@ const { const { PerformanceEntry } = require('internal/perf/performance_entry'); const { - now, getMilestoneTimestamp, + now, } = require('internal/perf/utils'); const { diff --git a/lib/internal/perf/observe.js b/lib/internal/perf/observe.js index 656015f8410888..14bdc302897142 100644 --- a/lib/internal/perf/observe.js +++ b/lib/internal/perf/observe.js @@ -3,13 +3,13 @@ const { ArrayFrom, ArrayIsArray, + ArrayPrototypeConcat, ArrayPrototypeFilter, ArrayPrototypeIncludes, ArrayPrototypePush, ArrayPrototypePushApply, ArrayPrototypeSlice, ArrayPrototypeSort, - ArrayPrototypeConcat, Error, ObjectDefineProperties, ObjectFreeze, @@ -52,10 +52,10 @@ const { } = require('internal/validators'); const { - customInspectSymbol: kInspect, deprecate, - lazyDOMException, kEmptyObject, + customInspectSymbol: kInspect, + lazyDOMException, } = require('internal/util'); const { diff --git a/lib/internal/perf/performance.js b/lib/internal/perf/performance.js index 7bf4d9f12acb4b..769c0b566fa592 100644 --- a/lib/internal/perf/performance.js +++ b/lib/internal/perf/performance.js @@ -1,8 +1,8 @@ 'use strict'; const { - ObjectDefineProperty, ObjectDefineProperties, + ObjectDefineProperty, ObjectSetPrototypeOf, } = primordials; @@ -22,9 +22,9 @@ const { now } = require('internal/perf/utils'); const { markResourceTiming } = require('internal/perf/resource_timing'); const { + clearMarkTimings, mark, measure, - clearMarkTimings, } = require('internal/perf/usertiming'); const { clearEntriesFromBuffer, diff --git a/lib/internal/perf/resource_timing.js b/lib/internal/perf/resource_timing.js index 63403bf0ac405a..c75b9f65334306 100644 --- a/lib/internal/perf/resource_timing.js +++ b/lib/internal/perf/resource_timing.js @@ -5,7 +5,7 @@ const { InternalPerformanceEntry } = require('internal/perf/performance_entry'); const { SymbolToStringTag } = primordials; const assert = require('internal/assert'); const { enqueue } = require('internal/perf/observe'); -const { Symbol, ObjectSetPrototypeOf } = primordials; +const { ObjectSetPrototypeOf, Symbol } = primordials; const kCacheMode = Symbol('kCacheMode'); const kRequestedUrl = Symbol('kRequestedUrl'); diff --git a/lib/internal/perf/timerify.js b/lib/internal/perf/timerify.js index e4c97e70353977..0554abb06eff57 100644 --- a/lib/internal/perf/timerify.js +++ b/lib/internal/perf/timerify.js @@ -2,8 +2,8 @@ const { FunctionPrototypeBind, - ObjectDefineProperties, MathCeil, + ObjectDefineProperties, ReflectApply, ReflectConstruct, } = primordials; diff --git a/lib/internal/perf/usertiming.js b/lib/internal/perf/usertiming.js index 51625ee08d5467..b3425f2c7126f3 100644 --- a/lib/internal/perf/usertiming.js +++ b/lib/internal/perf/usertiming.js @@ -1,9 +1,9 @@ 'use strict'; const { + SafeArrayIterator, SafeMap, SafeSet, - SafeArrayIterator, SymbolToStringTag, } = primordials; diff --git a/lib/internal/policy/manifest.js b/lib/internal/policy/manifest.js index 062e1ba219bbe8..3a4b8e25df688f 100644 --- a/lib/internal/policy/manifest.js +++ b/lib/internal/policy/manifest.js @@ -10,9 +10,9 @@ const { ObjectKeys, ObjectSetPrototypeOf, RegExpPrototypeExec, + RegExpPrototypeSymbolReplace, SafeMap, SafeSet, - RegExpPrototypeSymbolReplace, StringPrototypeEndsWith, StringPrototypeStartsWith, Symbol, diff --git a/lib/internal/process/execution.js b/lib/internal/process/execution.js index 72e54030b26184..abfff3a1820256 100644 --- a/lib/internal/process/execution.js +++ b/lib/internal/process/execution.js @@ -16,12 +16,12 @@ const { } = require('internal/errors'); const { - executionAsyncId, - clearDefaultTriggerAsyncId, - clearAsyncIdStack, - hasAsyncIdStack, afterHooksExist, + clearAsyncIdStack, + clearDefaultTriggerAsyncId, emitAfter, + executionAsyncId, + hasAsyncIdStack, popAsyncContext, } = require('internal/async_hooks'); diff --git a/lib/internal/process/per_thread.js b/lib/internal/process/per_thread.js index c2be274659e6c7..13cd797ae5a420 100644 --- a/lib/internal/process/per_thread.js +++ b/lib/internal/process/per_thread.js @@ -14,8 +14,8 @@ const { BigUint64Array, Float64Array, NumberMAX_SAFE_INTEGER, - ObjectFreeze, ObjectDefineProperty, + ObjectFreeze, ReflectApply, RegExpPrototypeExec, SafeArrayIterator, diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js index 923311d7ac161a..b92cb4f2e8a5ab 100644 --- a/lib/internal/process/pre_execution.js +++ b/lib/internal/process/pre_execution.js @@ -12,8 +12,8 @@ const { } = primordials; const { - getOptionValue, getEmbedderOptions, + getOptionValue, refreshOptions, } = require('internal/options'); const { reconnectZeroFillToggle } = require('internal/buffer'); diff --git a/lib/internal/process/promises.js b/lib/internal/process/promises.js index 421538373e0399..b077d6ad22c2bd 100644 --- a/lib/internal/process/promises.js +++ b/lib/internal/process/promises.js @@ -28,12 +28,12 @@ const { } = internalBinding('errors'); const { - pushAsyncContext, - popAsyncContext, symbols: { async_id_symbol: kAsyncIdSymbol, trigger_async_id_symbol: kTriggerAsyncIdSymbol - } + }, + popAsyncContext, + pushAsyncContext } = require('internal/async_hooks'); const { isErrorStackTraceLimitWritable } = require('internal/errors'); diff --git a/lib/internal/process/task_queues.js b/lib/internal/process/task_queues.js index 77372d1fd7ef32..7d2f4b50093a3e 100644 --- a/lib/internal/process/task_queues.js +++ b/lib/internal/process/task_queues.js @@ -16,22 +16,22 @@ const { } = internalBinding('task_queue'); const { - setHasRejectionToWarn, hasRejectionToWarn, listenForRejections, - processPromiseRejections + processPromiseRejections, + setHasRejectionToWarn } = require('internal/process/promises'); const { - getDefaultTriggerAsyncId, - newAsyncId, - initHooksExist, + symbols: { async_id_symbol, trigger_async_id_symbol }, destroyHooksExist, - emitInit, - emitBefore, emitAfter, + emitBefore, emitDestroy, - symbols: { async_id_symbol, trigger_async_id_symbol } + emitInit, + getDefaultTriggerAsyncId, + initHooksExist, + newAsyncId } = require('internal/async_hooks'); const FixedQueue = require('internal/fixed_queue'); diff --git a/lib/internal/process/warning.js b/lib/internal/process/warning.js index 9c2a98af058957..7243a72821e6b3 100644 --- a/lib/internal/process/warning.js +++ b/lib/internal/process/warning.js @@ -3,8 +3,8 @@ const { ArrayIsArray, Error, - ErrorPrototypeToString, ErrorCaptureStackTrace, + ErrorPrototypeToString, String, } = primordials; diff --git a/lib/internal/promise_hooks.js b/lib/internal/promise_hooks.js index 0938a86d06407b..1aab818e4bc37a 100644 --- a/lib/internal/promise_hooks.js +++ b/lib/internal/promise_hooks.js @@ -2,9 +2,9 @@ const { ArrayPrototypeIndexOf, + ArrayPrototypePush, ArrayPrototypeSlice, ArrayPrototypeSplice, - ArrayPrototypePush, FunctionPrototypeBind } = primordials; diff --git a/lib/internal/readline/emitKeypressEvents.js b/lib/internal/readline/emitKeypressEvents.js index 1ac1091d70cab2..1154f06573a907 100644 --- a/lib/internal/readline/emitKeypressEvents.js +++ b/lib/internal/readline/emitKeypressEvents.js @@ -6,8 +6,8 @@ const { } = primordials; const { - charLengthAt, CSI, + charLengthAt, emitKeys, } = require('internal/readline/utils'); const { diff --git a/lib/internal/readline/interface.js b/lib/internal/readline/interface.js index 41e84099cf51e5..2dd2d51ff4537a 100644 --- a/lib/internal/readline/interface.js +++ b/lib/internal/readline/interface.js @@ -9,8 +9,8 @@ const { ArrayPrototypePop, ArrayPrototypePush, ArrayPrototypeReverse, - ArrayPrototypeSplice, ArrayPrototypeShift, + ArrayPrototypeSplice, ArrayPrototypeUnshift, DateNow, FunctionPrototypeCall, @@ -24,6 +24,7 @@ const { RegExpPrototypeExec, RegExpPrototypeSymbolReplace, RegExpPrototypeSymbolSplit, + SafeStringIterator, StringPrototypeCodePointAt, StringPrototypeEndsWith, StringPrototypeRepeat, @@ -33,7 +34,6 @@ const { StringPrototypeTrim, Symbol, SymbolAsyncIterator, - SafeStringIterator, } = primordials; const { codes } = require('internal/errors'); @@ -50,8 +50,8 @@ const { } = require('internal/validators'); const { kEmptyObject } = require('internal/util'); const { - inspect, getStringWidth, + inspect, stripVTControlCharacters, } = require('internal/util/inspect'); const EventEmitter = require('events'); diff --git a/lib/internal/repl/utils.js b/lib/internal/repl/utils.js index 9e55b79fc7e86c..853c5e4900a8b2 100644 --- a/lib/internal/repl/utils.js +++ b/lib/internal/repl/utils.js @@ -21,7 +21,7 @@ const { Symbol, } = primordials; -const { tokTypes: tt, Parser: AcornParser } = +const { Parser: AcornParser, tokTypes: tt } = require('internal/deps/acorn/acorn/dist/acorn'); const { sendInspectorCommand } = require('internal/util/inspector'); diff --git a/lib/internal/socketaddress.js b/lib/internal/socketaddress.js index 9697a1e7380eac..36adc2b4855503 100644 --- a/lib/internal/socketaddress.js +++ b/lib/internal/socketaddress.js @@ -13,8 +13,8 @@ const { const { validateObject, - validateString, validatePort, + validateString, validateUint32, } = require('internal/validators'); diff --git a/lib/internal/source_map/prepare_stack_trace.js b/lib/internal/source_map/prepare_stack_trace.js index 7f184545cd8843..57a7f33d0900d2 100644 --- a/lib/internal/source_map/prepare_stack_trace.js +++ b/lib/internal/source_map/prepare_stack_trace.js @@ -6,10 +6,10 @@ const { ArrayPrototypeMap, ErrorPrototypeToString, RegExpPrototypeSymbolSplit, + SafeStringIterator, StringPrototypeRepeat, StringPrototypeSlice, StringPrototypeStartsWith, - SafeStringIterator, } = primordials; let debug = require('internal/util/debuglog').debuglog('source_map', (fn) => { @@ -19,10 +19,10 @@ const { getStringWidth } = require('internal/util/inspect'); const { readFileSync } = require('fs'); const { findSourceMap } = require('internal/source_map/source_map_cache'); const { + kIsNodeError, kNoOverride, - overrideStackTrace, maybeOverridePrepareStackTrace, - kIsNodeError, + overrideStackTrace, } = require('internal/errors'); const { fileURLToPath } = require('internal/url'); const { setGetSourceMapErrorSource } = internalBinding('errors'); diff --git a/lib/internal/source_map/source_map_cache.js b/lib/internal/source_map/source_map_cache.js index ba79540d837849..cffc2ab052e7fd 100644 --- a/lib/internal/source_map/source_map_cache.js +++ b/lib/internal/source_map/source_map_cache.js @@ -4,8 +4,8 @@ const { ArrayPrototypeMap, JSONParse, ObjectCreate, - ObjectKeys, ObjectGetOwnPropertyDescriptor, + ObjectKeys, ObjectPrototypeHasOwnProperty, RegExpPrototypeExec, RegExpPrototypeSymbolSplit, @@ -44,7 +44,7 @@ const kLeadingProtocol = /^\w+:\/\//; const kSourceMappingURLMagicComment = /\/[*/]#\s+sourceMappingURL=(?[^\s]+)/; const kSourceURLMagicComment = /\/[*/]#\s+sourceURL=(?[^\s]+)/; -const { fileURLToPath, pathToFileURL, URL } = require('internal/url'); +const { URL, fileURLToPath, pathToFileURL } = require('internal/url'); let SourceMap; let sourceMapsEnabled; diff --git a/lib/internal/stream_base_commons.js b/lib/internal/stream_base_commons.js index 231ca139d171e2..3f945632035332 100644 --- a/lib/internal/stream_base_commons.js +++ b/lib/internal/stream_base_commons.js @@ -21,9 +21,9 @@ const { } = require('internal/errors'); const { owner_symbol } = require('internal/async_hooks').symbols; const { + getTimerDuration, kTimeout, - setUnrefTimeout, - getTimerDuration + setUnrefTimeout } = require('internal/timers'); const { isUint8Array } = require('internal/util/types'); const { clearTimeout } = require('timers'); diff --git a/lib/internal/streams/destroy.js b/lib/internal/streams/destroy.js index 5c352135dc3012..244ecba6f96bc6 100644 --- a/lib/internal/streams/destroy.js +++ b/lib/internal/streams/destroy.js @@ -11,10 +11,10 @@ const { Symbol, } = primordials; const { - kDestroyed, isDestroyed, isFinished, - isServerRequest + isServerRequest, + kDestroyed } = require('internal/streams/utils'); const kDestroy = Symbol('kDestroy'); diff --git a/lib/internal/streams/duplexify.js b/lib/internal/streams/duplexify.js index 6fb4e35bafa099..48e0cdf18e5ca7 100644 --- a/lib/internal/streams/duplexify.js +++ b/lib/internal/streams/duplexify.js @@ -1,13 +1,13 @@ 'use strict'; const { - isReadable, - isWritable, + isDuplexNodeStream, isIterable, isNodeStream, + isReadable, isReadableNodeStream, + isWritable, isWritableNodeStream, - isDuplexNodeStream, } = require('internal/streams/utils'); const eos = require('internal/streams/end-of-stream'); const { diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js index 806280ebc1f1d2..d01ac261612438 100644 --- a/lib/internal/streams/end-of-stream.js +++ b/lib/internal/streams/end-of-stream.js @@ -24,17 +24,17 @@ const { const { Promise } = primordials; const { + willEmitClose: _willEmitClose, isClosed, + isNodeStream, isReadable, - isReadableNodeStream, - isReadableFinished, isReadableErrored, + isReadableFinished, + isReadableNodeStream, isWritable, - isWritableNodeStream, - isWritableFinished, isWritableErrored, - isNodeStream, - willEmitClose: _willEmitClose, + isWritableFinished, + isWritableNodeStream, } = require('internal/streams/utils'); function isRequest(stream) { diff --git a/lib/internal/streams/operators.js b/lib/internal/streams/operators.js index d45efbad7c23f6..543fda8c652fa8 100644 --- a/lib/internal/streams/operators.js +++ b/lib/internal/streams/operators.js @@ -24,8 +24,8 @@ const { Number, NumberIsNaN, Promise, - PromiseReject, PromisePrototypeThen, + PromiseReject, Symbol, } = primordials; diff --git a/lib/internal/streams/pipeline.js b/lib/internal/streams/pipeline.js index 77520a14d50a6f..46952c7fbe27aa 100644 --- a/lib/internal/streams/pipeline.js +++ b/lib/internal/streams/pipeline.js @@ -26,15 +26,15 @@ const { } = require('internal/errors'); const { - validateFunction, - validateAbortSignal + validateAbortSignal, + validateFunction } = require('internal/validators'); const { isIterable, + isNodeStream, isReadable, isReadableNodeStream, - isNodeStream, } = require('internal/streams/utils'); const { AbortController } = require('internal/abort_controller'); diff --git a/lib/internal/streams/readable.js b/lib/internal/streams/readable.js index aad4c594501ba6..778e8aa31618b0 100644 --- a/lib/internal/streams/readable.js +++ b/lib/internal/streams/readable.js @@ -31,8 +31,8 @@ const { ObjectSetPrototypeOf, Promise, SafeSet, - SymbolAsyncIterator, - Symbol + Symbol, + SymbolAsyncIterator } = primordials; module.exports = Readable; @@ -53,8 +53,8 @@ let debug = require('internal/util/debuglog').debuglog('stream', (fn) => { const BufferList = require('internal/streams/buffer_list'); const destroyImpl = require('internal/streams/destroy'); const { - getHighWaterMark, - getDefaultHighWaterMark + getDefaultHighWaterMark, + getHighWaterMark } = require('internal/streams/state'); const { diff --git a/lib/internal/streams/writable.js b/lib/internal/streams/writable.js index 1054631ddfee1a..e0c452eaea01fc 100644 --- a/lib/internal/streams/writable.js +++ b/lib/internal/streams/writable.js @@ -29,8 +29,8 @@ const { ArrayPrototypeSlice, Error, FunctionPrototypeSymbolHasInstance, - ObjectDefineProperty, ObjectDefineProperties, + ObjectDefineProperty, ObjectSetPrototypeOf, StringPrototypeToLowerCase, Symbol, @@ -50,8 +50,8 @@ const { } = require('internal/streams/add-abort-signal'); const { - getHighWaterMark, - getDefaultHighWaterMark + getDefaultHighWaterMark, + getHighWaterMark } = require('internal/streams/state'); const { ERR_INVALID_ARG_TYPE, diff --git a/lib/internal/test/transfer.js b/lib/internal/test/transfer.js index b814c37fe6dc6d..9169cb55f6a4ec 100644 --- a/lib/internal/test/transfer.js +++ b/lib/internal/test/transfer.js @@ -1,9 +1,9 @@ 'use strict'; const { - makeTransferable, kClone, kDeserialize, + makeTransferable, } = require('internal/worker/js_transferable'); process.emitWarning( diff --git a/lib/internal/test_runner/harness.js b/lib/internal/test_runner/harness.js index 360fe141fe70a1..c7bd4b73240f6a 100644 --- a/lib/internal/test_runner/harness.js +++ b/lib/internal/test_runner/harness.js @@ -14,7 +14,7 @@ const { }, } = require('internal/errors'); const { getOptionValue } = require('internal/options'); -const { kCancelledByParent, Test, ItTest, Suite } = require('internal/test_runner/test'); +const { ItTest, Suite, Test, kCancelledByParent } = require('internal/test_runner/test'); const isTestRunner = getOptionValue('--test'); const testResources = new SafeMap(); diff --git a/lib/internal/test_runner/tap_stream.js b/lib/internal/test_runner/tap_stream.js index ca0c101aa9260c..40039680e1846d 100644 --- a/lib/internal/test_runner/tap_stream.js +++ b/lib/internal/test_runner/tap_stream.js @@ -5,9 +5,9 @@ const { ArrayPrototypePush, ArrayPrototypeShift, ObjectEntries, + RegExpPrototypeSymbolReplace, StringPrototypeReplaceAll, StringPrototypeSplit, - RegExpPrototypeSymbolReplace, } = primordials; const { inspectWithNoCustomRetry } = require('internal/errors'); const Readable = require('internal/streams/readable'); diff --git a/lib/internal/timers.js b/lib/internal/timers.js index a2a1c1e387bf6a..10966d85817c62 100644 --- a/lib/internal/timers.js +++ b/lib/internal/timers.js @@ -91,15 +91,15 @@ const { } = internalBinding('timers'); const { - getDefaultTriggerAsyncId, - newAsyncId, - initHooksExist, destroyHooksExist, // The needed emit*() functions. - emitInit, - emitBefore, emitAfter, + emitBefore, emitDestroy, + emitInit, + getDefaultTriggerAsyncId, + initHooksExist, + newAsyncId, } = require('internal/async_hooks'); // Symbols for storing async id state. diff --git a/lib/internal/tls/secure-pair.js b/lib/internal/tls/secure-pair.js index db999d90ccffd9..df8f59be526a2b 100644 --- a/lib/internal/tls/secure-pair.js +++ b/lib/internal/tls/secure-pair.js @@ -7,8 +7,8 @@ const _tls_wrap = require('_tls_wrap'); const _tls_common = require('_tls_common'); const { - Symbol, ReflectConstruct, + Symbol, } = primordials; const kCallback = Symbol('Callback'); diff --git a/lib/internal/url.js b/lib/internal/url.js index 2a4ffefe245070..96d8a856abba79 100644 --- a/lib/internal/url.js +++ b/lib/internal/url.js @@ -42,9 +42,9 @@ const { const { getConstructorOf, + kEnumerableProperty, removeColors, toUSVString, - kEnumerableProperty, } = require('internal/util'); const { diff --git a/lib/internal/util.js b/lib/internal/util.js index 843c1a6cae4483..0fc7a493726be0 100644 --- a/lib/internal/util.js +++ b/lib/internal/util.js @@ -11,10 +11,10 @@ const { ObjectCreate, ObjectDefineProperties, ObjectDefineProperty, + ObjectFreeze, ObjectGetOwnPropertyDescriptor, ObjectGetOwnPropertyDescriptors, ObjectGetPrototypeOf, - ObjectFreeze, ObjectPrototypeHasOwnProperty, ObjectSetPrototypeOf, Promise, @@ -31,13 +31,13 @@ const { } = primordials; const { - hideStackFrames, + overrideStackTrace, + uvErrmapGet, codes: { ERR_NO_CRYPTO, ERR_UNKNOWN_SIGNAL }, - uvErrmapGet, - overrideStackTrace, + hideStackFrames, } = require('internal/errors'); const { signals } = internalBinding('constants').os; const { diff --git a/lib/internal/util/debuglog.js b/lib/internal/util/debuglog.js index de39457db2b47b..431df61761fa3c 100644 --- a/lib/internal/util/debuglog.js +++ b/lib/internal/util/debuglog.js @@ -10,7 +10,7 @@ const { StringPrototypeToUpperCase, } = primordials; -const { inspect, format, formatWithOptions } = require('internal/util/inspect'); +const { format, formatWithOptions, inspect } = require('internal/util/inspect'); // `debugImpls` and `testEnabled` are deliberately not initialized so any call // to `debuglog()` before `initializeDebugEnv()` is called will throw. diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js index ca98d2f0937870..e3b2bf886dc961 100644 --- a/lib/internal/util/inspect.js +++ b/lib/internal/util/inspect.js @@ -19,8 +19,8 @@ const { FunctionPrototypeCall, FunctionPrototypeToString, JSONStringify, - MapPrototypeGetSize, MapPrototypeEntries, + MapPrototypeGetSize, MathFloor, MathMax, MathMin, @@ -52,9 +52,9 @@ const { RegExpPrototypeExec, RegExpPrototypeSymbolReplace, RegExpPrototypeToString, - SafeStringIterator, SafeMap, SafeSet, + SafeStringIterator, SetPrototypeGetSize, SetPrototypeValues, String, @@ -70,9 +70,9 @@ const { StringPrototypeToLowerCase, StringPrototypeTrim, StringPrototypeValueOf, + SymbolIterator, SymbolPrototypeToString, SymbolPrototypeValueOf, - SymbolIterator, SymbolToStringTag, TypedArrayPrototypeGetLength, TypedArrayPrototypeGetSymbolToStringTag, @@ -108,30 +108,30 @@ const { } = require('internal/errors'); const { - isAsyncFunction, - isGeneratorFunction, isAnyArrayBuffer, - isArrayBuffer, isArgumentsObject, + isArrayBuffer, + isAsyncFunction, + isBigIntObject, + isBooleanObject, isBoxedPrimitive, isDataView, + isDate, isExternal, + isGeneratorFunction, isMap, isMapIterator, isModuleNamespaceObject, isNativeError, + isNumberObject, isPromise, + isRegExp, isSet, isSetIterator, + isStringObject, + isTypedArray, isWeakMap, isWeakSet, - isRegExp, - isDate, - isTypedArray, - isStringObject, - isNumberObject, - isBooleanObject, - isBigIntObject, } = require('internal/util/types'); const assert = require('internal/assert'); diff --git a/lib/internal/util/parse_args/parse_args.js b/lib/internal/util/parse_args/parse_args.js index 05f4c6cffbdbd7..28cae2d67e8293 100644 --- a/lib/internal/util/parse_args/parse_args.js +++ b/lib/internal/util/parse_args/parse_args.js @@ -30,8 +30,8 @@ const { isLoneLongOption, isLoneShortOption, isLongOptionAndValue, - isOptionValue, isOptionLikeValue, + isOptionValue, isShortOptionAndValue, isShortOptionGroup, objectGetOwn, diff --git a/lib/internal/v8/startup_snapshot.js b/lib/internal/v8/startup_snapshot.js index 86bee8749566d7..ac6a326a22e18f 100644 --- a/lib/internal/v8/startup_snapshot.js +++ b/lib/internal/v8/startup_snapshot.js @@ -4,8 +4,8 @@ const { validateFunction, } = require('internal/validators'); const { - ERR_NOT_BUILDING_SNAPSHOT, - ERR_DUPLICATE_STARTUP_SNAPSHOT_MAIN_FUNCTION + ERR_DUPLICATE_STARTUP_SNAPSHOT_MAIN_FUNCTION, + ERR_NOT_BUILDING_SNAPSHOT } = require('internal/errors'); const { diff --git a/lib/internal/validators.js b/lib/internal/validators.js index 09c836e7258276..0b77ab8dd754ce 100644 --- a/lib/internal/validators.js +++ b/lib/internal/validators.js @@ -29,8 +29,8 @@ const { } = require('internal/errors'); const { normalizeEncoding } = require('internal/util'); const { - isAsyncFunction, - isArrayBufferView + isArrayBufferView, + isAsyncFunction } = require('internal/util/types'); const { signals } = internalBinding('constants').os; diff --git a/lib/internal/vm/module.js b/lib/internal/vm/module.js index fe72c16a97665d..47e0206f4257d7 100644 --- a/lib/internal/vm/module.js +++ b/lib/internal/vm/module.js @@ -20,8 +20,8 @@ const { const { isContext } = internalBinding('contextify'); const { - isModuleNamespaceObject, isArrayBufferView, + isModuleNamespaceObject, } = require('internal/util/types'); const { customInspectSymbol, @@ -44,8 +44,8 @@ const { validateFunction, validateInt32, validateObject, - validateUint32, validateString, + validateUint32, } = require('internal/validators'); const binding = internalBinding('module_wrap'); diff --git a/lib/internal/webstreams/adapters.js b/lib/internal/webstreams/adapters.js index 402a93342795b2..3976edffb33794 100644 --- a/lib/internal/webstreams/adapters.js +++ b/lib/internal/webstreams/adapters.js @@ -3,8 +3,8 @@ const { ArrayPrototypeMap, PromiseAll, - PromisePrototypeThen, PromisePrototypeFinally, + PromisePrototypeThen, PromiseResolve, Uint8Array, } = primordials; @@ -24,9 +24,9 @@ const { } = require('internal/webstreams/queuingstrategies'); const { - Writable, - Readable, Duplex, + Readable, + Writable, destroy, } = require('stream'); diff --git a/lib/internal/webstreams/compression.js b/lib/internal/webstreams/compression.js index 2ba8e53fa28e73..388d5b71082f3e 100644 --- a/lib/internal/webstreams/compression.js +++ b/lib/internal/webstreams/compression.js @@ -19,8 +19,8 @@ const { const { customInspect } = require('internal/webstreams/util'); const { - customInspectSymbol: kInspect, kEnumerableProperty, + customInspectSymbol: kInspect, } = require('internal/util'); let zlib; diff --git a/lib/internal/webstreams/encoding.js b/lib/internal/webstreams/encoding.js index b95441e12e0cf1..fd5f1194c5fca3 100644 --- a/lib/internal/webstreams/encoding.js +++ b/lib/internal/webstreams/encoding.js @@ -26,9 +26,9 @@ const { } = require('internal/errors'); const { - customInspectSymbol: kInspect, kEmptyObject, kEnumerableProperty, + customInspectSymbol: kInspect, } = require('internal/util'); const kHandle = Symbol('kHandle'); diff --git a/lib/internal/webstreams/queuingstrategies.js b/lib/internal/webstreams/queuingstrategies.js index 78cec0c35559d3..fcbede37386b02 100644 --- a/lib/internal/webstreams/queuingstrategies.js +++ b/lib/internal/webstreams/queuingstrategies.js @@ -13,15 +13,15 @@ const { } = require('internal/errors'); const { - customInspectSymbol: kInspect, kEnumerableProperty, + customInspectSymbol: kInspect, } = require('internal/util'); const { customInspect, isBrandCheck, - kType, kState, + kType, } = require('internal/webstreams/util'); const { diff --git a/lib/internal/webstreams/readablestream.js b/lib/internal/webstreams/readablestream.js index 5c5c8da724ace9..1de4eccf6ddd73 100644 --- a/lib/internal/webstreams/readablestream.js +++ b/lib/internal/webstreams/readablestream.js @@ -16,10 +16,10 @@ const { ObjectDefineProperties, ObjectSetPrototypeOf, Promise, + PromiseAll, PromisePrototypeThen, - PromiseResolve, PromiseReject, - PromiseAll, + PromiseResolve, ReflectConstruct, Symbol, SymbolAsyncIterator, @@ -48,14 +48,14 @@ const { const { createDeferredPromise, - customInspectSymbol: kInspect, kEmptyObject, kEnumerableProperty, + customInspectSymbol: kInspect, } = require('internal/util'); const { - serialize, deserialize, + serialize, } = require('v8'); const { @@ -88,38 +88,38 @@ const { } = require('internal/streams/utils'); const { + ArrayBufferGetByteLength, ArrayBufferViewGetBuffer, ArrayBufferViewGetByteLength, ArrayBufferViewGetByteOffset, - ArrayBufferGetByteLength, AsyncIterator, copyArrayBuffer, customInspect, dequeueValue, - ensureIsPromise, enqueueValueWithSize, + ensureIsPromise, extractHighWaterMark, extractSizeAlgorithm, - lazyTransfer, - isViewedArrayBufferDetached, isBrandCheck, - resetQueue, - setPromiseHandled, - transferArrayBuffer, + isViewedArrayBufferDetached, + kState, + kType, + lazyTransfer, nonOpCancel, nonOpPull, nonOpStart, - kType, - kState, + resetQueue, + setPromiseHandled, + transferArrayBuffer, } = require('internal/webstreams/util'); const { WritableStreamDefaultWriter, isWritableStream, - isWritableStreamLocked, isWritableStreamDefaultController, isWritableStreamDefaultWriter, + isWritableStreamLocked, writableStreamAbort, writableStreamCloseQueuedOrInFlight, diff --git a/lib/internal/webstreams/transfer.js b/lib/internal/webstreams/transfer.js index 4467d90bb5a90f..f3ddf3ee4ffd6e 100644 --- a/lib/internal/webstreams/transfer.js +++ b/lib/internal/webstreams/transfer.js @@ -17,8 +17,8 @@ const { const { ReadableStream, - readableStreamDefaultControllerEnqueue, readableStreamDefaultControllerClose, + readableStreamDefaultControllerEnqueue, readableStreamDefaultControllerError, readableStreamPipeTo, } = require('internal/webstreams/readablestream'); @@ -35,9 +35,9 @@ const { const assert = require('internal/assert'); const { - makeTransferable, kClone, kDeserialize, + makeTransferable, } = require('internal/worker/js_transferable'); // This class is a bit of a hack. The Node.js implementation of diff --git a/lib/internal/webstreams/transformstream.js b/lib/internal/webstreams/transformstream.js index 457c9eb8fb338a..a14fb5c1c6d22c 100644 --- a/lib/internal/webstreams/transformstream.js +++ b/lib/internal/webstreams/transformstream.js @@ -26,8 +26,8 @@ const { const { createDeferredPromise, - customInspectSymbol: kInspect, kEnumerableProperty, + customInspectSymbol: kInspect, } = require('internal/util'); const { @@ -43,9 +43,9 @@ const { extractHighWaterMark, extractSizeAlgorithm, isBrandCheck, - nonOpFlush, - kType, kState, + kType, + nonOpFlush, } = require('internal/webstreams/util'); const { diff --git a/lib/internal/webstreams/util.js b/lib/internal/webstreams/util.js index ed74a10801f8ff..400359376c4e48 100644 --- a/lib/internal/webstreams/util.js +++ b/lib/internal/webstreams/util.js @@ -10,8 +10,8 @@ const { NumberIsNaN, ObjectCreate, PromisePrototypeThen, - PromiseResolve, PromiseReject, + PromiseResolve, ReflectGet, Symbol, Uint8Array, diff --git a/lib/internal/webstreams/writablestream.js b/lib/internal/webstreams/writablestream.js index 8c25cc33c15f5f..ee9b579a1bfb94 100644 --- a/lib/internal/webstreams/writablestream.js +++ b/lib/internal/webstreams/writablestream.js @@ -9,8 +9,8 @@ const { FunctionPrototypeCall, ObjectDefineProperties, PromisePrototypeThen, - PromiseResolve, PromiseReject, + PromiseResolve, ReflectConstruct, Symbol, SymbolToStringTag, @@ -32,8 +32,8 @@ const { const { createDeferredPromise, - customInspectSymbol: kInspect, kEnumerableProperty, + customInspectSymbol: kInspect, } = require('internal/util'); const { @@ -50,21 +50,21 @@ const { const { customInspect, dequeueValue, - ensureIsPromise, enqueueValueWithSize, + ensureIsPromise, extractHighWaterMark, extractSizeAlgorithm, - lazyTransfer, isBrandCheck, isPromisePending, - peekQueueValue, - resetQueue, - setPromiseHandled, + kState, + kType, + lazyTransfer, nonOpCancel, nonOpStart, nonOpWrite, - kType, - kState, + peekQueueValue, + resetQueue, + setPromiseHandled, } = require('internal/webstreams/util'); const { diff --git a/lib/internal/worker/io.js b/lib/internal/worker/io.js index 9e2bbbdb33fd3e..04ba5ef66de162 100644 --- a/lib/internal/worker/io.js +++ b/lib/internal/worker/io.js @@ -8,8 +8,8 @@ const { FunctionPrototypeCall, ObjectAssign, ObjectCreate, - ObjectDefineProperty, ObjectDefineProperties, + ObjectDefineProperty, ObjectGetOwnPropertyDescriptors, ObjectGetPrototypeOf, ObjectSetPrototypeOf, diff --git a/lib/net.js b/lib/net.js index 548e5e7878a56b..e1cc4b1ba91fcc 100644 --- a/lib/net.js +++ b/lib/net.js @@ -28,10 +28,10 @@ const { Number, NumberIsNaN, NumberParseInt, + ObjectCreate, ObjectDefineProperty, ObjectSetPrototypeOf, Symbol, - ObjectCreate, } = primordials; const EventEmitter = require('events'); @@ -43,8 +43,8 @@ const { isIP, isIPv4, isIPv6, - normalizedArgsSymbol, - makeSyncWrite + makeSyncWrite, + normalizedArgsSymbol } = require('internal/net'); const assert = require('internal/assert'); const { @@ -67,21 +67,21 @@ const { constants: PipeConstants } = internalBinding('pipe_wrap'); const { - newAsyncId, + symbols: { async_id_symbol, owner_symbol }, defaultTriggerAsyncIdScope, - symbols: { async_id_symbol, owner_symbol } + newAsyncId } = require('internal/async_hooks'); const { - writevGeneric, - writeGeneric, - onStreamRead, kAfterAsyncWrite, + kBuffer, + kBufferCb, + kBufferGen, kHandle, kUpdateTimer, + onStreamRead, setStreamTimeout, - kBuffer, - kBufferCb, - kBufferGen + writeGeneric, + writevGeneric } = require('internal/stream_base_commons'); const { codes: { diff --git a/lib/path.js b/lib/path.js index fd95361dd02842..9113717b2b8df8 100644 --- a/lib/path.js +++ b/lib/path.js @@ -32,15 +32,15 @@ const { } = primordials; const { - CHAR_UPPERCASE_A, - CHAR_LOWERCASE_A, - CHAR_UPPERCASE_Z, - CHAR_LOWERCASE_Z, - CHAR_DOT, - CHAR_FORWARD_SLASH, CHAR_BACKWARD_SLASH, CHAR_COLON, + CHAR_DOT, + CHAR_FORWARD_SLASH, + CHAR_LOWERCASE_A, + CHAR_LOWERCASE_Z, CHAR_QUESTION_MARK, + CHAR_UPPERCASE_A, + CHAR_UPPERCASE_Z, } = require('internal/constants'); const { validateObject, diff --git a/lib/readline.js b/lib/readline.js index 51ba11577bf813..7129a35d67f5b6 100644 --- a/lib/readline.js +++ b/lib/readline.js @@ -59,8 +59,8 @@ const { validateAbortSignal } = require('internal/validators'); */ const { - Interface: _Interface, InterfaceConstructor, + Interface: _Interface, kAddHistory, kDecoder, kDeleteLeft, diff --git a/lib/repl.js b/lib/repl.js index c4e606c77e56e6..2a3c8dfabbe7a7 100644 --- a/lib/repl.js +++ b/lib/repl.js @@ -90,9 +90,9 @@ const { StringPrototypeSlice, StringPrototypeSplit, StringPrototypeStartsWith, + StringPrototypeToLocaleLowerCase, StringPrototypeTrim, StringPrototypeTrimLeft, - StringPrototypeToLocaleLowerCase, Symbol, SyntaxError, SyntaxErrorPrototype, @@ -101,17 +101,17 @@ const { const { NativeModule } = require('internal/bootstrap/loaders'); const { - makeRequireFunction, - addBuiltinLibsToObject + addBuiltinLibsToObject, + makeRequireFunction } = require('internal/modules/cjs/helpers'); const { - isIdentifierStart, - isIdentifierChar + isIdentifierChar, + isIdentifierStart } = require('internal/deps/acorn/acorn/dist/acorn'); const { decorateErrorStack, - isError, - deprecate + deprecate, + isError } = require('internal/util'); const { inspect } = require('internal/util/inspect'); const vm = require('vm'); diff --git a/lib/stream.js b/lib/stream.js index e8a38120cb2ceb..2cff485c667932 100644 --- a/lib/stream.js +++ b/lib/stream.js @@ -32,8 +32,8 @@ const { } = require('internal/util'); const { - streamReturningOperators, promiseReturningOperators, + streamReturningOperators, } = require('internal/streams/operators'); const { diff --git a/lib/stream/web.js b/lib/stream/web.js index 8278040f690cd0..01575bda30ffe8 100644 --- a/lib/stream/web.js +++ b/lib/stream/web.js @@ -12,12 +12,12 @@ const { } = require('internal/webstreams/writablestream'); const { + ReadableByteStreamController, ReadableStream, - ReadableStreamDefaultReader, ReadableStreamBYOBReader, ReadableStreamBYOBRequest, - ReadableByteStreamController, ReadableStreamDefaultController, + ReadableStreamDefaultReader, } = require('internal/webstreams/readablestream'); const { @@ -26,8 +26,8 @@ const { } = require('internal/webstreams/queuingstrategies'); const { - TextEncoderStream, TextDecoderStream, + TextEncoderStream, } = require('internal/webstreams/encoding'); const { diff --git a/lib/test.js b/lib/test.js index a365eef6d45f91..1671877d79db3f 100644 --- a/lib/test.js +++ b/lib/test.js @@ -1,5 +1,5 @@ 'use strict'; -const { test, describe, it, before, after, beforeEach, afterEach } = require('internal/test_runner/harness'); +const { after, afterEach, before, beforeEach, describe, it, test } = require('internal/test_runner/harness'); const { emitExperimentalWarning } = require('internal/util'); emitExperimentalWarning('The test runner'); diff --git a/lib/timers.js b/lib/timers.js index b2126d9711fc8e..c6dc263e4f375b 100644 --- a/lib/timers.js +++ b/lib/timers.js @@ -34,23 +34,23 @@ const { } = internalBinding('timers'); const L = require('internal/linkedlist'); const { - async_id_symbol, - Timeout, - Immediate, - decRefCount, immediateInfoFields: { kCount, kRefCount }, - kRefed, - kHasPrimitive, + Immediate, + Timeout, + active, + async_id_symbol, + decRefCount, getTimerDuration, + immediateQueue, + insert, + kHasPrimitive, + kRefed, timerListMap, timerListQueue, - immediateQueue, - active, - unrefActive, - insert + unrefActive } = require('internal/timers'); const { promisify: { custom: customPromisify }, diff --git a/lib/timers/promises.js b/lib/timers/promises.js index 7c8d364b1dde4f..2bc76c0ea45b6a 100644 --- a/lib/timers/promises.js +++ b/lib/timers/promises.js @@ -10,8 +10,8 @@ const { } = primordials; const { - Timeout, Immediate, + Timeout, insert } = require('internal/timers'); const { diff --git a/lib/url.js b/lib/url.js index 328452ba3cb27a..922e4b7646544a 100644 --- a/lib/url.js +++ b/lib/url.js @@ -113,40 +113,40 @@ const slashedProtocol = new SafeSet([ 'wss:', ]); const { - CHAR_SPACE, - CHAR_TAB, + CHAR_0, + CHAR_9, + CHAR_AT, + CHAR_BACKWARD_SLASH, CHAR_CARRIAGE_RETURN, - CHAR_LINE_FEED, - CHAR_NO_BREAK_SPACE, - CHAR_ZERO_WIDTH_NOBREAK_SPACE, - CHAR_HASH, + CHAR_CIRCUMFLEX_ACCENT, + CHAR_DOT, + CHAR_DOUBLE_QUOTE, CHAR_FORWARD_SLASH, - CHAR_LEFT_SQUARE_BRACKET, - CHAR_RIGHT_SQUARE_BRACKET, + CHAR_GRAVE_ACCENT, + CHAR_HASH, + CHAR_HYPHEN_MINUS, CHAR_LEFT_ANGLE_BRACKET, - CHAR_RIGHT_ANGLE_BRACKET, CHAR_LEFT_CURLY_BRACKET, - CHAR_RIGHT_CURLY_BRACKET, - CHAR_QUESTION_MARK, + CHAR_LEFT_SQUARE_BRACKET, + CHAR_LINE_FEED, CHAR_LOWERCASE_A, CHAR_LOWERCASE_Z, - CHAR_UPPERCASE_A, - CHAR_UPPERCASE_Z, - CHAR_DOT, - CHAR_0, - CHAR_9, - CHAR_HYPHEN_MINUS, - CHAR_PLUS, - CHAR_UNDERSCORE, - CHAR_DOUBLE_QUOTE, - CHAR_SINGLE_QUOTE, + CHAR_NO_BREAK_SPACE, CHAR_PERCENT, + CHAR_PLUS, + CHAR_QUESTION_MARK, + CHAR_RIGHT_ANGLE_BRACKET, + CHAR_RIGHT_CURLY_BRACKET, + CHAR_RIGHT_SQUARE_BRACKET, CHAR_SEMICOLON, - CHAR_BACKWARD_SLASH, - CHAR_CIRCUMFLEX_ACCENT, - CHAR_GRAVE_ACCENT, + CHAR_SINGLE_QUOTE, + CHAR_SPACE, + CHAR_TAB, + CHAR_UNDERSCORE, + CHAR_UPPERCASE_A, + CHAR_UPPERCASE_Z, CHAR_VERTICAL_LINE, - CHAR_AT, + CHAR_ZERO_WIDTH_NOBREAK_SPACE, } = require('internal/constants'); function urlParse(url, parseQueryString, slashesDenoteHost) { diff --git a/lib/vm.js b/lib/vm.js index 1bb199363afbe1..63a16bad87156d 100644 --- a/lib/vm.js +++ b/lib/vm.js @@ -23,9 +23,9 @@ const { ArrayPrototypeForEach, - Symbol, PromiseReject, ReflectApply, + Symbol, } = primordials; const { diff --git a/lib/worker_threads.js b/lib/worker_threads.js index 9d702fa2883447..cf6e5f64cd4a87 100644 --- a/lib/worker_threads.js +++ b/lib/worker_threads.js @@ -1,21 +1,21 @@ 'use strict'; const { - isMainThread, SHARE_ENV, + Worker, + getEnvironmentData, + isMainThread, resourceLimits, setEnvironmentData, - getEnvironmentData, - threadId, - Worker + threadId } = require('internal/worker'); const { - MessagePort, + BroadcastChannel, MessageChannel, + MessagePort, moveMessagePortToContext, receiveMessageOnPort, - BroadcastChannel, } = require('internal/worker/io'); const { diff --git a/lib/zlib.js b/lib/zlib.js index 9bde1997d95720..3ff41dac243102 100644 --- a/lib/zlib.js +++ b/lib/zlib.js @@ -58,8 +58,8 @@ const { deprecate } = require('internal/util'); const { - isArrayBufferView, isAnyArrayBuffer, + isArrayBufferView, isUint8Array, } = require('internal/util/types'); const binding = internalBinding('zlib'); diff --git a/test/parallel/test-eslint-sort-requires.js b/test/parallel/test-eslint-sort-requires.js new file mode 100644 index 00000000000000..77048b6d867418 --- /dev/null +++ b/test/parallel/test-eslint-sort-requires.js @@ -0,0 +1,116 @@ +'use strict'; + +const common = require('../common'); +if ((!common.hasCrypto) || (!common.hasIntl)) { + common.skip('ESLint tests require crypto and Intl'); +} + +common.skipIfEslintMissing(); + +const RuleTester = require('../../tools/node_modules/eslint').RuleTester; +const rule = require('../../tools/eslint-rules/sort-requires'); + +new RuleTester({ + parserOptions: { ecmaVersion: 6 }, +}) + .run('sort-requires', rule, { + valid: [ + "const A = require('path')", + 'const A = primordials', + "const { A } = require('path')", + 'const { A } = primordials', + "const { A, B } = require('path')", + 'const { A, B } = primordials', + "const { B: a, A: b } = require('path')", + 'const { B: a, A: b } = primordials', + `const { + A, + B, + C, +} = require('path')`, + `const { + A, + B, + C, +} = primordials`, + ], + invalid: [ + { + code: "const { B, A } = require('path')", + errors: [{ message: 'A should occur before B' }], + output: "const { A, B } = require('path')", + }, + { + code: 'const { B, A } = primordials', + errors: [{ message: 'A should occur before B' }], + output: 'const { A, B } = primordials', + }, + { + code: "const { A: b, B: a } = require('path')", + errors: [{ message: 'a should occur before b' }], + output: "const { B: a, A: b } = require('path')", + }, + { + code: 'const { A: b, B: a } = primordials', + errors: [{ message: 'a should occur before b' }], + output: 'const { B: a, A: b } = primordials', + }, + { + code: "const { C, B, A } = require('path')", + errors: [{ message: 'B should occur before C' }], + output: "const { A, B, C } = require('path')", + }, + { + code: 'const { C, B, A } = primordials', + errors: [{ message: 'B should occur before C' }], + output: 'const { A, B, C } = primordials', + }, + // Test for line breaks + { + code: `const { + C, + B, + A +} = require('path')`, + errors: [{ message: 'B should occur before C' }], + output: `const { + A, + B, + C +} = require('path')`, + }, + { + code: `const { + C, + B, + A +} = primordials`, + errors: [{ message: 'B should occur before C' }], + output: `const { + A, + B, + C +} = primordials`, + }, + // Test for comments + // If there is a comment, this rule changes nothing. + { + code: `const { + // comment for B + B, + A +} = require('path')`, + errors: [{ message: 'A should occur before B' }], + output: null, + }, + { + code: `const { + // comment for B + B, + A +} = primordials`, + errors: [{ message: 'A should occur before B' }], + output: null, + }, + ] + }); diff --git a/tools/eslint-rules/no-duplicate-requires.js b/tools/eslint-rules/no-duplicate-requires.js index 6e149edceb8d6e..d21903eababcfb 100644 --- a/tools/eslint-rules/no-duplicate-requires.js +++ b/tools/eslint-rules/no-duplicate-requires.js @@ -4,27 +4,12 @@ */ 'use strict'; -const { isRequireCall, isString } = require('./rules-utils.js'); +const { isTopLevelRequireCall, isString } = require('./rules-utils.js'); //------------------------------------------------------------------------------ // Rule Definition //------------------------------------------------------------------------------ -const secondLevelTypes = [ - 'FunctionDeclaration', 'FunctionExpression', 'ArrowFunctionExpression', - 'ClassBody', 'MethodDefinition', -]; - -function isTopLevel(node) { - while (!secondLevelTypes.includes(node.type)) { - node = node.parent; - if (!node) { - return true; - } - } - return false; -} - module.exports = (context) => { if (context.parserOptions.sourceType === 'module') { return {}; @@ -43,7 +28,7 @@ module.exports = (context) => { const rules = { CallExpression: (node) => { - if (isRequireCall(node) && isTopLevel(node)) { + if (isTopLevelRequireCall(node)) { const moduleName = getRequiredModuleNameFromCall(node); if (moduleName === undefined) { return; diff --git a/tools/eslint-rules/rules-utils.js b/tools/eslint-rules/rules-utils.js index c5362c96cdaebe..3be91300515a1c 100644 --- a/tools/eslint-rules/rules-utils.js +++ b/tools/eslint-rules/rules-utils.js @@ -8,6 +8,23 @@ function isRequireCall(node) { } module.exports.isRequireCall = isRequireCall; +module.exports.isTopLevelRequireCall = function(node) { + const secondLevelTypes = [ + 'FunctionDeclaration', 'FunctionExpression', 'ArrowFunctionExpression', + 'ClassBody', 'MethodDefinition', + ]; + const isTopLevel = (node) => { + while (!secondLevelTypes.includes(node.type)) { + node = node.parent; + if (!node) { + return true; + } + } + return false; + }; + return isRequireCall(node) && isTopLevel(node); +}; + module.exports.isString = function(node) { return node && node.type === 'Literal' && typeof node.value === 'string'; }; diff --git a/tools/eslint-rules/sort-requires.js b/tools/eslint-rules/sort-requires.js new file mode 100644 index 00000000000000..80e89baa525e85 --- /dev/null +++ b/tools/eslint-rules/sort-requires.js @@ -0,0 +1,96 @@ +'use strict'; + +const { isTopLevelRequireCall } = require('./rules-utils.js'); + +const getRequiredPropertiesFromRequireCallExpression = (node) => { + if (node?.parent?.id?.type === 'ObjectPattern') { + return node.parent.id.properties; + } +}; + +const isPrimordialsDeclarator = (node) => { + return ( + node?.type === 'VariableDeclarator' && node?.init?.name === 'primordials' + ); +}; + +const getRequiredPropertiesFromPrimordialsDeclarator = (node) => { + if (node?.id?.type === 'ObjectPattern') { + return node.id.properties; + } +}; + +const getPropertyValueName = (property) => property.value.name; +const compareProperty = (a, b) => (getPropertyValueName(a) > getPropertyValueName(b) ? 1 : -1); + +const findOutOfOrderIndex = (properties) => { + for (let i = 0; i < properties.length - 1; i++) { + if (compareProperty(properties[i], properties[i + 1]) > 0) return i; + } + return -1; +}; + +module.exports = { + meta: { + fixable: 'code', + }, + create(context) { + const sourceCode = context.getSourceCode(); + const hasComment = (nodeOrToken) => + sourceCode.getCommentsBefore(nodeOrToken).length || + sourceCode.getCommentsAfter(nodeOrToken).length; + + const reportOutOfOrder = (target, requiredProperties, outOfOrderIndex) => { + const before = requiredProperties[outOfOrderIndex]; + const after = requiredProperties[outOfOrderIndex + 1]; + context.report({ + node: target, + message: `${after.value.name} should occur before ${before.value.name}`, + fix(fixer) { + if (requiredProperties.some(hasComment)) { + return null; + } + return fixer.replaceTextRange([ + requiredProperties[0].range[0], + requiredProperties[requiredProperties.length - 1].range[1], + ], requiredProperties + .slice() // to avoid mutation + .sort(compareProperty) + .reduce((text, property, index) => { + const suffix = + index === requiredProperties.length - 1 ? + '' : + sourceCode + .getText() + .slice( + requiredProperties[index].range[1], + requiredProperties[index + 1].range[0] + ); + return text + sourceCode.getText(property) + suffix; + }, '')); + }, + }); + }; + + return { + CallExpression(node) { + if (!isTopLevelRequireCall(node)) return; + const requiredProperties = + getRequiredPropertiesFromRequireCallExpression(node); + if (!requiredProperties) return; + const outOfOrderIndex = findOutOfOrderIndex(requiredProperties); + if (outOfOrderIndex === -1) return; + reportOutOfOrder(node, requiredProperties, outOfOrderIndex); + }, + VariableDeclarator(node) { + if (!isPrimordialsDeclarator(node)) return; + const requiredProperties = + getRequiredPropertiesFromPrimordialsDeclarator(node); + if (!requiredProperties) return; + const outOfOrderIndex = findOutOfOrderIndex(requiredProperties); + if (outOfOrderIndex === -1) return; + reportOutOfOrder(node, requiredProperties, outOfOrderIndex); + }, + }; + }, +};