diff --git a/.github/label-pr-config.yml b/.github/label-pr-config.yml
new file mode 100644
index 00000000000000..f16b9ba8e51808
--- /dev/null
+++ b/.github/label-pr-config.yml
@@ -0,0 +1,195 @@
+## Order of entries in this map *does* matter for the resolved labels
+## earlier entries override later entries
+subSystemLabels:
+ # src subsystems
+ /^src\/async-wrap/: c++, async_wrap
+ /^src\/(?:base64|node_buffer|string_)/: c++, buffer
+ /^src\/cares/: c++, cares
+ /^src\/(?:process_wrap|spawn_)/: c++, child_process
+ /^src\/(?:node_)?crypto/: c++, crypto
+ /^src\/(?:debug-|node_debug)/: c++, debugger
+ /^src\/udp_/: c++, dgram
+ /^src\/(?:fs_|node_file|node_stat_watcher)/: c++, fs
+ /^src\/node_http_parser/: c++, http_parser
+ /^src\/node_i18n/: c++, intl
+ /^src\/uv\./: c++, libuv
+ /^src\/(?:connect(?:ion)?|pipe|tcp)_/: c++, net
+ /^src\/node_os/: c++, os
+ /^src\/(?:node_main|signal_)/: c++, process
+ /^src\/timer_/: c++, timers
+ /^src\/(?:CNNICHashWhitelist|node_root_certs|tls_)/: c++, tls
+ /^src\/tty_/: c++, tty
+ /^src\/node_url/: c++, url-whatwg
+ /^src\/node_util/: c++, util
+ /^src\/(?:node_v8|v8abbr)/: c++, V8 Engine
+ /^src\/node_contextify/: c++, vm
+ /^src\/.*win32.*/: c++, windows
+ /^src\/node_zlib/: c++, zlib
+ /^src\/tracing/: c++, tracing
+ /^src\/node_api/: c++, n-api
+ /^src\/node_http2/: c++, http2, dont-land-on-v6.x
+ /^src\/node_report/: c++, report
+ /^src\/node_wasi/: c++, wasi
+ /^src\/node_worker/: c++, worker
+ /^src\/quic\/*/: c++, quic, dont-land-on-v14.x, dont-land-on-v12.x
+ /^src\/node_bob*/: c++, quic, dont-land-on-v14.x, dont-land-on-v12.x
+
+ # don't label python files as c++
+ /^src\/.+\.py$/: lib / src, needs-ci
+
+ # properly label changes to v8 inspector integration-related files
+ /^src\/inspector_/: c++, inspector, needs-ci
+
+ # don't want to label it a c++ update when we're "only" bumping the Node.js version
+ /^src\/(?!node_version\.h)/: c++
+ # BUILDING.md should be marked as 'build' in addition to 'doc'
+ /^BUILDING\.md$/: build, doc
+ # meta is a very specific label for things that are policy and or meta-info related
+ /^([A-Z]+$|CODE_OF_CONDUCT|ROADMAP|WORKING_GROUPS|GOVERNANCE|CHANGELOG|\.mail|\.git.+)/: meta
+ # things that edit top-level .md files are always a doc change
+ /^\w+\.md$/: doc
+ # different variants of *Makefile and build files
+ /^(tools\/)?(Makefile|BSDmakefile|create_android_makefiles|\.travis\.yml)$/: build, needs-ci
+ /^tools\/(install\.py|genv8constants\.py|getnodeversion\.py|js2c\.py|utils\.py|configure\.d\/.*)$/: build, needs-ci
+ /^vcbuild\.bat$/: build, windows, needs-ci
+ /^(android-)?configure|node\.gyp|common\.gypi$/: build, needs-ci
+ # more specific tools
+ /^tools\/gyp/: tools, build, needs-ci
+ /^tools\/doc\//: tools, doc
+ /^tools\/icu\//: tools, intl, needs-ci
+ /^tools\/(?:osx-pkg\.pmdoc|pkgsrc)\//: tools, macos, install
+ /^tools\/(?:(?:mac)?osx-)/: tools, macos
+ /^tools\/test-npm/: tools, test, npm
+ /^tools\/test/: tools, test
+ /^tools\/(?:certdata|mkssldef|mk-ca-bundle)/: tools, openssl, tls
+ /^tools\/msvs\//: tools, windows, install, needs-ci
+ /^tools\/[^/]+\.bat$/: tools, windows, needs-ci
+ /^tools\/make-v8/: tools, V8 Engine, needs-ci
+ /^tools\/(code_cache|snapshot|v8_gypfiles)/: needs-ci,
+ /^tools\/build-addons.js/: needs-ci,
+ # all other tool changes should be marked as such
+ /^tools\//: tools
+ /^\.eslint|\.remark|\.editorconfig/: tools
+
+ ## Dependencies
+ # libuv needs an explicit mapping, as the ordinary /deps/ mapping below would
+ # end up as libuv changes labeled with "uv" (which is a non-existing label)
+ /^deps\/uv\//: libuv
+ /^deps\/v8\/tools\/gen-postmortem-metadata\.py/: V8 Engine, post-mortem
+ /^deps\/v8\//: V8 Engine
+ /^deps\/uvwasi\//: wasi
+ /^deps\/nghttp2\/nghttp2\.gyp/: build, http2, dont-land-on-v6.x
+ /^deps\/nghttp2\//: http2, dont-land-on-v6.x
+ /^deps\/ngtcp2\//: quic, dont-land-on-v14.x, dont-land-on-v12.x
+ /^deps\/nghttp3\//: quic, dont-land-on-v14.x, dont-land-on-v12.x
+ /^deps\/([^/]+)/: $1
+
+ ## JS subsystems
+ # Oddities first
+ /^lib\/(punycode|\w+\/freelist|sys\.js)/: ''
+ /^lib\/constants\.js$/: lib / src
+ /^lib\/_(debug_agent|debugger)\.js$/: debugger
+ /^lib(\/\w+)?\/(_)?link(ed)?list/: timers
+ /^lib\/\w+\/bootstrap_node/: lib / src
+ /^lib\/\w+\/v8_prof_/: tools
+ /^lib\/\w+\/socket_list/: net
+ /^lib\/\w+\/streams$/: stream
+ /^lib\/.*http2/: http2, dont-land-on-v6.x
+ /^lib\/worker_threads.js$/: worker
+ /^lib\/internal\/url\.js$/: url-whatwg
+ /^lib\/internal\/modules\/esm/: ES Modules
+ /^lib\/internal\/quic\/*/: quic, dont-land-on-v14.x, dont-land-on-v12.x
+
+ # All other lib/ files map directly
+ /^lib\/_(\w+)_\w+\.js?$/: $1 # e.g. _(stream)_wrap
+ /^lib(\/internal)?\/(\w+)\.js?$/: $2 # other .js files
+ /^lib\/internal\/(\w+)(?:\/|$)/: $1 # internal subfolders
+
+exlusiveLabels:
+ # more specific tests
+ /^test\/addons\//: test, addons
+ /^test\/debugger\//: test, debugger
+ /^test\/doctool\//: test, doc, tools
+ /^test\/timers\//: test, timers
+ /^test\/pseudo-tty\//: test, tty
+ /^test\/inspector\//: test, inspector
+ /^test\/cctest\/test_inspector/: test, inspector
+ /^test\/cctest\/test_url/: test, url-whatwg
+ /^test\/addons-napi\//: test, n-api
+ /^test\/async-hooks\//: test, async_hooks
+ /^test\/report\//: test, report
+ /^test\/fixtures\/es-module/: test, ES Modules
+ /^test\/es-module\//: test, ES Modules
+
+ /^test\//: test
+
+ # specific map for webcrypto.md as it should be labeled 'crypto'
+ /^doc\/api\/webcrypto.md$/: doc, crypto
+ # specific map for modules.md as it should be labeled 'module' not 'modules'
+ /^doc\/api\/modules.md$/: doc, module
+ # specific map for esm.md as it should be labeled 'ES Modules' not 'esm'
+ /^doc\/api\/esm.md$/: doc, ES Modules
+ # n-api is treated separately since it is not a JS core module but is still
+ # considered a subsystem of sorts
+ /^doc\/api\/n-api.md$/: doc, n-api
+ # quic
+ /^doc\/api\/quic.md$/: doc, quic, dont-land-on-v14.x, dont-land-on-v12.x
+ # add worker label to PRs that affect doc/api/worker_threads.md
+ /^doc\/api\/worker_threads.md$/: doc, worker
+ # automatically tag JS subsystem-specific API doc changes
+ /^doc\/api\/(\w+)\.md$/: doc, $1
+ # add deprecations label to PRs that affect doc/api/deprecations.md
+ /^doc\/api\/deprecations.md$/: doc, deprecations
+
+ /^doc\//: doc
+
+ # more specific benchmarks
+ /^benchmark\/buffers\//: benchmark, buffer
+ /^benchmark\/(?:arrays|es)\//: benchmark, V8 Engine
+ /^benchmark\/_http/: benchmark, http
+ /^benchmark\/(?:misc|fixtures)\//: benchmark
+ /^benchmark\/streams\//: benchmark, stream
+ /^benchmark\/([^/]+)\//: benchmark, $1
+
+ /^benchmark\//: benchmark
+
+allJsSubSystems:
+ - assert
+ - async_hooks
+ - buffer
+ - child_process
+ - cluster
+ - console
+ - crypto
+ - debugger
+ - dgram
+ - dns
+ - domain
+ - events
+ - esm
+ - fs
+ - http
+ - https
+ - http2
+ - module
+ - net
+ - os
+ - path
+ - process
+ - querystring
+ - quic
+ - readline
+ - repl
+ - report
+ - stream
+ - string_decoder
+ - timers
+ - tls
+ - tty
+ - url
+ - util
+ - v8
+ - vm
+ - wasi
+ - worker
+ - zlib
diff --git a/.github/workflows/comment-labeled.yml b/.github/workflows/comment-labeled.yml
new file mode 100644
index 00000000000000..14e48ea8dd37ca
--- /dev/null
+++ b/.github/workflows/comment-labeled.yml
@@ -0,0 +1,29 @@
+name: Comment on issues and PRs when labelled
+on:
+ issues:
+ types: [labeled]
+ pull_request_target:
+ types: [labeled]
+
+jobs:
+ staleComment:
+ if: github.repository == 'nodejs/node' && github.event.label.name == 'stalled'
+ runs-on: ubuntu-latest
+ steps:
+ - name: Post stalled comment
+ env:
+ COMMENTS_URL: ${{ github.event.issue.comments_url || github.event.pull_request.comments_url }}
+ run: |
+ curl -X POST $COMMENTS_URL \
+ -H "Content-Type: application/json" \
+ -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+ --data '{ "body": "This issue/PR was marked as stalled, it will be automatically closed in 30 days. If it should remain open, please leave a comment explaining why it should remain open." }'
+
+ fastTrack:
+ if: github.repository == 'nodejs/node' && github.event_name == 'pull_request_target' && github.event.label.name == 'fast-track'
+ runs-on: ubuntu-latest
+ steps:
+ - name: Request Fast-Track
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: gh pr comment ${{ github.event.pull_request.number }} --repo ${{ github.repository }} --body "Fast-track has been requested by @${{ github.actor }}. Please 👍 to approve."
diff --git a/.github/workflows/comment-stalled.yml b/.github/workflows/comment-stalled.yml
deleted file mode 100644
index 1c21505c4ad317..00000000000000
--- a/.github/workflows/comment-stalled.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Comment on issues and PRs when labelled stalled
-on:
- issues:
- types: [labeled]
- pull_request_target:
- types: [labeled]
-
-jobs:
- staleComment:
- if: github.repository == 'nodejs/node'
- runs-on: ubuntu-latest
- steps:
- - name: Post comment
- if: github.event.label.name == 'stalled'
- env:
- COMMENTS_URL: ${{ github.event.issue.comments_url || github.event.pull_request.comments_url }}
- run: |
- curl -X POST $COMMENTS_URL \
- -H "Content-Type: application/json" \
- -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
- --data '{ "body": "This issue/PR was marked as stalled, it will be automatically closed in 30 days. If it should remain open, please leave a comment explaining why it should remain open." }'
diff --git a/.github/workflows/label-pr.yml b/.github/workflows/label-pr.yml
new file mode 100644
index 00000000000000..4e56676e41e5ff
--- /dev/null
+++ b/.github/workflows/label-pr.yml
@@ -0,0 +1,14 @@
+name: Label PRs
+
+on:
+ pull_request_target:
+ types: [opened]
+
+jobs:
+ label:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: nodejs/node-pr-labeler@v1
+ with:
+ configuration-path: .github/label-pr-config.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf95e8e6238389..f170eb2c8b1d5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ Select a Node.js version below to view the changelog history:
* [Node.js 13](doc/changelogs/CHANGELOG_V13.md) End-of-Life
* [Node.js 12](doc/changelogs/CHANGELOG_V12.md) Long Term Support
* [Node.js 11](doc/changelogs/CHANGELOG_V11.md) End-of-Life
-* [Node.js 10](doc/changelogs/CHANGELOG_V10.md) Long Term Support
+* [Node.js 10](doc/changelogs/CHANGELOG_V10.md) End-of-Life
* [Node.js 9](doc/changelogs/CHANGELOG_V9.md) End-of-Life
* [Node.js 8](doc/changelogs/CHANGELOG_V8.md) End-of-Life
* [Node.js 7](doc/changelogs/CHANGELOG_V7.md) End-of-Life
@@ -30,11 +30,11 @@ release.
15 Current 14 LTS 12 LTS 10 LTS
-16.0.0 16.1.0 16.0.0
15.14.0 12.1.0 12.0.0
-
-10.24.1 10.24.0 10.23.3 10.23.2 10.23.1 10.23.0 10.22.1 10.22.0 10.21.0 10.20.1 10.20.0 10.19.0 10.18.1 10.18.0 10.17.0 10.16.3 10.16.2 10.16.1 10.16.0 10.15.3 10.15.2 10.15.1 10.15.0 10.14.2 10.14.1 10.14.0 10.13.0 10.12.0 10.11.0 10.10.0 10.9.0 10.8.0 10.7.0 10.6.0 10.5.0 10.4.1 10.4.0 10.3.0 10.2.1 10.2.0 10.1.0 10.0.0
diff --git a/LICENSE b/LICENSE
index c6c4f14e2dc193..41f9bc05611a82 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1333,29 +1333,6 @@ The externally maintained libraries used by Node.js are:
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
"""
-- node-inspect, located at deps/node-inspect, is licensed as follows:
- """
- Copyright Node.js contributors. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- IN THE SOFTWARE.
- """
-
- large_pages, located at src/large_pages, is licensed as follows:
"""
Copyright (C) 2018 Intel Corporation
diff --git a/Makefile b/Makefile
index 26746d94f4ab8c..50d6795bc34903 100644
--- a/Makefile
+++ b/Makefile
@@ -565,10 +565,6 @@ test-pummel: all
test-internet: all
$(PYTHON) tools/test.py $(PARALLEL_ARGS) internet
-test-node-inspect: $(NODE_EXE)
- USE_EMBEDDED_NODE_INSPECT=1 $(NODE) tools/test-npm-package \
- --install deps/node-inspect test
-
test-benchmark: | bench-addons-build
$(PYTHON) tools/test.py $(PARALLEL_ARGS) benchmark
diff --git a/README.md b/README.md
index 13c1c80a8e1642..37aefac1e77c39 100644
--- a/README.md
+++ b/README.md
@@ -155,6 +155,8 @@ For information about the governance of the Node.js project, see
### TSC (Technical Steering Committee)
+* [aduh95](https://github.com/aduh95) -
+**Antoine du Hamel** <duhamelantoine1995@gmail.com> (he/him)
* [apapirovski](https://github.com/apapirovski) -
**Anatoli Papirovski** <apapirovski@mac.com> (he/him)
* [BethGriggs](https://github.com/BethGriggs) -
@@ -169,6 +171,8 @@ For information about the governance of the Node.js project, see
**Shelley Vohr** <codebytere@gmail.com> (she/her)
* [danbev](https://github.com/danbev) -
**Daniel Bevenius** <daniel.bevenius@gmail.com> (he/him)
+* [danielleadams](https://github.com/danielleadams) -
+**Danielle Adams** <adamzdanielle@gmail.com> (she/her)
* [fhinkel](https://github.com/fhinkel) -
**Franziska Hinkelmann** <franziska.hinkelmann@gmail.com> (she/her)
* [gabrielschulhof](https://github.com/gabrielschulhof) -
@@ -187,6 +191,8 @@ For information about the governance of the Node.js project, see
**Mary Marchini** <oss@mmarchini.me> (she/her)
* [MylesBorins](https://github.com/MylesBorins) -
**Myles Borins** <myles.borins@gmail.com> (he/him)
+* [ronag](https://github.com/ronag) -
+**Robert Nagy** <ronagy@icloud.com>
* [targos](https://github.com/targos) -
**Michaël Zasso** <targos@protonmail.com> (he/him)
* [tniessen](https://github.com/tniessen) -
diff --git a/benchmark/common.js b/benchmark/common.js
index bdccd6605f365e..3f7abf7363281d 100644
--- a/benchmark/common.js
+++ b/benchmark/common.js
@@ -12,7 +12,7 @@ class Benchmark {
this._ended = false;
// Holds process.hrtime value
- this._time = [0, 0];
+ this._time = 0n;
// Use the file name as the name of the benchmark
this.name = require.main.filename.slice(__dirname.length + 1);
@@ -218,12 +218,12 @@ class Benchmark {
throw new Error('Called start more than once in a single benchmark');
}
this._started = true;
- this._time = process.hrtime();
+ this._time = process.hrtime.bigint();
}
end(operations) {
// Get elapsed time now and do error checking later for accuracy.
- const elapsed = process.hrtime(this._time);
+ const time = process.hrtime.bigint();
if (!this._started) {
throw new Error('called end without start');
@@ -237,16 +237,19 @@ class Benchmark {
if (!process.env.NODEJS_BENCHMARK_ZERO_ALLOWED && operations <= 0) {
throw new Error('called end() with operation count <= 0');
}
- if (elapsed[0] === 0 && elapsed[1] === 0) {
+
+ this._ended = true;
+
+ if (time === this._time) {
if (!process.env.NODEJS_BENCHMARK_ZERO_ALLOWED)
throw new Error('insufficient clock precision for short benchmark');
// Avoid dividing by zero
- elapsed[1] = 1;
+ this.report(operations && Number.MAX_VALUE, 0n);
+ return;
}
- this._ended = true;
- const time = elapsed[0] + elapsed[1] / 1e9;
- const rate = operations / time;
+ const elapsed = time - this._time;
+ const rate = operations / (Number(elapsed) / 1e9);
this.report(rate, elapsed);
}
@@ -255,12 +258,21 @@ class Benchmark {
name: this.name,
conf: this.config,
rate,
- time: elapsed[0] + elapsed[1] / 1e9,
+ time: nanoSecondsToString(elapsed),
type: 'report',
});
}
}
+function nanoSecondsToString(bigint) {
+ const str = bigint.toString();
+ const decimalPointIndex = str.length - 9;
+ if (decimalPointIndex < 0) {
+ return `0.${'0'.repeat(-decimalPointIndex)}${str}`;
+ }
+ return `${str.slice(0, decimalPointIndex)}.${str.slice(decimalPointIndex)}`;
+}
+
function formatResult(data) {
// Construct configuration string, " A=a, B=b, ..."
let conf = '';
@@ -271,7 +283,7 @@ function formatResult(data) {
let rate = data.rate.toString().split('.');
rate[0] = rate[0].replace(/(\d)(?=(?:\d\d\d)+(?!\d))/g, '$1,');
rate = (rate[1] ? rate.join('.') : rate[0]);
- return `${data.name}${conf}: ${rate}`;
+ return `${data.name}${conf}: ${rate}\n`;
}
function sendResult(data) {
@@ -280,7 +292,7 @@ function sendResult(data) {
process.send(data);
} else {
// Otherwise report by stdout
- console.log(formatResult(data));
+ process.stdout.write(formatResult(data));
}
}
diff --git a/common.gypi b/common.gypi
index c19346bffad434..be7c06d4c81882 100644
--- a/common.gypi
+++ b/common.gypi
@@ -36,7 +36,7 @@
# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
- 'v8_embedder_string': '-node.10',
+ 'v8_embedder_string': '-node.11',
##### V8 defaults for Node.js #####
diff --git a/deps/cjs-module-lexer/CHANGELOG.md b/deps/cjs-module-lexer/CHANGELOG.md
index f71631cab5d7ff..d49499aaa2efcc 100644
--- a/deps/cjs-module-lexer/CHANGELOG.md
+++ b/deps/cjs-module-lexer/CHANGELOG.md
@@ -1,3 +1,10 @@
+1.2.1
+- Support Unicode escapes in strings (https://github.com/guybedford/cjs-module-lexer/pull/55)
+- Filter export strings to valid surrogate pairs (https://github.com/guybedford/cjs-module-lexer/pull/56)
+
+1.2.0
+- Support for non-identifier exports (https://github.com/guybedford/cjs-module-lexer/pull/54, @nicolo-ribaudo)
+
1.1.1
- Better support for Babel reexport getter function forms (https://github.com/guybedford/cjs-module-lexer/issues/50)
- Support Babel interopRequireWildcard reexports patterns (https://github.com/guybedford/cjs-module-lexer/issues/52)
diff --git a/deps/cjs-module-lexer/README.md b/deps/cjs-module-lexer/README.md
index 290af176f0885f..3893221beb79c7 100755
--- a/deps/cjs-module-lexer/README.md
+++ b/deps/cjs-module-lexer/README.md
@@ -70,29 +70,27 @@ IDENTIFIER: As defined by ECMA-262, without support for identifier `\` escapes,
STRING_LITERAL: A `"` or `'` bounded ECMA-262 string literal.
-IDENTIFIER_STRING: ( `"` IDENTIFIER `"` | `'` IDENTIFIER `'` )
-
MODULE_EXPORTS: `module` `.` `exports`
EXPORTS_IDENTIFIER: MODULE_EXPORTS_IDENTIFIER | `exports`
EXPORTS_DOT_ASSIGN: EXPORTS_IDENTIFIER `.` IDENTIFIER `=`
-EXPORTS_LITERAL_COMPUTED_ASSIGN: EXPORTS_IDENTIFIER `[` IDENTIFIER_STRING `]` `=`
+EXPORTS_LITERAL_COMPUTED_ASSIGN: EXPORTS_IDENTIFIER `[` STRING_LITERAL `]` `=`
-EXPORTS_LITERAL_PROP: (IDENTIFIER (`:` IDENTIFIER)?) | (IDENTIFIER_STRING `:` IDENTIFIER)
+EXPORTS_LITERAL_PROP: (IDENTIFIER (`:` IDENTIFIER)?) | (STRING_LITERAL `:` IDENTIFIER)
EXPORTS_SPREAD: `...` (IDENTIFIER | REQUIRE)
EXPORTS_MEMBER: EXPORTS_DOT_ASSIGN | EXPORTS_LITERAL_COMPUTED_ASSIGN
-EXPORTS_DEFINE: `Object` `.` `defineProperty `(` EXPORTS_IDENFITIER `,` IDENTIFIER_STRING
+EXPORTS_DEFINE: `Object` `.` `defineProperty `(` EXPORTS_IDENFITIER `,` STRING_LITERAL
EXPORTS_DEFINE_VALUE: EXPORTS_DEFINE `, {`
(`enumerable: true,`)?
(
`value:` |
- `get` (`: function` IDENTIFIER? )? `() {` return IDENTIFIER (`.` IDENTIFIER | `[` IDENTIFIER_STRING `]`)? `;`? `}` `,`?
+ `get` (`: function` IDENTIFIER? )? `() {` return IDENTIFIER (`.` IDENTIFIER | `[` STRING_LITERAL `]`)? `;`? `}` `,`?
)
`})`
@@ -127,8 +125,8 @@ EXPORT_STAR_LIB: `Object.keys(` IDENTIFIER$1 `).forEach(function (` IDENTIFIER$2
Spacing between tokens is taken to be any ECMA-262 whitespace, ECMA-262 block comment or ECMA-262 line comment.
* The returned export names are taken to be the combination of:
- 1. All `IDENTIFIER` and `IDENTIFIER_STRING` slots for `EXPORTS_MEMBER` and `EXPORTS_LITERAL` matches.
- 2. The first `IDENTIFIER_STRING` slot for all `EXPORTS_DEFINE_VALUE` matches where that same string is not an `EXPORTS_DEFINE` match that is not also an `EXPORTS_DEFINE_VALUE` match.
+ 1. All `IDENTIFIER` and `STRING_LITERAL` slots for `EXPORTS_MEMBER` and `EXPORTS_LITERAL` matches.
+ 2. The first `STRING_LITERAL` slot for all `EXPORTS_DEFINE_VALUE` matches where that same string is not an `EXPORTS_DEFINE` match that is not also an `EXPORTS_DEFINE_VALUE` match.
* The reexport specifiers are taken to be the combination of:
1. The `REQUIRE` matches of the last matched of either `MODULE_EXPORTS_ASSIGN` or `EXPORTS_LITERAL`.
2. All _top-level_ `EXPORT_STAR` `REQUIRE` matches and `EXPORTS_ASSIGN` matches whose `IDENTIFIER` also matches the first `IDENTIFIER` in `EXPORT_STAR_LIB`.
diff --git a/deps/cjs-module-lexer/dist/lexer.js b/deps/cjs-module-lexer/dist/lexer.js
index a1466ee81ae77d..4ac468b84952a4 100644
--- a/deps/cjs-module-lexer/dist/lexer.js
+++ b/deps/cjs-module-lexer/dist/lexer.js
@@ -1 +1 @@
-"use strict";exports.parse=parse;exports.init=init;const A=new Set(["implements","interface","let","package","private","protected","public","static","yield","enum"]);let Q;const B=1===new Uint8Array(new Uint16Array([1]).buffer)[0];function parse(g,I="@"){if(!Q)throw new Error("Not initialized");const D=g.length+1,N=(Q.__heap_base.value||Q.__heap_base)+4*D-Q.memory.buffer.byteLength;N>0&&Q.memory.grow(Math.ceil(N/65536));const k=Q.sa(D);if((B?C:E)(g,new Uint16Array(Q.memory.buffer,k,D)),!Q.parseCJS(k,g.length,0,0,0))throw Object.assign(new Error(`Parse error ${I}${Q.e()}:${g.slice(0,Q.e()).split("\n").length}:${Q.e()-g.lastIndexOf("\n",Q.e()-1)}`),{idx:Q.e()});let o=new Set,K=new Set,w=new Set;for(;Q.rre();)K.add(g.slice(Q.res(),Q.ree()));for(;Q.ru();)w.add(g.slice(Q.us(),Q.ue()));for(;Q.re();){let B=g.slice(Q.es(),Q.ee());A.has(B)||w.has(B)||o.add(B)}return{exports:[...o],reexports:[...K]}}function E(A,Q){const B=A.length;let E=0;for(;E>>8}}function C(A,Q){const B=A.length;let E=0;for(;E{const A=await WebAssembly.compile((B="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vKABEChB5gBHDQJBACgCvKABIgBBAmpB9QBB7gBB4wBB9ABB6QBB7wBB7gAQJEUNAkEAIABBEGoiADYCvKABAkAQKCIEQShGDQAgAEEAKAK8oAFGDQMgBBAuRQ0DCxAoIQALIABBKEcNAUEAQQAoArygAUECajYCvKABEChBKUcNAUEAQQAoArygAUECajYCvKABEChB+wBHDQFBAEEAKAK8oAFBAmo2ArygARAoQfIARw0BQQAoArygASIAQQJqQeUAQfQAQfUAQfIAQe4AEBNFDQFBACAAQQxqNgK8oAEQKBAuRQ0BAkACQAJAECgiAEHbAEYNACAAQS5HDQJBAEEAKAK8oAFBAmo2ArygARAoEC4NAQwEC0EAQQAoArygAUECajYCvKABAkACQBAoIgBBIkYNACAAQSdHDQUQHQwBCxAVC0EAQQAoArygAUECajYCvKABEChB3QBHDQNBAEEAKAK8oAFBAmo2ArygAQsQKCEACwJAIABBO0cNAEEAQQAoArygAUECajYCvKABECghAAsgAEH9AEcNAUEAQQAoArygAUECajYCvKABAkAQKCIAQSxHDQBBAEEAKAK8oAFBAmo2ArygARAoIQALIABB/QBHDQFBAEEAKAK8oAFBAmo2ArygARAoQSlHDQEgAyACQQAoApwfEQAADwsgAkHrAEcNASAARQ0BQQAoArygASIALwECQeUARw0BIAAvAQRB+QBHDQEgAC8BBkHzAEcNASAAQQZqIQFBACAAQQhqNgK8oAEQKEEoRw0BQQBBACgCvKABQQJqNgK8oAEQKCEAQQAoArygASECIAAQLkUNAUEAKAK8oAEhABAoQSlHDQFBAEEAKAK8oAEiAUECajYCvKABEChBLkcNAUEAQQAoArygAUECajYCvKABEChB5gBHDQFBACgCvKABIgNBAmpB7wBB8gBBxQBB4QBB4wBB6AAQJ0UNAUEAIANBDmo2ArygARAoIQNBACgCvKABIgRBfmohASADQShHDQFBACAEQQJqNgK8oAEQKEHmAEcNAUEAKAK8oAEiA0ECakH1AEHuAEHjAEH0AEHpAEHvAEHuABAkRQ0BQQAgA0EQajYCvKABEChBKEcNAUEAQQAoArygAUECajYCvKABECghA0EAKAK8oAEhBCADEC5FDQFBACgCvKABIQMQKEEpRw0BQQBBACgC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BEEAIABBEGoiADYCvKABAkAQKCIFQShGDQAgAEEAKAK8oAFGDQUgBRAuRQ0FCxAoIQALIABBKEcNA0EAQQAoArygAUECajYCvKABEChBKUcNA0EAQQAoArygAUECajYCvKABEChB+wBHDQNBAEEAKAK8oAFBAmo2ArygARAoQfIARw0DQQAoArygASIAQQJqQeUAQfQAQfUAQfIAQe4AEBNFDQNBACAAQQxqNgK8oAEQKBpBACgCvKABIgAgAiAGEEINA0EAIAAgB0EBdGo2ArygARAoQdsARw0DQQBBACgCvKABQQJqNgK8oAEQKBpBACgCvKABIgAgBCADEEINA0EAIAAgCEEBdGo2ArygARAoQd0ARw0DQQBBACgCvKABQQJqNgK8oAECQBAoIgBBO0cNAEEAQQAoArygAUECajYCvKABECghAAsgAEH9AEcNA0EAQQAoArygAUECajYCvKABAkAQKCIAQSxHDQBBAEEAKAK8oAFBAmo2ArygARAoIQALIABB/QBHDQNBAEEAKAK8oAFBAmo2ArygARAoQSlHDQNBAEEAKAK8oAFBAmo2ArygARAoIgBBO0cNAUEAQQAoArygAUECajYCvKABCxAoIQALIABB/QBHDQFBAEEAKAK8oAFBAmo2ArygARAoQSlHDQFBACgCtKABIQRBgCAhAANAAkACQCAEIABGDQAgByAAQQxqKAIAIABBCGooAgAiA2tBAXVHDQEgAiADIAYQQg0BIAAoAgAgAEEEaigCAEEAKAKgHxEAAEEAIAE2ArygAQsPCyAAQRBqIQAMAAsLIAMgAkEAKAKkHxEAAAtBACABNgK8oAELlQEBBH9BACgCvKABIQBBACgCwKABIQECQANAIAAiAkECaiEAIAIgAU8NAQJAIAAvAQAiA0HcAEYNAAJAIANBdmoiAkEDTQ0AIANBIkcNAkEAIAA2ArygAQ8LIAIOBAIBAQICCyACQQRqIQAgAi8BBEENRw0AIAJBBmogACACLwEGQQpGGyEADAALC0EAIAA2ArygARAeC1MBBH9BACgCvKABQQJqIQBBACgCwKABIQECQANAIAAiAkF+aiABTw0BIAJBAmohACACLwEAQXZqIgNBA0sNACADDgQBAAABAQsLQQAgAjYCvKABC3wBAn9BAEEAKAK8oAEiAEECajYCvKABIABBBmohAEEA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","undefined"!=typeof window&&"function"==typeof atob?Uint8Array.from(atob(B),A=>A.charCodeAt(0)):Buffer.from(B,"base64")));var B;const{exports:E}=await WebAssembly.instantiate(A);Q=E})())}
\ No newline at end of file
+"use strict";exports.parse=parse;exports.init=init;let A;const Q=1===new Uint8Array(new Uint16Array([1]).buffer)[0];function parse(g,I="@"){if(!A)throw new Error("Not initialized");const D=g.length+1,N=(A.__heap_base.value||A.__heap_base)+4*D-A.memory.buffer.byteLength;N>0&&A.memory.grow(Math.ceil(N/65536));const k=A.sa(D);if((Q?C:E)(g,new Uint16Array(A.memory.buffer,k,D)),!A.parseCJS(k,g.length,0,0,0))throw Object.assign(new Error(`Parse error ${I}${A.e()}:${g.slice(0,A.e()).split("\n").length}:${A.e()-g.lastIndexOf("\n",A.e()-1)}`),{idx:A.e()});let w=new Set,J=new Set,K=new Set;for(;A.rre();){const Q=B(g.slice(A.res(),A.ree()));Q&&J.add(Q)}for(;A.ru();)K.add(B(g.slice(A.us(),A.ue())));for(;A.re();){let Q=B(g.slice(A.es(),A.ee()));void 0===Q||K.has(Q)||w.add(Q)}return{exports:[...w],reexports:[...J]}}function B(A){if('"'!==A[0]&&"'"!==A[0])return A;try{const Q=(0,eval)(A);for(let A=0;A>>8}}function C(A,Q){const B=A.length;let E=0;for(;E{const Q=await WebAssembly.compile((B="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EBENACACLwEAQS5HDQELQQAgAkESajYCvKABAkAgAi8BEiIDQdMARw0AIAIvARRB9ABHDQEgAi8BFkHhAEcNASACLwEYQfIARw0BQQAgAkEaajYCvKABIAIvARohAwsgA0H//wNxQShHDQBBACgCsKABQQAoAoxANgIAQQBBATsBhkBBAEEAKAK8oAEiAkECajYCvKABIAIvAQJB8gBHDQBBAhAQGgtBAEEAKAK8oAE2AoxADAELAkAgAkEEakHtAEHwAEHvAEHyAEH0ABATRQ0AIAAQEUUNABAkQQAoArygASEAC0EAIAA2AoxAC0EAKALAoAEhA0EAKAK8oAEhAgwACwsgAgv3AQEEf0EAIQECQEEAKAK8oAEiAkECakHlAEHxAEH1AEHpAEHyAEHlABAmRQ0AQQAhAUEAIAJBDmo2ArygAQJAECdBKEcNAEEAQQAoArygAUECajYCvKABECchA0EAKAK8oAEhBAJAIANBJ0YNACADQSJHDQELIAMQHEEAQQAoArygAUECaiIDNgK8oAEQJ0EpRw0AAkAgAEF/aiIBQQFLDQACQAJAIAEOAgEAAQsgBCADQQAoAqAfEQAAQQEPCyAEIANBACgCoB8RAABBAQ8LQQAoArSgASAENgIAQQAoArSgASADNgIEQQEPC0EAIAI2ArygAQsgAQsdAAJAQQAoApgfIABHDQBBAQ8LIABBfmovAQAQJQv+AgEEf0EAKAKYHyEBAkADQCAAQX5qIQIgAC8BACIDQSBHDQEgACABSyEEIAIhACAEDQALCwJAIANBPUcNAAJAA0AgAkF+aiEAIAIvAQBBIEcNASACIAFLIQQgACECIAQNAAsLIABBAmohAiAAQQRqIQNBACEEAkADQCACECghACACIAFNDQEgAEUNASAAQdwARg0CIAAQKUUNASACQX5BfCAAQYCABEkbaiECIAAQKiEEDAALCyAEQQFxRQ0AIAIvAQBBIEcNAEEAKAK0oAEiBEEAKAKwH0YNACAEIAM2AgwgBCACQQJqNgIIIAJBfmohAEEgIQICQANAIABBAmogAU0NASACQf//A3FBIEcNASAALwEAIQIgAEF+aiEADAALCyACQf//A3FBjn9qIgJBAksNAAJAAkACQCACDgMAAwEACyAAQfYAQeEAECsNAQwCCyAAQewAQeUAECsNACAAQeMAQe8AQe4AQfMAECxFDQELQQAgBEEQajYCtKABCws/AQF/QQAhBgJAIAAvAQAgAUcNACAALwECIAJHDQAgAC8BBCADRw0AIAAvAQYgBEcNACAALwEIIAVGIQYLIAYLliYBCH9BAEEAKAK8oAEiAUEMajYCvKABIAFBCmohAQJAECdBLkcNAEEAQQAoArygAUECajYCvKABAkACQBAnIgJB5ABHDQBBACgCvKABIgBBAmpB5QBB5gBB6QBB7gBB5QBB0ABB8gBB7wBB8ABB5QBB8gBB9ABB+QAQL0UNAkEAIABBHGo2ArygASAAQRpqIQEQJ0EoRw0CQQBBACgCvKABQQJqNgK8oAEQJxAwRQ0CECdBLEcNAkEAQQAoArygAUECajYCvKABAkAQJyIAQSdGDQAgAEEiRw0DC0EAKAK8oAEhAiAAEBxBAEEAKAK8oAFBAmoiADYCvKABECdBLEcNAUEAQQAoArygAUECajYCvKABECdB+wBHDQFBAEEAKAK8oAFBAmo2ArygAQJAECciA0HlAEcNAEEAKAK8oAEiA0ECakHuAEH1AEHtAEHlAEHyAEHhAEHiAEHsAEHlABAxRQ0CQQAgA0EUajYCvKABECdBOkcNAkEAQQAoArygAUECajYCvKABECdB9ABHDQJBACgCvKABIgMvAQJB8gBHDQIgAy8BBEH1AEcNAiADLwEGQeUARw0CQQAgA0EIajYCvKABECdBLEcNAkEAQQAoArygAUECajYCvKABECchAwsCQCADQecARg0AIANB9gBHDQJBACgCvKABIgMvAQJB4QBHDQIgAy8BBEHsAEcNAiADLwEGQfUARw0CIAMvAQhB5QBHDQJBACADQQpqNgK8oAEQJ0E6Rw0CIAIgAEEAKAKcHxEAAEEAIAE2ArygAQ8LQQAoArygASIDLwECQeUARw0BIAMvAQRB9ABHDQFBACADQQZqNgK8oAECQBAnIgNBOkcNAEEAQQAoArygAUECajYCvKABECdB5gBHDQJBACgCvKABIgNBAmpB9QBB7gBB4wBB9ABB6QBB7wBB7gAQI0UNAkEAIANBEGoiAzYCvKABAkAQJyIEQShGDQAgA0EAKAK8oAFGDQMgBBAtRQ0DCxAnIQMLIANBKEcNAUEAQQAoArygAUECajYCvKABECdBKUcNAUEAQQAoArygAUECajYCvKABECdB+wBHDQFBAEEAKAK8oAFBAmo2ArygARAnQfIARw0BQQAoArygASIDQQJqQeUAQfQAQfUAQfIAQe4AEBNFDQFBACADQQxqNgK8oAEQJxAtRQ0BAkACQAJAECciA0HbAEYNACADQS5HDQJBAEEAKAK8oAFBAmo2ArygARAnEC0NAQwEC0EAQQAoArygAUECajYCvKABAkAQJyIDQSdGDQAgA0EiRw0ECyADEBxBAEEAKAK8oAFBAmo2ArygARAnQd0ARw0DQQBBACgCvKABQQJqNgK8oAELECchAwsCQCADQTtHDQBBAEEAKAK8oAFBAmo2ArygARAnIQMLIANB/QBHDQFBAEEAKAK8oAFBAmo2ArygAQJAECciA0EsRw0AQQBBACgCvKABQQJqNgK8oAEQJyEDCyADQf0ARw0BQQBBACgCvKABQQJqNgK8oAEQJ0EpRw0BIAIgAEEAKAKcHxEAAA8LIAJB6wBHDQEgAEUNAUEAKAK8oAEiAC8BAkHlAEcNASAALwEEQfkARw0BIAAvAQZB8wBHDQEgAEEGaiEBQQAgAEEIajYCvKABECdBKEcNAUEAQQAoArygAUECajYCvKABECchAEEAKAK8oAEhAiAAEC1FDQFBACgCvKABIQAQJ0EpRw0BQQBBACgCvKABIgFBAmo2ArygARAnQS5HDQFBAEEAKAK8oAFBAmo2ArygARAnQeYARw0BQQAoArygASIDQQJqQe8AQfIAQcUAQeEAQeMAQegAECZFDQFBACADQQ5qNgK8oAEQJyEDQQAoArygASIEQX5qIQEgA0EoRw0BQQAgBEECajYCvKABECdB5gBHDQFBACgCvKABIgNBAmpB9QBB7gBB4wBB9ABB6QBB7wBB7gAQI0UNAUEAIANBEGo2ArygARAnQShHDQFBAEEAKAK8oAFBAmo2ArygARAnIQNBACgCvKABIQQgAxAtRQ0BQQAoArygASEDECdBKUcNAUEAQQAoArygAUECajYCvKABECdB+wBHDQFBAEEAKAK8oAFBAmo2ArygARAnQekARw0BQQAoArygASIFLwECQeYARw0BQQAgBUEEajYCvKABECdBKEcNAUEAQQAoArygAUECajYCvKABECcaQQAoArygASIFIAQgAyAEayIDEEENASAAIAJrIgZBAXUhB0EAIAUgA0EBdSIIQQF0ajYCvKAB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AEHuABATRQ0DQQAgAEEMajYCvKABECcaQQAoArygASIAIAIgBhBBDQNBACAAIAdBAXRqNgK8oAEQJ0HbAEcNA0EAQQAoArygAUECajYCvKABECcaQQAoArygASIAIAQgAxBBDQNBACAAIAhBAXRqNgK8oAEQJ0HdAEcNA0EAQQAoArygAUECajYCvKABAkAQJyIAQTtHDQBBAEEAKAK8oAFBAmo2ArygARAnIQALIABB/QBHDQNBAEEAKAK8oAFBAmo2ArygAQJAECciAEEsRw0AQQBBACgCvKABQQJqNgK8oAEQJyEACyAAQf0ARw0DQQBBACgCvKABQQJqNgK8oAEQJ0EpRw0DQQBBACgCvKABQQJqNgK8oAEQJyIAQTtHDQFBAEEAKAK8oAFBAmo2ArygAQsQJyEACyAAQf0ARw0BQQBBACgCvKABQQJqNgK8oAEQJ0EpRw0BQQAoArSgASEEQYAgIQADQAJAAkAgBCAARg0AIAcgAEEMaigCACAAQQhqKAIAIgNrQQF1Rw0BIAIgAyAGEEENASAAKAIAIABBBGooAgBBACgCoB8RAABBACABNgK8oAELDwsgAEEQaiEADAALCyACIABBACgCpB8RAAALQQAgATYCvKABC1MBBH9BACgCvKABQQJqIQBBACgCwKABIQECQANAIAAiAkF+aiABTw0BIAJBAmohACACLwEAQXZqIgNBA0sNACADDgQBAAABAQsLQQAgAjYCvKABC3wBAn9BAEEAKAK8oAEiAEECajYCvKABIABBBmohAEEAKALAoAEhAQNAAkACQAJAIABBfGogAU8NACAAQX5qLwEAQSpHDQIgAC8BAEEvRw0CQQAgAEF+ajYCvKABDAELIABBfmohAAtBACAANgK8oAEPCyAAQQJqIQAMAAsLdQEBfwJAAkAgAEFfaiIBQQVLDQBBASABdEExcQ0BCyAAQUZqQf//A3FBBkkNACAAQVhqQf//A3FBB0kgAEEpR3ENAAJAIABBpX9qIgFBA0sNACABDgQBAAABAQsgAEH9AEcgAEGFf2pB//8DcUEESXEPC0EBCz0BAX9BASEBAkAgAEH3AEHoAEHpAEHsAEHlABA0DQAgAEHmAEHvAEHyABA1DQAgAEHpAEHmABArIQELIAELrQEBA39BASEBAkACQAJAAkACQAJAAkAgAC8BACICQUVq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IgRBACgCmB8iBUkNACAELwEAIAFHDQAgAC8BACACRw0AAkAgBCAFRw0AQQEPCyAAQXxqLwEAECUhAwsgAwtmAQN/QQAhBQJAIABBemoiBkEAKAKYHyIHSQ0AIAYvAQAgAUcNACAAQXxqLwEAIAJHDQAgAEF+ai8BACADRw0AIAAvAQAgBEcNAAJAIAYgB0cNAEEBDwsgAEF4ai8BABAlIQULIAULhQEBAn8gABA+IgAQKiEBAkACQCAAQdwARg0AQQAhAiABRQ0BC0EAKAK8oAFBAkEEIABBgIAESRtqIQACQANAQQAgADYCvKABIAAvAQAQPiIBRQ0BAkAgARApRQ0AIABBAkEEIAFBgIAESRtqIQAMAQsLQQAhAiABQdwARg0BC0EBIQILIAIL2gMBBH9BACgCvKABIgBBfmohAQNAQQAgAEECajYCvKABAkACQAJAIABBACgCwKABTw0AECchAEEAKAK8oAEhAgJAAkAgABAtRQ0AQQAoArygASEDAkACQBAnIgBBOkcNAEEAQQAoArygAUECajYCvKABECcQLUUNAUEAKAK8oAEvAQAhAAsgAiADQQAoApwfEQAADAILQQAgATYCvKABDwsCQAJAIABBIkYNACAAQS5GDQEgAEEnRw0EC0EAKAK8oAEhAiAAEBxBAEEAKAK8oAFBAmoiAzYCvKABECciAEE6Rw0BQQBBACgCvKABQQJqNgK8oAECQBAnEC1FDQBBACgCvKABLwEAIQAgAiADQQAoApwfEQAADAILQQAgATYCvKABDwtBACgCvKABIgAvAQJBLkcNAiAALwEEQS5HDQJBACAAQQZqNgK8oAECQAJAAkAgAC8BBiIAQfIARw0AQQEQECEAQQAoArygASECIAANASACLwEAIQALIABB//8DcRAtDQFBACABNgK8oAEPC0EAIAJBAmo2ArygAQsQJyEACyAAQf//A3EiAEEsRg0CIABB/QBGDQBBACABNgK8oAELDwtBACABNgK8oAEPC0EAKAK8oAEhAAwACwuPAQEBf0EAIQ4CQCAALwEAIAFHDQAgAC8BAiACRw0AIAAvAQQgA0cNACAALwEGIARHDQAgAC8BCCAFRw0AIAAvAQogBkcNACAALwEMIAdHDQAgAC8BDiAIRw0AIAAvARAgCUcNACAALwESIApHDQAgAC8BFCALRw0AIAAv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","undefined"!=typeof window&&"function"==typeof atob?Uint8Array.from(atob(B),A=>A.charCodeAt(0)):Buffer.from(B,"base64")));var B;const{exports:E}=await WebAssembly.instantiate(Q);A=E})())}
\ No newline at end of file
diff --git a/deps/cjs-module-lexer/dist/lexer.mjs b/deps/cjs-module-lexer/dist/lexer.mjs
index 42c77ef82ae71b..acb87e58e2cb71 100644
--- a/deps/cjs-module-lexer/dist/lexer.mjs
+++ b/deps/cjs-module-lexer/dist/lexer.mjs
@@ -1,2 +1,2 @@
-/* cjs-module-lexer 1.1.1 */
-const A=new Set(["implements","interface","let","package","private","protected","public","static","yield","enum"]);let Q;const B=1===new Uint8Array(new Uint16Array([1]).buffer)[0];export function parse(g,I="@"){if(!Q)throw new Error("Not initialized");const D=g.length+1,N=(Q.__heap_base.value||Q.__heap_base)+4*D-Q.memory.buffer.byteLength;N>0&&Q.memory.grow(Math.ceil(N/65536));const k=Q.sa(D);if((B?C:E)(g,new Uint16Array(Q.memory.buffer,k,D)),!Q.parseCJS(k,g.length,0,0,0))throw Object.assign(new Error(`Parse error ${I}${Q.e()}:${g.slice(0,Q.e()).split("\n").length}:${Q.e()-g.lastIndexOf("\n",Q.e()-1)}`),{idx:Q.e()});let o=new Set,K=new Set,w=new Set;for(;Q.rre();)K.add(g.slice(Q.res(),Q.ree()));for(;Q.ru();)w.add(g.slice(Q.us(),Q.ue()));for(;Q.re();){let B=g.slice(Q.es(),Q.ee());A.has(B)||w.has(B)||o.add(B)}return{exports:[...o],reexports:[...K]}}function E(A,Q){const B=A.length;let E=0;for(;E>>8}}function C(A,Q){const B=A.length;let E=0;for(;E{const A=await WebAssembly.compile((B="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vKABEChB5gBHDQJBACgCvKABIgBBAmpB9QBB7gBB4wBB9ABB6QBB7wBB7gAQJEUNAkEAIABBEGoiADYCvKABAkAQKCIEQShGDQAgAEEAKAK8oAFGDQMgBBAuRQ0DCxAoIQALIABBKEcNAUEAQQAoArygAUECajYCvKABEChBKUcNAUEAQQAoArygAUECajYCvKABEChB+wBHDQFBAEEAKAK8oAFBAmo2ArygARAoQfIARw0BQQAoArygASIAQQJqQeUAQfQAQfUAQfIAQe4AEBNFDQFBACAAQQxqNgK8oAEQKBAuRQ0BAkACQAJAECgiAEHbAEYNACAAQS5HDQJBAEEAKAK8oAFBAmo2ArygARAoEC4NAQwEC0EAQQAoArygAUECajYCvKABAkACQBAoIgBBIkYNACAAQSdHDQUQHQwBCxAVC0EAQQAoArygAUECajYCvKABEChB3QBHDQNBAEEAKAK8oAFBAmo2ArygAQsQKCEACwJAIABBO0cNAEEAQQAoArygAUECajYCvKABECghAAsgAEH9AEcNAUEAQQAoArygAUECajYCvKABAkAQKCIAQSxHDQBBAEEAKAK8oAFBAmo2ArygARAoIQALIABB/QBHDQFBAEEAKAK8oAFBAmo2ArygARAoQSlHDQEgAyACQQAoApwfEQAADwsgAkHrAEcNASAARQ0BQQAoArygASIALwECQeUARw0BIAAvAQRB+QBHDQEgAC8BBkHzAEcNASAAQQZqIQFBACAAQQhqNgK8oAEQKEEoRw0BQQBBACgCvKABQQJqNgK8oAEQKCEAQQAoArygASECIAAQLkUNAUEAKAK8oAEhABAoQSlHDQFBAEEAKAK8oAEiAUECajYCvKABEChBLkcNAUEAQQAoArygAUECajYCvKABEChB5gBHDQFBACgCvKABIgNBAmpB7wBB8gBBxQBB4QBB4wBB6AAQJ0UNAUEAIANBDmo2ArygARAoIQNBACgCvKABIgRBfmohASADQShHDQFBACAEQQJqNgK8oAEQKEHmAEcNAUEAKAK8oAEiA0ECakH1AEHuAEHjAEH0AEHpAEHvAEHuABAkRQ0BQQAgA0EQajYCvKABEChBKEcNAUEAQQAoArygAUECajYCvKABECghA0EAKAK8oAEhBCADEC5FDQFBACgCvKABIQMQKEEpRw0BQQBBACgC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BEEAIABBEGoiADYCvKABAkAQKCIFQShGDQAgAEEAKAK8oAFGDQUgBRAuRQ0FCxAoIQALIABBKEcNA0EAQQAoArygAUECajYCvKABEChBKUcNA0EAQQAoArygAUECajYCvKABEChB+wBHDQNBAEEAKAK8oAFBAmo2ArygARAoQfIARw0DQQAoArygASIAQQJqQeUAQfQAQfUAQfIAQe4AEBNFDQNBACAAQQxqNgK8oAEQKBpBACgCvKABIgAgAiAGEEINA0EAIAAgB0EBdGo2ArygARAoQdsARw0DQQBBACgCvKABQQJqNgK8oAEQKBpBACgCvKABIgAgBCADEEINA0EAIAAgCEEBdGo2ArygARAoQd0ARw0DQQBBACgCvKABQQJqNgK8oAECQBAoIgBBO0cNAEEAQQAoArygAUECajYCvKABECghAAsgAEH9AEcNA0EAQQAoArygAUECajYCvKABAkAQKCIAQSxHDQBBAEEAKAK8oAFBAmo2ArygARAoIQALIABB/QBHDQNBAEEAKAK8oAFBAmo2ArygARAoQSlHDQNBAEEAKAK8oAFBAmo2ArygARAoIgBBO0cNAUEAQQAoArygAUECajYCvKABCxAoIQALIABB/QBHDQFBAEEAKAK8oAFBAmo2ArygARAoQSlHDQFBACgCtKABIQRBgCAhAANAAkACQCAEIABGDQAgByAAQQxqKAIAIABBCGooAgAiA2tBAXVHDQEgAiADIAYQQg0BIAAoAgAgAEEEaigCAEEAKAKgHxEAAEEAIAE2ArygAQsPCyAAQRBqIQAMAAsLIAMgAkEAKAKkHxEAAAtBACABNgK8oAELlQEBBH9BACgCvKABIQBBACgCwKABIQECQANAIAAiAkECaiEAIAIgAU8NAQJAIAAvAQAiA0HcAEYNAAJAIANBdmoiAkEDTQ0AIANBIkcNAkEAIAA2ArygAQ8LIAIOBAIBAQICCyACQQRqIQAgAi8BBEENRw0AIAJBBmogACACLwEGQQpGGyEADAALC0EAIAA2ArygARAeC1MBBH9BACgCvKABQQJqIQBBACgCwKABIQECQANAIAAiAkF+aiABTw0BIAJBAmohACACLwEAQXZqIgNBA0sNACADDgQBAAABAQsLQQAgAjYCvKABC3wBAn9BAEEAKAK8oAEiAEECajYCvKABIABBBmohAEEA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","undefined"!=typeof window&&"function"==typeof atob?Uint8Array.from(atob(B),A=>A.charCodeAt(0)):Buffer.from(B,"base64")));var B;const{exports:E}=await WebAssembly.instantiate(A);Q=E})())}
\ No newline at end of file
+/* cjs-module-lexer 1.2.1 */
+let A;const Q=1===new Uint8Array(new Uint16Array([1]).buffer)[0];export function parse(g,I="@"){if(!A)throw new Error("Not initialized");const D=g.length+1,N=(A.__heap_base.value||A.__heap_base)+4*D-A.memory.buffer.byteLength;N>0&&A.memory.grow(Math.ceil(N/65536));const k=A.sa(D);if((Q?C:E)(g,new Uint16Array(A.memory.buffer,k,D)),!A.parseCJS(k,g.length,0,0,0))throw Object.assign(new Error(`Parse error ${I}${A.e()}:${g.slice(0,A.e()).split("\n").length}:${A.e()-g.lastIndexOf("\n",A.e()-1)}`),{idx:A.e()});let w=new Set,J=new Set,K=new Set;for(;A.rre();){const Q=B(g.slice(A.res(),A.ree()));Q&&J.add(Q)}for(;A.ru();)K.add(B(g.slice(A.us(),A.ue())));for(;A.re();){let Q=B(g.slice(A.es(),A.ee()));void 0===Q||K.has(Q)||w.add(Q)}return{exports:[...w],reexports:[...J]}}function B(A){if('"'!==A[0]&&"'"!==A[0])return A;try{const Q=(0,eval)(A);for(let A=0;A>>8}}function C(A,Q){const B=A.length;let E=0;for(;E{const Q=await WebAssembly.compile((B="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EBENACACLwEAQS5HDQELQQAgAkESajYCvKABAkAgAi8BEiIDQdMARw0AIAIvARRB9ABHDQEgAi8BFkHhAEcNASACLwEYQfIARw0BQQAgAkEaajYCvKABIAIvARohAwsgA0H//wNxQShHDQBBACgCsKABQQAoAoxANgIAQQBBATsBhkBBAEEAKAK8oAEiAkECajYCvKABIAIvAQJB8gBHDQBBAhAQGgtBAEEAKAK8oAE2AoxADAELAkAgAkEEakHtAEHwAEHvAEHyAEH0ABATRQ0AIAAQEUUNABAkQQAoArygASEAC0EAIAA2AoxAC0EAKALAoAEhA0EAKAK8oAEhAgwACwsgAgv3AQEEf0EAIQECQEEAKAK8oAEiAkECakHlAEHxAEH1AEHpAEHyAEHlABAmRQ0AQQAhAUEAIAJBDmo2ArygAQJAECdBKEcNAEEAQQAoArygAUECajYCvKABECchA0EAKAK8oAEhBAJAIANBJ0YNACADQSJHDQELIAMQHEEAQQAoArygAUECaiIDNgK8oAEQJ0EpRw0AAkAgAEF/aiIBQQFLDQACQAJAIAEOAgEAAQsgBCADQQAoAqAfEQAAQQEPCyAEIANBACgCoB8RAABBAQ8LQQAoArSgASAENgIAQQAoArSgASADNgIEQQEPC0EAIAI2ArygAQsgAQsdAAJAQQAoApgfIABHDQBBAQ8LIABBfmovAQAQJQv+AgEEf0EAKAKYHyEBAkADQCAAQX5qIQIgAC8BACIDQSBHDQEgACABSyEEIAIhACAEDQALCwJAIANBPUcNAAJAA0AgAkF+aiEAIAIvAQBBIEcNASACIAFLIQQgACECIAQNAAsLIABBAmohAiAAQQRqIQNBACEEAkADQCACECghACACIAFNDQEgAEUNASAAQdwARg0CIAAQKUUNASACQX5BfCAAQYCABEkbaiECIAAQKiEEDAALCyAEQQFxRQ0AIAIvAQBBIEcNAEEAKAK0oAEiBEEAKAKwH0YNACAEIAM2AgwgBCACQQJqNgIIIAJBfmohAEEgIQICQANAIABBAmogAU0NASACQf//A3FBIEcNASAALwEAIQIgAEF+aiEADAALCyACQf//A3FBjn9qIgJBAksNAAJAAkACQCACDgMAAwEACyAAQfYAQeEAECsNAQwCCyAAQewAQeUAECsNACAAQeMAQe8AQe4AQfMAECxFDQELQQAgBEEQajYCtKABCws/AQF/QQAhBgJAIAAvAQAgAUcNACAALwECIAJHDQAgAC8BBCADRw0AIAAvAQYgBEcNACAALwEIIAVGIQYLIAYLliYBCH9BAEEAKAK8oAEiAUEMajYCvKABIAFBCmohAQJAECdBLkcNAEEAQQAoArygAUECajYCvKABAkACQBAnIgJB5ABHDQBBACgCvKABIgBBAmpB5QBB5gBB6QBB7gBB5QBB0ABB8gBB7wBB8ABB5QBB8gBB9ABB+QAQL0UNAkEAIABBHGo2ArygASAAQRpqIQEQJ0EoRw0CQQBBACgCvKABQQJqNgK8oAEQJxAwRQ0CECdBLEcNAkEAQQAoArygAUECajYCvKABAkAQJyIAQSdGDQAgAEEiRw0DC0EAKAK8oAEhAiAAEBxBAEEAKAK8oAFBAmoiADYCvKABECdBLEcNAUEAQQAoArygAUECajYCvKABECdB+wBHDQFBAEEAKAK8oAFBAmo2ArygAQJAECciA0HlAEcNAEEAKAK8oAEiA0ECakHuAEH1AEHtAEHlAEHyAEHhAEHiAEHsAEHlABAxRQ0CQQAgA0EUajYCvKABECdBOkcNAkEAQQAoArygAUECajYCvKABECdB9ABHDQJBACgCvKABIgMvAQJB8gBHDQIgAy8BBEH1AEcNAiADLwEGQeUARw0CQQAgA0EIajYCvKABECdBLEcNAkEAQQAoArygAUECajYCvKABECchAwsCQCADQecARg0AIANB9gBHDQJBACgCvKABIgMvAQJB4QBHDQIgAy8BBEHsAEcNAiADLwEGQfUARw0CIAMvAQhB5QBHDQJBACADQQpqNgK8oAEQJ0E6Rw0CIAIgAEEAKAKcHxEAAEEAIAE2ArygAQ8LQQAoArygASIDLwECQeUARw0BIAMvAQRB9ABHDQFBACADQQZqNgK8oAECQBAnIgNBOkcNAEEAQQAoArygAUECajYCvKABECdB5gBHDQJBACgCvKABIgNBAmpB9QBB7gBB4wBB9ABB6QBB7wBB7gAQI0UNAkEAIANBEGoiAzYCvKABAkAQJyIEQShGDQAgA0EAKAK8oAFGDQMgBBAtRQ0DCxAnIQMLIANBKEcNAUEAQQAoArygAUECajYCvKABECdBKUcNAUEAQQAoArygAUECajYCvKABECdB+wBHDQFBAEEAKAK8oAFBAmo2ArygARAnQfIARw0BQQAoArygASIDQQJqQeUAQfQAQfUAQfIAQe4AEBNFDQFBACADQQxqNgK8oAEQJxAtRQ0BAkACQAJAECciA0HbAEYNACADQS5HDQJBAEEAKAK8oAFBAmo2ArygARAnEC0NAQwEC0EAQQAoArygAUECajYCvKABAkAQJyIDQSdGDQAgA0EiRw0ECyADEBxBAEEAKAK8oAFBAmo2ArygARAnQd0ARw0DQQBBACgCvKABQQJqNgK8oAELECchAwsCQCADQTtHDQBBAEEAKAK8oAFBAmo2ArygARAnIQMLIANB/QBHDQFBAEEAKAK8oAFBAmo2ArygAQJAECciA0EsRw0AQQBBACgCvKABQQJqNgK8oAEQJyEDCyADQf0ARw0BQQBBACgCvKABQQJqNgK8oAEQJ0EpRw0BIAIgAEEAKAKcHxEAAA8LIAJB6wBHDQEgAEUNAUEAKAK8oAEiAC8BAkHlAEcNASAALwEEQfkARw0BIAAvAQZB8wBHDQEgAEEGaiEBQQAgAEEIajYCvKABECdBKEcNAUEAQQAoArygAUECajYCvKABECchAEEAKAK8oAEhAiAAEC1FDQFBACgCvKABIQAQJ0EpRw0BQQBBACgCvKABIgFBAmo2ArygARAnQS5HDQFBAEEAKAK8oAFBAmo2ArygARAnQeYARw0BQQAoArygASIDQQJqQe8AQfIAQcUAQeEAQeMAQegAECZFDQFBACADQQ5qNgK8oAEQJyEDQQAoArygASIEQX5qIQEgA0EoRw0BQQAgBEECajYCvKABECdB5gBHDQFBACgCvKABIgNBAmpB9QBB7gBB4wBB9ABB6QBB7wBB7gAQI0UNAUEAIANBEGo2ArygARAnQShHDQFBAEEAKAK8oAFBAmo2ArygARAnIQNBACgCvKABIQQgAxAtRQ0BQQAoArygASEDECdBKUcNAUEAQQAoArygAUECajYCvKABECdB+wBHDQFBAEEAKAK8oAFBAmo2ArygARAnQekARw0BQQAoArygASIFLwECQeYARw0BQQAgBUEEajYCvKABECdBKEcNAUEAQQAoArygAUECajYCvKABECcaQQAoArygASIFIAQgAyAEayIDEEENASAAIAJrIgZBAXUhB0EAIAUgA0EBdSIIQQF0ajYCvKAB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AEHuABATRQ0DQQAgAEEMajYCvKABECcaQQAoArygASIAIAIgBhBBDQNBACAAIAdBAXRqNgK8oAEQJ0HbAEcNA0EAQQAoArygAUECajYCvKABECcaQQAoArygASIAIAQgAxBBDQNBACAAIAhBAXRqNgK8oAEQJ0HdAEcNA0EAQQAoArygAUECajYCvKABAkAQJyIAQTtHDQBBAEEAKAK8oAFBAmo2ArygARAnIQALIABB/QBHDQNBAEEAKAK8oAFBAmo2ArygAQJAECciAEEsRw0AQQBBACgCvKABQQJqNgK8oAEQJyEACyAAQf0ARw0DQQBBACgCvKABQQJqNgK8oAEQJ0EpRw0DQQBBACgCvKABQQJqNgK8oAEQJyIAQTtHDQFBAEEAKAK8oAFBAmo2ArygAQsQJyEACyAAQf0ARw0BQQBBACgCvKABQQJqNgK8oAEQJ0EpRw0BQQAoArSgASEEQYAgIQADQAJAAkAgBCAARg0AIAcgAEEMaigCACAAQQhqKAIAIgNrQQF1Rw0BIAIgAyAGEEENASAAKAIAIABBBGooAgBBACgCoB8RAABBACABNgK8oAELDwsgAEEQaiEADAALCyACIABBACgCpB8RAAALQQAgATYCvKABC1MBBH9BACgCvKABQQJqIQBBACgCwKABIQECQANAIAAiAkF+aiABTw0BIAJBAmohACACLwEAQXZqIgNBA0sNACADDgQBAAABAQsLQQAgAjYCvKABC3wBAn9BAEEAKAK8oAEiAEECajYCvKABIABBBmohAEEAKALAoAEhAQNAAkACQAJAIABBfGogAU8NACAAQX5qLwEAQSpHDQIgAC8BAEEvRw0CQQAgAEF+ajYCvKABDAELIABBfmohAAtBACAANgK8oAEPCyAAQQJqIQAMAAsLdQEBfwJAAkAgAEFfaiIBQQVLDQBBASABdEExcQ0BCyAAQUZqQf//A3FBBkkNACAAQVhqQf//A3FBB0kgAEEpR3ENAAJAIABBpX9qIgFBA0sNACABDgQBAAABAQsgAEH9AEcgAEGFf2pB//8DcUEESXEPC0EBCz0BAX9BASEBAkAgAEH3AEHoAEHpAEHsAEHlABA0DQAgAEHmAEHvAEHyABA1DQAgAEHpAEHmABArIQELIAELrQEBA39BASEBAkACQAJAAkACQAJAAkAgAC8BACICQUVq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IgRBACgCmB8iBUkNACAELwEAIAFHDQAgAC8BACACRw0AAkAgBCAFRw0AQQEPCyAAQXxqLwEAECUhAwsgAwtmAQN/QQAhBQJAIABBemoiBkEAKAKYHyIHSQ0AIAYvAQAgAUcNACAAQXxqLwEAIAJHDQAgAEF+ai8BACADRw0AIAAvAQAgBEcNAAJAIAYgB0cNAEEBDwsgAEF4ai8BABAlIQULIAULhQEBAn8gABA+IgAQKiEBAkACQCAAQdwARg0AQQAhAiABRQ0BC0EAKAK8oAFBAkEEIABBgIAESRtqIQACQANAQQAgADYCvKABIAAvAQAQPiIBRQ0BAkAgARApRQ0AIABBAkEEIAFBgIAESRtqIQAMAQsLQQAhAiABQdwARg0BC0EBIQILIAIL2gMBBH9BACgCvKABIgBBfmohAQNAQQAgAEECajYCvKABAkACQAJAIABBACgCwKABTw0AECchAEEAKAK8oAEhAgJAAkAgABAtRQ0AQQAoArygASEDAkACQBAnIgBBOkcNAEEAQQAoArygAUECajYCvKABECcQLUUNAUEAKAK8oAEvAQAhAAsgAiADQQAoApwfEQAADAILQQAgATYCvKABDwsCQAJAIABBIkYNACAAQS5GDQEgAEEnRw0EC0EAKAK8oAEhAiAAEBxBAEEAKAK8oAFBAmoiAzYCvKABECciAEE6Rw0BQQBBACgCvKABQQJqNgK8oAECQBAnEC1FDQBBACgCvKABLwEAIQAgAiADQQAoApwfEQAADAILQQAgATYCvKABDwtBACgCvKABIgAvAQJBLkcNAiAALwEEQS5HDQJBACAAQQZqNgK8oAECQAJAAkAgAC8BBiIAQfIARw0AQQEQECEAQQAoArygASECIAANASACLwEAIQALIABB//8DcRAtDQFBACABNgK8oAEPC0EAIAJBAmo2ArygAQsQJyEACyAAQf//A3EiAEEsRg0CIABB/QBGDQBBACABNgK8oAELDwtBACABNgK8oAEPC0EAKAK8oAEhAAwACwuPAQEBf0EAIQ4CQCAALwEAIAFHDQAgAC8BAiACRw0AIAAvAQQgA0cNACAALwEGIARHDQAgAC8BCCAFRw0AIAAvAQogBkcNACAALwEMIAdHDQAgAC8BDiAIRw0AIAAvARAgCUcNACAALwESIApHDQAgAC8BFCALRw0AIAAv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","undefined"!=typeof window&&"function"==typeof atob?Uint8Array.from(atob(B),A=>A.charCodeAt(0)):Buffer.from(B,"base64")));var B;const{exports:E}=await WebAssembly.instantiate(Q);A=E})())}
\ No newline at end of file
diff --git a/deps/cjs-module-lexer/lexer.js b/deps/cjs-module-lexer/lexer.js
index 5e61e8291ea40e..b66e37204b41d6 100755
--- a/deps/cjs-module-lexer/lexer.js
+++ b/deps/cjs-module-lexer/lexer.js
@@ -37,8 +37,6 @@ const Import = 0;
const ExportAssign = 1;
const ExportStar = 2;
-const strictReserved = new Set(['implements', 'interface', 'let', 'package', 'private', 'protected', 'public', 'static', 'yield', 'enum']);
-
function parseCJS (source, name = '@') {
resetState();
try {
@@ -49,14 +47,39 @@ function parseCJS (source, name = '@') {
e.loc = pos;
throw e;
}
- const result = { exports: [..._exports].filter(expt => !unsafeGetters.has(expt)), reexports: [...reexports] };
+ const result = { exports: [..._exports].filter(expt => expt !== undefined && !unsafeGetters.has(expt)), reexports: [...reexports].filter(reexpt => reexpt !== undefined) };
resetState();
return result;
}
-function addExport (name) {
- if (!strictReserved.has(name))
- _exports.add(name);
+function decode (str) {
+ if (str[0] === '"' || str[0] === '\'') {
+ try {
+ const decoded = (0, eval)(str);
+ // Filter to exclude non-matching UTF-16 surrogate strings
+ for (let i = 0; i < decoded.length; i++) {
+ const surrogatePrefix = decoded.charCodeAt(i) & 0xFC00;
+ if (surrogatePrefix < 0xD800) {
+ // Not a surrogate
+ continue;
+ }
+ else if (surrogatePrefix === 0xD800) {
+ // Validate surrogate pair
+ if ((decoded.charCodeAt(++i) & 0xFC00) !== 0xDC00)
+ return;
+ }
+ else {
+ // Out-of-range surrogate code (above 0xD800)
+ return;
+ }
+ }
+ return decoded;
+ }
+ catch {}
+ }
+ else {
+ return str;
+ }
}
function parseSource (cjsSource) {
@@ -173,10 +196,8 @@ function parseSource (cjsSource) {
// TODO:
+* `stream` {Http2Stream} A reference to the stream
+* `headers` {HTTP/2 Headers Object} An object describing the headers
+* `flags` {number} The associated numeric flags
+* `rawHeaders` {Array} An array containing the raw header names followed by
+ their respective values.
+
The `'stream'` event is emitted when a `'stream'` event has been emitted by
an `Http2Session` associated with the server.
+See also [`Http2Session`'s `'stream'` event][].
+
```js
const http2 = require('http2');
const {
@@ -2003,9 +2018,17 @@ an `Http2Session` object associated with the `Http2SecureServer`.
added: v8.4.0
-->
+* `stream` {Http2Stream} A reference to the stream
+* `headers` {HTTP/2 Headers Object} An object describing the headers
+* `flags` {number} The associated numeric flags
+* `rawHeaders` {Array} An array containing the raw header names followed by
+ their respective values.
+
The `'stream'` event is emitted when a `'stream'` event has been emitted by
an `Http2Session` associated with the server.
+See also [`Http2Session`'s `'stream'` event][].
+
```js
const http2 = require('http2');
const {
@@ -3838,6 +3861,7 @@ you need to implement any fall-back behaviour yourself.
[`Http2ServerRequest`]: #http2_class_http2_http2serverrequest
[`Http2ServerResponse`]: #http2_class_http2_http2serverresponse
[`Http2Session` and Sockets]: #http2_http2session_and_sockets
+[`Http2Session`'s `'stream'` event]: #http2_event_stream
[`Http2Stream`]: #http2_class_http2stream
[`ServerHttp2Stream`]: #http2_class_serverhttp2stream
[`TypeError`]: errors.md#errors_class_typeerror
diff --git a/doc/api/n-api.md b/doc/api/n-api.md
index 01e365ac050183..3e31c638cece40 100644
--- a/doc/api/n-api.md
+++ b/doc/api/n-api.md
@@ -286,12 +286,14 @@ listed as supporting a later version.
5
6
7
+ 8
v10.x
v10.16.0
v10.17.0
v10.20.0
+ v10.23.0
@@ -300,6 +302,7 @@ listed as supporting a later version.
v12.x
@@ -307,6 +310,7 @@ listed as supporting a later version.
v12.11.0
v12.17.0
v12.19.0
+ v12.22.0
v13.x
@@ -314,6 +318,7 @@ listed as supporting a later version.
v13.0.0
v14.x
@@ -321,6 +326,23 @@ listed as supporting a later version.
v14.0.0
v14.0.0
v14.12.0
+
+
+ v15.x
+ v15.0.0
+ v15.0.0
+ v15.0.0
+ v15.0.0
+ v15.12.0
+
+
+ v16.x
+ v16.0.0
+ v16.0.0
+ v16.0.0
+ v16.0.0
+ v16.0.0
diff --git a/doc/api/net.md b/doc/api/net.md
index 699b1ba4d573b8..5066179046c8c1 100644
--- a/doc/api/net.md
+++ b/doc/api/net.md
@@ -551,9 +551,10 @@ changes:
* `options` {Object} Available options are:
* `fd` {number} If specified, wrap around an existing socket with
the given file descriptor, otherwise a new socket will be created.
- * `allowHalfOpen` {boolean} Indicates whether half-opened TCP connections
- are allowed. See [`net.createServer()`][] and the [`'end'`][] event
- for details. **Default:** `false`.
+ * `allowHalfOpen` {boolean} If set to `false`, then the socket will
+ automatically end the writable side when the readable side ends. See
+ [`net.createServer()`][] and the [`'end'`][] event for details. **Default:**
+ `false`.
* `readable` {boolean} Allow reads on the socket when an `fd` is passed,
otherwise ignored. **Default:** `false`.
* `writable` {boolean} Allow writes on the socket when an `fd` is passed,
@@ -612,14 +613,14 @@ See also: the return values of `socket.write()`.
added: v0.1.90
-->
-Emitted when the other end of the socket sends a FIN packet, thus ending the
-readable side of the socket.
+Emitted when the other end of the socket signals the end of transmission, thus
+ending the readable side of the socket.
-By default (`allowHalfOpen` is `false`) the socket will send a FIN packet
-back and destroy its file descriptor once it has written out its pending
-write queue. However, if `allowHalfOpen` is set to `true`, the socket will
-not automatically [`end()`][`socket.end()`] its writable side, allowing the
-user to write arbitrary amounts of data. The user must call
+By default (`allowHalfOpen` is `false`) the socket will send an end of
+transmission packet back and destroy its file descriptor once it has written out
+its pending write queue. However, if `allowHalfOpen` is set to `true`, the
+socket will not automatically [`end()`][`socket.end()`] its writable side,
+allowing the user to write arbitrary amounts of data. The user must call
[`end()`][`socket.end()`] explicitly to close the connection (i.e. sending a
FIN packet back).
@@ -1006,6 +1007,12 @@ Set the encoding for the socket as a [Readable Stream][]. See
### `socket.setKeepAlive([enable][, initialDelay])`
* `enable` {boolean} **Default:** `false`
@@ -1020,6 +1027,12 @@ data packet received and the first keepalive probe. Setting `0` for
`initialDelay` will leave the value unchanged from the default
(or previous) setting.
+Enabling the keep-alive functionality will set the following socket options:
+* `SO_KEEPALIVE=1`
+* `TCP_KEEPIDLE=initialDelay`
+* `TCP_KEEPCNT=10`
+* `TCP_KEEPINTVL=1`
+
### `socket.setNoDelay([noDelay])`
* `options` {Object}
- * `allowHalfOpen` {boolean} Indicates whether half-opened TCP
- connections are allowed. **Default:** `false`.
+ * `allowHalfOpen` {boolean} If set to `false`, then the socket will
+ automatically end the writable side when the readable side ends.
+ **Default:** `false`.
* `pauseOnConnect` {boolean} Indicates whether the socket should be
paused on incoming connections. **Default:** `false`.
* `connectionListener` {Function} Automatically set as a listener for the
@@ -1306,10 +1320,12 @@ added: v0.5.0
Creates a new TCP or [IPC][] server.
If `allowHalfOpen` is set to `true`, when the other end of the socket
-sends a FIN packet, the server will only send a FIN packet back when
-[`socket.end()`][] is explicitly called, until then the connection is
-half-closed (non-readable but still writable). See [`'end'`][] event
-and [RFC 1122][half-closed] (section 4.2.2.13) for more information.
+signals the end of transmission, the server will only send back the end of
+transmission when [`socket.end()`][] is explicitly called. For example, in the
+context of TCP, when a FIN packed is received, a FIN packed is sent
+back only when [`socket.end()`][] is explicitly called. Until then the
+connection is half-closed (non-readable but still writable). See [`'end'`][]
+event and [RFC 1122][half-closed] (section 4.2.2.13) for more information.
If `pauseOnConnect` is set to `true`, then the socket associated with each
incoming connection will be paused, and no data will be read from its handle.
diff --git a/doc/api/os.md b/doc/api/os.md
index 6e84a322207a57..f3d3f2d65249a4 100644
--- a/doc/api/os.md
+++ b/doc/api/os.md
@@ -368,18 +368,6 @@ changes:
Returns the system uptime in number of seconds.
-The value returned can be inaccurate in some
-rare virtualization cases. The issue arises when the virtualized
-guest instance shares the kernel with the host system.
-Due to the fact that libuv uses a syscall that
-provides host's uptime instead of guest's
-uptime on OpenVZ, `os.uptime()` may also provide
-erroneous result.
-
-Please refer to and
- for an exploration of
-this issue, until it is resolved by libuv.
-
## `os.userInfo([options])`
For packages with a small number of exports or imports, we recommend
@@ -428,7 +428,7 @@ The benefit of patterns over folder exports is that packages can always be
imported by consumers without subpath file extensions being necessary.
### Exports sugar
-
@@ -455,7 +455,7 @@ can be written:
```
### Conditional exports
-
* Type: {Object}
diff --git a/doc/api/path.md b/doc/api/path.md
index ca62e2f3628bfe..839c45da906677 100644
--- a/doc/api/path.md
+++ b/doc/api/path.md
@@ -203,7 +203,7 @@ A [`TypeError`][] is thrown if `path` is not a string.
added: v0.11.15
-->
-* `pathObject` {Object}
+* `pathObject` {Object} Any JavaScript object having the following properties:
* `dir` {string}
* `root` {string}
* `base` {string}
diff --git a/doc/api/perf_hooks.md b/doc/api/perf_hooks.md
index 11795b98dc71fa..80a3c46f36a281 100644
--- a/doc/api/perf_hooks.md
+++ b/doc/api/perf_hooks.md
@@ -261,6 +261,14 @@ If the wrapped function returns a promise, a finally handler will be attached
to the promise and the duration will be reported once the finally handler is
invoked.
+### `performance.toJSON()`
+
+
+An object which is JSON representation of the `performance` object. It
+is similar to [`window.performance.toJSON`][] in browsers.
+
## Class: `PerformanceEntry`
+> Stability: 3 - Legacy. Use [`process.hrtime.bigint()`][] instead.
+
* `time` {integer[]} The result of a previous call to `process.hrtime()`
* Returns: {integer[]}
diff --git a/doc/api/querystring.md b/doc/api/querystring.md
index 2b8755df413914..4b7db7afc3b948 100644
--- a/doc/api/querystring.md
+++ b/doc/api/querystring.md
@@ -2,7 +2,7 @@
-> Stability: 2 - Stable
+> Stability: 3 - Legacy
@@ -15,6 +15,9 @@ query strings. It can be accessed using:
const querystring = require('querystring');
```
+The `querystring` API is considered Legacy. While it is still maintained,
+new code should use the {URLSearchParams} API instead.
+
## `querystring.decode()`
-* `keys` {Buffer} A 48-byte buffer containing the session ticket keys.
+* `keys` {Buffer|TypedArray|DataView} A 48-byte buffer containing the session
+ ticket keys.
Sets the session ticket keys.
@@ -849,6 +850,9 @@ determine if the server certificate was signed by one of the specified CAs. If
`tlsSocket.alpnProtocol` property can be checked to determine the negotiated
protocol.
+The `'secureConnect'` event is not emitted when a {tls.TLSSocket} is created
+using the `new tls.TLSSocket()` constructor.
+
### Event: `'session'`
@@ -666,7 +666,7 @@ Depending on how a `Buffer` instance was created, it may or may
not own its underlying `ArrayBuffer`. An `ArrayBuffer` must not
be transferred unless it is known that the `Buffer` instance
owns it. In particular, for `Buffer`s created from the internal
-`Buffer` pool (using, for instance `Buffer.from()` or `Buffer.alloc()`),
+`Buffer` pool (using, for instance `Buffer.from()` or `Buffer.allocUnsafe()`),
transferring them is not possible and they are always cloned,
which sends a copy of the entire `Buffer` pool.
This behavior may come with unintended higher memory
diff --git a/doc/changelogs/CHANGELOG_V16.md b/doc/changelogs/CHANGELOG_V16.md
index a198d504fe49ed..08ce83663289d5 100644
--- a/doc/changelogs/CHANGELOG_V16.md
+++ b/doc/changelogs/CHANGELOG_V16.md
@@ -10,6 +10,7 @@
+16.1.0 16.0.0
@@ -33,6 +34,125 @@
* [io.js](CHANGELOG_IOJS.md)
* [Archive](CHANGELOG_ARCHIVE.md)
+2 .
The [`git-node`][] tool can be used to simplify this task. Run
`git node v8 backport ` to cherry-pick a commit.
@@ -414,6 +414,11 @@ This would require some tooling to:
1 Node.js 0.12 and older are intentionally omitted from this document
as their support has ended.
+2 The V8 tests still require Python 2. To run these tests locally,
+you can run `PYTHON2 ./configure.py` before running `make test-v8`, in the root
+of this repository. On macOS, this also requires a full Xcode install,
+not just the "command line tools" for Xcode.
+
[ChromiumReleaseCalendar]: https://www.chromium.org/developers/calendar
[Node.js CI]: https://ci.nodejs.org/job/node-test-pull-request/
[Node.js `canary` branch]: https://github.com/nodejs/node-v8/tree/canary
diff --git a/doc/guides/releases.md b/doc/guides/releases.md
index 2309460e3d1b3a..eac14469a09a2f 100644
--- a/doc/guides/releases.md
+++ b/doc/guides/releases.md
@@ -896,9 +896,20 @@ test, or doc-related are to be listed as notable changes. Some SEMVER-MINOR
commits may be listed as notable changes on a case-by-case basis. Use your
judgment there.
+### Snap
+
+The Node.js [Snap][] package has a "default" for installs where the user hasn't
+specified a release line ("track" in Snap terminology). This should be updated
+to point to the most recently activated LTS. A member of the Node.js Build
+Infrastructure team is able to perform the switch of the default. An issue
+should be opened on the [Node.js Snap management repository][] requesting this
+take place once a new LTS line has been released.
+
[Build issue tracker]: https://github.com/nodejs/build/issues/new
[CI lockdown procedure]: https://github.com/nodejs/build/blob/HEAD/doc/jenkins-guide.md#restricting-access-for-security-releases
+[Node.js Snap management repository]: https://github.com/nodejs/snap
[Partner Communities]: https://github.com/nodejs/community-committee/blob/HEAD/governance/PARTNER_COMMUNITIES.md
+[Snap]: https://snapcraft.io/node
[nodejs.org release-post.js script]: https://github.com/nodejs/nodejs.org/blob/HEAD/scripts/release-post.js
[nodejs.org repository]: https://github.com/nodejs/nodejs.org
[webchat.freenode.net]: https://webchat.freenode.net/
diff --git a/doc/guides/security-release-process.md b/doc/guides/security-release-process.md
index 5609e40739d3fb..10465c57501328 100644
--- a/doc/guides/security-release-process.md
+++ b/doc/guides/security-release-process.md
@@ -38,6 +38,12 @@ information described.
* Described in the pre/post announcements
* [ ] Pre-release announcement [email][]: ***LINK TO EMAIL***
+ ```text
+ Security updates for all active release lines, Month Year
+
+ The Node.js project will release new versions of all supported release lines on or shortly after Day of week, Month Day of Month, Year
+ For more information see: https://nodejs.org/en/blog/vulnerability/month-year-security-releases/
+ ```
(Get access from existing manager: Ben Noordhuis, Rod Vagg, Michael Dawson)
* [ ] Pre-release announcement to nodejs.org blog: ***LINK TO BLOG***
@@ -64,6 +70,12 @@ information described.
* [ ] [Unlock CI](https://github.com/nodejs/build/blob/HEAD/doc/jenkins-guide.md#after-the-release)
* [ ] Post-release announcement in reply [email][]: ***LINK TO EMAIL***
+ ```text
+ Security updates for all active release lines, Month Year
+
+ The Node.js project has now released new versions of all supported release lines.
+ For more information see: https://nodejs.org/en/blog/vulnerability/month-year-security-releases/
+ ```
* [ ] Post-release announcement to Nodejs.org blog: ***LINK TO BLOG POST***
* (Re-PR the pre-approved branch from nodejs-private/nodejs.org-private to
diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml
index 9a0450449fbad2..38ca7683247b8c 100644
--- a/lib/.eslintrc.yaml
+++ b/lib/.eslintrc.yaml
@@ -27,16 +27,65 @@ rules:
message: "Use 'overrideStackTrace' from 'lib/internal/errors.js' instead of 'Error.prepareStackTrace'."
no-restricted-globals:
- error
- - name: globalThis
- message: "Use `const { globalThis } = primordials;` instead of the global."
+ - name: AbortController
+ message: "Use `const { AbortController } = require('internal/abort_controller');` instead of the global."
+ - name: AbortSignal
+ message: "Use `const { AbortSignal } = require('internal/abort_controller');` instead of the global."
+ # Atomics is not available in primordials because it can be
+ # disabled with --no-harmony-atomics CLI flag.
+ - name: Atomics
+ message: "Use `const { Atomics } = globalThis;` instead of the global."
+ - name: Buffer
+ message: "Use `const { Buffer } = require('buffer');` instead of the global."
+ - name: Event
+ message: "Use `const { Event } = require('internal/event_target');` instead of the global."
+ - name: EventTarget
+ message: "Use `const { EventTarget } = require('internal/event_target');` instead of the global."
+ # Intl is not available in primordials because it can be
+ # disabled with --without-intl build flag.
+ - name: Intl
+ message: "Use `const { Intl } = globalThis;` instead of the global."
+ - name: MessageChannel
+ message: "Use `const { MessageChannel } = require('internal/worker/io');` instead of the global."
+ - name: MessageEvent
+ message: "Use `const { MessageEvent } = require('internal/worker/io');` instead of the global."
+ - name: MessagePort
+ message: "Use `const { MessagePort } = require('internal/worker/io');` instead of the global."
+ # SharedArrayBuffer is not available in primordials because it can be
+ # disabled with --no-harmony-sharedarraybuffer CLI flag.
+ - name: SharedArrayBuffer
+ message: "Use `const { SharedArrayBuffer } = globalThis;` instead of the global."
+ - name: TextDecoder
+ message: "Use `const { TextDecoder } = require('internal/encoding');` instead of the global."
+ - name: TextEncoder
+ message: "Use `const { TextEncoder } = require('internal/encoding');` instead of the global."
+ - name: URL
+ message: "Use `const { URL } = require('internal/url');` instead of the global."
+ - name: URLSearchParams
+ message: "Use `const { URLSearchParams } = require('internal/url');` instead of the global."
+ # WebAssembly is not available in primordials because it can be
+ # disabled with --jitless CLI flag.
+ - name: WebAssembly
+ message: "Use `const { WebAssembly } = globalThis;` instead of the global."
+ - name: atob
+ message: "Use `const { atob } = require('buffer');` instead of the global."
+ - name: btoa
+ message: "Use `const { btoa } = require('buffer');` instead of the global."
- name: global
message: "Use `const { globalThis } = primordials;` instead of `global`."
+ - name: globalThis
+ message: "Use `const { globalThis } = primordials;` instead of the global."
+ - name: performance
+ message: "Use `const { performance } = require('perf_hooks');` instead of the global."
+ - name: queueMicrotask
+ message: "Use `const { queueMicrotask } = require('internal/process/task_queues');` instead of the global."
# Custom rules in tools/eslint-rules
node-core/lowercase-name-for-primitive: error
node-core/non-ascii-character: error
node-core/no-array-destructuring: error
node-core/prefer-primordials:
- error
+ - name: AggregateError
- name: Array
- name: ArrayBuffer
- name: BigInt
@@ -76,6 +125,7 @@ rules:
into: Number
- name: parseInt
into: Number
+ - name: Proxy
- name: Promise
- name: RangeError
- name: ReferenceError
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index 9ecd92021de17f..66ebc7b77869f7 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -86,9 +86,10 @@ const {
const {
validateBuffer,
validateCallback,
+ validateInt32,
validateObject,
validateString,
- validateUint32
+ validateUint32,
} = require('internal/validators');
const {
InternalX509Certificate
@@ -893,6 +894,7 @@ TLSSocket.prototype.exportKeyingMaterial = function(length, label, context) {
};
TLSSocket.prototype.setMaxSendFragment = function setMaxSendFragment(size) {
+ validateInt32(size, 'size');
return this._handle.setMaxSendFragment(size) === 1;
};
@@ -1394,6 +1396,9 @@ Server.prototype.getTicketKeys = function getTicketKeys() {
Server.prototype.setTicketKeys = function setTicketKeys(keys) {
+ validateBuffer(keys);
+ assert(keys.byteLength === 48,
+ 'Session ticket keys must be a 48-byte buffer');
this._sharedCreds.context.setTicketKeys(keys);
};
diff --git a/lib/fs.js b/lib/fs.js
index e6cf8527e8720d..310397bbed39e1 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -207,6 +207,14 @@ function isFileType(stats, fileType) {
return (mode & S_IFMT) === fileType;
}
+/**
+ * Tests a user's permissions for the file or directory
+ * specified by `path`.
+ * @param {string | Buffer | URL} path
+ * @param {number} [mode]
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function access(path, mode, callback) {
if (typeof mode === 'function') {
callback = mode;
@@ -222,6 +230,13 @@ function access(path, mode, callback) {
binding.access(pathModule.toNamespacedPath(path), mode, req);
}
+/**
+ * Synchronously tests a user's permissions for the file or
+ * directory specified by `path`.
+ * @param {string | Buffer | URL} path
+ * @param {number} [mode]
+ * @returns {void | never}
+ */
function accessSync(path, mode) {
path = getValidatedPath(path);
mode = getValidMode(mode, 'access');
@@ -231,6 +246,12 @@ function accessSync(path, mode) {
handleErrorFromBinding(ctx);
}
+/**
+ * Tests whether or not the given path exists.
+ * @param {string | Buffer | URL} path
+ * @param {(exists?: boolean) => any} callback
+ * @returns {void}
+ */
function exists(path, callback) {
maybeCallback(callback);
@@ -257,6 +278,11 @@ ObjectDefineProperty(exists, internalUtil.promisify.custom, {
// fs.existsSync(), would only get a false in return, so we cannot signal
// validation errors to users properly out of compatibility concerns.
// TODO(joyeecheung): deprecate the never-throw-on-invalid-arguments behavior
+/**
+ * Synchronously tests whether or not the given path exists.
+ * @param {string | Buffer | URL} path
+ * @returns {boolean}
+ */
function existsSync(path) {
try {
path = getValidatedPath(path);
@@ -326,6 +352,20 @@ function checkAborted(signal, callback) {
return false;
}
+/**
+ * Asynchronously reads the entire contents of a file.
+ * @param {string | Buffer | URL | number} path
+ * @param {{
+ * encoding?: string | null;
+ * flag?: string;
+ * signal?: AbortSignal;
+ * } | string} [options]
+ * @param {(
+ * err?: Error,
+ * data?: string | Buffer
+ * ) => any} callback
+ * @returns {void}
+ */
function readFile(path, options, callback) {
callback = maybeCallback(callback || options);
options = getOptions(options, { flag: 'r' });
@@ -396,6 +436,15 @@ function tryReadSync(fd, isUserFd, buffer, pos, len) {
return bytesRead;
}
+/**
+ * Synchronously reads the entire contents of a file.
+ * @param {string | Buffer | URL | number} path
+ * @param {{
+ * encoding?: string | null;
+ * flag?: string;
+ * }} [options]
+ * @returns {string | Buffer}
+ */
function readFileSync(path, options) {
options = getOptions(options, { flag: 'r' });
const isUserFd = isFd(path); // File descriptor ownership
@@ -451,6 +500,12 @@ function defaultCloseCallback(err) {
if (err != null) throw err;
}
+/**
+ * Closes the file descriptor.
+ * @param {number} fd
+ * @param {(err?: Error) => any} [callback]
+ * @returns {void}
+ */
function close(fd, callback = defaultCloseCallback) {
fd = getValidatedFd(fd);
if (callback !== defaultCloseCallback)
@@ -461,6 +516,11 @@ function close(fd, callback = defaultCloseCallback) {
binding.close(fd, req);
}
+/**
+ * Synchronously closes the file descriptor.
+ * @param {number} fd
+ * @returns {void}
+ */
function closeSync(fd) {
fd = getValidatedFd(fd);
@@ -469,6 +529,17 @@ function closeSync(fd) {
handleErrorFromBinding(ctx);
}
+/**
+ * Asynchronously opens a file.
+ * @param {string | Buffer | URL} path
+ * @param {string | number} [flags]
+ * @param {string | number} [mode]
+ * @param {(
+ * err?: Error,
+ * fd?: number
+ * ) => any} callback
+ * @returns {void}
+ */
function open(path, flags, mode, callback) {
path = getValidatedPath(path);
if (arguments.length < 3) {
@@ -493,7 +564,13 @@ function open(path, flags, mode, callback) {
req);
}
-
+/**
+ * Synchronously opens a file.
+ * @param {string | Buffer | URL} path
+ * @param {string | number} [flags]
+ * @param {string | number} [mode]
+ * @returns {number}
+ */
function openSync(path, flags, mode) {
path = getValidatedPath(path);
const flagsNumber = stringToFlags(flags);
@@ -507,10 +584,20 @@ function openSync(path, flags, mode) {
return result;
}
-// usage:
-// fs.read(fd, buffer, offset, length, position, callback);
-// OR
-// fs.read(fd, {}, callback)
+/**
+ * Reads file from the specified `fd` (file descriptor).
+ * @param {number} fd
+ * @param {Buffer | TypedArray | DataView} buffer
+ * @param {number} offset
+ * @param {number} length
+ * @param {number | bigint} position
+ * @param {(
+ * err?: Error,
+ * bytesRead?: number,
+ * buffer?: Buffer
+ * ) => any} callback
+ * @returns {void}
+ */
function read(fd, buffer, offset, length, position, callback) {
fd = getValidatedFd(fd);
@@ -543,7 +630,7 @@ function read(fd, buffer, offset, length, position, callback) {
if (offset == null) {
offset = 0;
} else {
- validateInteger(offset, 'offset');
+ validateInteger(offset, 'offset', 0);
}
length |= 0;
@@ -580,10 +667,18 @@ function read(fd, buffer, offset, length, position, callback) {
ObjectDefineProperty(read, internalUtil.customPromisifyArgs,
{ value: ['bytesRead', 'buffer'], enumerable: false });
-// usage:
-// fs.readSync(fd, buffer, offset, length, position);
-// OR
-// fs.readSync(fd, buffer, {}) or fs.readSync(fd, buffer)
+/**
+ * Synchronously reads the file from the
+ * specified `fd` (file descriptor).
+ * @param {number} fd
+ * @param {Buffer | TypedArray | DataView} buffer
+ * @param {{
+ * offset?: number;
+ * length?: number;
+ * position?: number | bigint;
+ * }} [offset]
+ * @returns {number}
+ */
function readSync(fd, buffer, offset, length, position) {
fd = getValidatedFd(fd);
@@ -599,7 +694,7 @@ function readSync(fd, buffer, offset, length, position) {
if (offset == null) {
offset = 0;
} else {
- validateInteger(offset, 'offset');
+ validateInteger(offset, 'offset', 0);
}
length |= 0;
@@ -627,6 +722,19 @@ function readSync(fd, buffer, offset, length, position) {
return result;
}
+/**
+ * Reads file from the specified `fd` (file descriptor)
+ * and writes to an array of `ArrayBufferView`s.
+ * @param {number} fd
+ * @param {ArrayBufferView[]} buffers
+ * @param {number} [position]
+ * @param {(
+ * err?: Error,
+ * bytesRead?: number,
+ * buffers?: ArrayBufferView[];
+ * ) => any} callback
+ * @returns {void}
+ */
function readv(fd, buffers, position, callback) {
function wrapper(err, read) {
callback(err, read || 0, buffers);
@@ -648,6 +756,15 @@ function readv(fd, buffers, position, callback) {
ObjectDefineProperty(readv, internalUtil.customPromisifyArgs,
{ value: ['bytesRead', 'buffers'], enumerable: false });
+/**
+ * Synchronously reads file from the
+ * specified `fd` (file descriptor) and writes to an array
+ * of `ArrayBufferView`s.
+ * @param {number} fd
+ * @param {ArrayBufferView[]} buffers
+ * @param {number} [position]
+ * @returns {number}
+ */
function readvSync(fd, buffers, position) {
fd = getValidatedFd(fd);
validateBufferArray(buffers);
@@ -662,10 +779,20 @@ function readvSync(fd, buffers, position) {
return result;
}
-// usage:
-// fs.write(fd, buffer[, offset[, length[, position]]], callback);
-// OR
-// fs.write(fd, string[, position[, encoding]], callback);
+/**
+ * Writes `buffer` to the specified `fd` (file descriptor).
+ * @param {number} fd
+ * @param {Buffer | TypedArray | DataView | string | Object} buffer
+ * @param {number} [offset]
+ * @param {number} [length]
+ * @param {number} [position]
+ * @param {(
+ * err?: Error,
+ * bytesWritten?: number;
+ * buffer?: Buffer | TypedArray | DataView
+ * ) => any} callback
+ * @returns {void}
+ */
function write(fd, buffer, offset, length, position, callback) {
function wrapper(err, written) {
// Retain a reference to buffer so that it can't be GC'ed too soon.
@@ -679,7 +806,7 @@ function write(fd, buffer, offset, length, position, callback) {
if (offset == null || typeof offset === 'function') {
offset = 0;
} else {
- validateInteger(offset, 'offset');
+ validateInteger(offset, 'offset', 0);
}
if (typeof length !== 'number')
length = buffer.byteLength - offset;
@@ -716,10 +843,16 @@ function write(fd, buffer, offset, length, position, callback) {
ObjectDefineProperty(write, internalUtil.customPromisifyArgs,
{ value: ['bytesWritten', 'buffer'], enumerable: false });
-// Usage:
-// fs.writeSync(fd, buffer[, offset[, length[, position]]]);
-// OR
-// fs.writeSync(fd, string[, position[, encoding]]);
+/**
+ * Synchronously writes `buffer` to the
+ * specified `fd` (file descriptor).
+ * @param {number} fd
+ * @param {Buffer | TypedArray | DataView | string | Object} buffer
+ * @param {number} [offset]
+ * @param {number} [length]
+ * @param {number} [position]
+ * @returns {number}
+ */
function writeSync(fd, buffer, offset, length, position) {
fd = getValidatedFd(fd);
const ctx = {};
@@ -730,7 +863,7 @@ function writeSync(fd, buffer, offset, length, position) {
if (offset == null) {
offset = 0;
} else {
- validateInteger(offset, 'offset');
+ validateInteger(offset, 'offset', 0);
}
if (typeof length !== 'number')
length = buffer.byteLength - offset;
@@ -750,8 +883,19 @@ function writeSync(fd, buffer, offset, length, position) {
return result;
}
-// usage:
-// fs.writev(fd, buffers[, position], callback);
+/**
+ * Writes an array of `ArrayBufferView`s to the
+ * specified `fd` (file descriptor).
+ * @param {number} fd
+ * @param {ArrayBufferView[]} buffers
+ * @param {number} [position]
+ * @param {(
+ * err?: Error,
+ * bytesWritten?: number,
+ * buffers?: ArrayBufferView[]
+ * ) => any} callback
+ * @returns {void}
+ */
function writev(fd, buffers, position, callback) {
function wrapper(err, written) {
callback(err, written || 0, buffers);
@@ -775,6 +919,14 @@ ObjectDefineProperty(writev, internalUtil.customPromisifyArgs, {
enumerable: false
});
+/**
+ * Synchronously writes an array of `ArrayBufferView`s
+ * to the specified `fd` (file descriptor).
+ * @param {number} fd
+ * @param {ArrayBufferView[]} buffers
+ * @param {number} [position]
+ * @returns {number}
+ */
function writevSync(fd, buffers, position) {
fd = getValidatedFd(fd);
validateBufferArray(buffers);
@@ -790,6 +942,14 @@ function writevSync(fd, buffers, position) {
return result;
}
+/**
+ * Asynchronously renames file at `oldPath` to
+ * the pathname provided as `newPath`.
+ * @param {string | Buffer | URL} oldPath
+ * @param {string | Buffer | URL} newPath
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function rename(oldPath, newPath, callback) {
callback = makeCallback(callback);
oldPath = getValidatedPath(oldPath, 'oldPath');
@@ -801,6 +961,14 @@ function rename(oldPath, newPath, callback) {
req);
}
+
+/**
+ * Synchronously renames file at `oldPath` to
+ * the pathname provided as `newPath`.
+ * @param {string | Buffer | URL} oldPath
+ * @param {string | Buffer | URL} newPath
+ * @returns {void}
+ */
function renameSync(oldPath, newPath) {
oldPath = getValidatedPath(oldPath, 'oldPath');
newPath = getValidatedPath(newPath, 'newPath');
@@ -810,6 +978,13 @@ function renameSync(oldPath, newPath) {
handleErrorFromBinding(ctx);
}
+/**
+ * Truncates the file.
+ * @param {string | Buffer | URL} path
+ * @param {number} [len]
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function truncate(path, len, callback) {
if (typeof path === 'number') {
showTruncateDeprecation();
@@ -837,6 +1012,12 @@ function truncate(path, len, callback) {
});
}
+/**
+ * Synchronously truncates the file.
+ * @param {string | Buffer | URL} path
+ * @param {number} [len]
+ * @returns {void}
+ */
function truncateSync(path, len) {
if (typeof path === 'number') {
// legacy
@@ -858,6 +1039,13 @@ function truncateSync(path, len) {
return ret;
}
+/**
+ * Truncates the file descriptor.
+ * @param {number} fd
+ * @param {number} [len]
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function ftruncate(fd, len = 0, callback) {
if (typeof len === 'function') {
callback = len;
@@ -873,6 +1061,12 @@ function ftruncate(fd, len = 0, callback) {
binding.ftruncate(fd, len, req);
}
+/**
+ * Synchronously truncates the file descriptor.
+ * @param {number} fd
+ * @param {number} [len]
+ * @returns {void}
+ */
function ftruncateSync(fd, len = 0) {
fd = getValidatedFd(fd);
validateInteger(len, 'len');
@@ -888,6 +1082,17 @@ function lazyLoadRimraf() {
({ rimraf, rimrafSync } = require('internal/fs/rimraf'));
}
+/**
+ * Asynchronously removes a directory.
+ * @param {string | Buffer | URL} path
+ * @param {{
+ * maxRetries?: number;
+ * recursive?: boolean;
+ * retryDelay?: number;
+ * }} [options]
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function rmdir(path, options, callback) {
if (typeof options === 'function') {
callback = options;
@@ -924,6 +1129,16 @@ function rmdir(path, options, callback) {
}
}
+/**
+ * Synchronously removes a directory.
+ * @param {string | Buffer | URL} path
+ * @param {{
+ * maxRetries?: number;
+ * recursive?: boolean;
+ * retryDelay?: number;
+ * }} [options]
+ * @returns {void}
+ */
function rmdirSync(path, options) {
path = getValidatedPath(path);
@@ -943,6 +1158,19 @@ function rmdirSync(path, options) {
return handleErrorFromBinding(ctx);
}
+/**
+ * Asynchronously removes files and
+ * directories (modeled on the standard POSIX `rm` utility).
+ * @param {string | Buffer | URL} path
+ * @param {{
+ * force?: boolean;
+ * maxRetries?: number;
+ * recursive?: boolean;
+ * retryDelay?: number;
+ * }} [options]
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function rm(path, options, callback) {
if (typeof options === 'function') {
callback = options;
@@ -958,6 +1186,18 @@ function rm(path, options, callback) {
});
}
+/**
+ * Synchronously removes files and
+ * directories (modeled on the standard POSIX `rm` utility).
+ * @param {string | Buffer | URL} path
+ * @param {{
+ * force?: boolean;
+ * maxRetries?: number;
+ * recursive?: boolean;
+ * retryDelay?: number;
+ * }} [options]
+ * @returns {void}
+ */
function rmSync(path, options) {
options = validateRmOptionsSync(path, options, false);
@@ -965,6 +1205,14 @@ function rmSync(path, options) {
return rimrafSync(pathModule.toNamespacedPath(path), options);
}
+/**
+ * Forces all currently queued I/O operations associated
+ * with the file to the operating system's synchronized
+ * I/O completion state.
+ * @param {number} fd
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function fdatasync(fd, callback) {
fd = getValidatedFd(fd);
const req = new FSReqCallback();
@@ -972,6 +1220,13 @@ function fdatasync(fd, callback) {
binding.fdatasync(fd, req);
}
+/**
+ * Synchronously forces all currently queued I/O operations
+ * associated with the file to the operating
+ * system's synchronized I/O completion state.
+ * @param {number} fd
+ * @returns {void}
+ */
function fdatasyncSync(fd) {
fd = getValidatedFd(fd);
const ctx = {};
@@ -979,6 +1234,13 @@ function fdatasyncSync(fd) {
handleErrorFromBinding(ctx);
}
+/**
+ * Requests for all data for the open file descriptor
+ * to be flushed to the storage device.
+ * @param {number} fd
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function fsync(fd, callback) {
fd = getValidatedFd(fd);
const req = new FSReqCallback();
@@ -986,6 +1248,12 @@ function fsync(fd, callback) {
binding.fsync(fd, req);
}
+/**
+ * Synchronously requests for all data for the open
+ * file descriptor to be flushed to the storage device.
+ * @param {number} fd
+ * @returns {void}
+ */
function fsyncSync(fd) {
fd = getValidatedFd(fd);
const ctx = {};
@@ -993,6 +1261,16 @@ function fsyncSync(fd) {
handleErrorFromBinding(ctx);
}
+/**
+ * Asynchronously creates a directory.
+ * @param {string | Buffer | URL} path
+ * @param {{
+ * recursive?: boolean;
+ * mode?: string | number;
+ * } | number} [options]
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function mkdir(path, options, callback) {
let mode = 0o777;
let recursive = false;
@@ -1017,6 +1295,15 @@ function mkdir(path, options, callback) {
parseFileMode(mode, 'mode'), recursive, req);
}
+/**
+ * Synchronously creates a directory.
+ * @param {string | Buffer | URL} path
+ * @param {{
+ * recursive?: boolean;
+ * mode?: string | number;
+ * } | number} [options]
+ * @returns {string | void}
+ */
function mkdirSync(path, options) {
let mode = 0o777;
let recursive = false;
@@ -1041,6 +1328,19 @@ function mkdirSync(path, options) {
}
}
+/**
+ * Reads the contents of a directory.
+ * @param {string | Buffer | URL} path
+ * @param {string | {
+ * encoding?: string;
+ * withFileTypes?: boolean;
+ * }} [options]
+ * @param {(
+ * err?: Error,
+ * files?: string[] | Buffer[] | Direct[];
+ * ) => any} callback
+ * @returns {void}
+ */
function readdir(path, options, callback) {
callback = makeCallback(typeof options === 'function' ? options : callback);
options = getOptions(options, {});
@@ -1062,6 +1362,15 @@ function readdir(path, options, callback) {
!!options.withFileTypes, req);
}
+/**
+ * Synchronously reads the contents of a directory.
+ * @param {string | Buffer | URL} path
+ * @param {string | {
+ * encoding?: string;
+ * withFileTypes?: boolean;
+ * }} [options]
+ * @returns {string | Buffer[] | Dirent[]}
+ */
function readdirSync(path, options) {
options = getOptions(options, {});
path = getValidatedPath(path);
@@ -1073,6 +1382,17 @@ function readdirSync(path, options) {
return options.withFileTypes ? getDirents(path, result) : result;
}
+/**
+ * Invokes the callback with the `fs.Stats`
+ * for the file descriptor.
+ * @param {number} fd
+ * @param {{ bigint?: boolean; }} [options]
+ * @param {(
+ * err?: Error,
+ * stats?: Stats
+ * ) => any} callback
+ * @returns {void}
+ */
function fstat(fd, options = { bigint: false }, callback) {
if (typeof options === 'function') {
callback = options;
@@ -1086,6 +1406,17 @@ function fstat(fd, options = { bigint: false }, callback) {
binding.fstat(fd, options.bigint, req);
}
+/**
+ * Retrieves the `fs.Stats` for the symbolic link
+ * referred to by the `path`.
+ * @param {string | Buffer | URL} path
+ * @param {{ bigint?: boolean; }} [options]
+ * @param {(
+ * err?: Error,
+ * stats?: Stats
+ * ) => any} callback
+ * @returns {void}
+ */
function lstat(path, options = { bigint: false }, callback) {
if (typeof options === 'function') {
callback = options;
@@ -1099,6 +1430,16 @@ function lstat(path, options = { bigint: false }, callback) {
binding.lstat(pathModule.toNamespacedPath(path), options.bigint, req);
}
+/**
+ * Asynchronously gets the stats of a file.
+ * @param {string | Buffer | URL} path
+ * @param {{ bigint?: boolean; }} [options]
+ * @param {(
+ * err?: Error,
+ * stats?: Stats
+ * ) => any} callback
+ * @returns {void}
+ */
function stat(path, options = { bigint: false }, callback) {
if (typeof options === 'function') {
callback = options;
@@ -1125,6 +1466,16 @@ function hasNoEntryError(ctx) {
return false;
}
+/**
+ * Synchronously retrieves the `fs.Stats` for
+ * the file descriptor.
+ * @param {number} fd
+ * @param {{
+ * bigint?: boolean;
+ * throwIfNoEntry?: boolean;
+ * }} [options]
+ * @returns {Stats}
+ */
function fstatSync(fd, options = { bigint: false, throwIfNoEntry: true }) {
fd = getValidatedFd(fd);
const ctx = { fd };
@@ -1133,6 +1484,16 @@ function fstatSync(fd, options = { bigint: false, throwIfNoEntry: true }) {
return getStatsFromBinding(stats);
}
+/**
+ * Synchronously retrieves the `fs.Stats` for
+ * the symbolic link referred to by the `path`.
+ * @param {string | Buffer | URL} path
+ * @param {{
+ * bigint?: boolean;
+ * throwIfNoEntry?: boolean;
+ * }} [options]
+ * @returns {Stats}
+ */
function lstatSync(path, options = { bigint: false, throwIfNoEntry: true }) {
path = getValidatedPath(path);
const ctx = { path };
@@ -1145,6 +1506,16 @@ function lstatSync(path, options = { bigint: false, throwIfNoEntry: true }) {
return getStatsFromBinding(stats);
}
+/**
+ * Synchronously retrieves the `fs.Stats`
+ * for the `path`.
+ * @param {string | Buffer | URL} path
+ * @param {{
+ * bigint?: boolean;
+ * throwIfNoEntry?: boolean;
+ * }} [options]
+ * @returns {Stats}
+ */
function statSync(path, options = { bigint: false, throwIfNoEntry: true }) {
path = getValidatedPath(path);
const ctx = { path };
@@ -1157,6 +1528,17 @@ function statSync(path, options = { bigint: false, throwIfNoEntry: true }) {
return getStatsFromBinding(stats);
}
+/**
+ * Reads the contents of a symbolic link
+ * referred to by `path`.
+ * @param {string | Buffer | URL} path
+ * @param {{ encoding?: string; } | string} [options]
+ * @param {(
+ * err?: Error,
+ * linkString?: string | Buffer
+ * ) => any} callback
+ * @returns {void}
+ */
function readlink(path, options, callback) {
callback = makeCallback(typeof options === 'function' ? options : callback);
options = getOptions(options, {});
@@ -1166,6 +1548,13 @@ function readlink(path, options, callback) {
binding.readlink(pathModule.toNamespacedPath(path), options.encoding, req);
}
+/**
+ * Synchronously reads the contents of a symbolic link
+ * referred to by `path`.
+ * @param {string | Buffer | URL} path
+ * @param {{ encoding?: string; } | string} [options]
+ * @returns {string | Buffer}
+ */
function readlinkSync(path, options) {
options = getOptions(options, {});
path = getValidatedPath(path, 'oldPath');
@@ -1176,6 +1565,14 @@ function readlinkSync(path, options) {
return result;
}
+/**
+ * Creates the link called `path` pointing to `target`.
+ * @param {string | Buffer | URL} target
+ * @param {string | Buffer | URL} path
+ * @param {string} [type_]
+ * @param {(err?: Error) => any} callback_
+ * @returns {void}
+ */
function symlink(target, path, type_, callback_) {
const type = (typeof type_ === 'string' ? type_ : null);
const callback = makeCallback(arguments[arguments.length - 1]);
@@ -1218,6 +1615,14 @@ function symlink(target, path, type_, callback_) {
binding.symlink(destination, pathModule.toNamespacedPath(path), flags, req);
}
+/**
+ * Synchronously creates the link called `path`
+ * pointing to `target`.
+ * @param {string | Buffer | URL} target
+ * @param {string | Buffer | URL} path
+ * @param {string} [type]
+ * @returns {void}
+ */
function symlinkSync(target, path, type) {
type = (typeof type === 'string' ? type : null);
if (isWindows && type === null) {
@@ -1237,6 +1642,14 @@ function symlinkSync(target, path, type) {
handleErrorFromBinding(ctx);
}
+/**
+ * Creates a new link from the `existingPath`
+ * to the `newPath`.
+ * @param {string | Buffer | URL} existingPath
+ * @param {string | Buffer | URL} newPath
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function link(existingPath, newPath, callback) {
callback = makeCallback(callback);
@@ -1251,6 +1664,13 @@ function link(existingPath, newPath, callback) {
req);
}
+/**
+ * Synchronously creates a new link from the `existingPath`
+ * to the `newPath`.
+ * @param {string | Buffer | URL} existingPath
+ * @param {string | Buffer | URL} newPath
+ * @returns {void}
+ */
function linkSync(existingPath, newPath) {
existingPath = getValidatedPath(existingPath, 'existingPath');
newPath = getValidatedPath(newPath, 'newPath');
@@ -1263,6 +1683,12 @@ function linkSync(existingPath, newPath) {
return result;
}
+/**
+ * Asynchronously removes a file or symbolic link.
+ * @param {string | Buffer | URL} path
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function unlink(path, callback) {
callback = makeCallback(callback);
path = getValidatedPath(path);
@@ -1271,6 +1697,11 @@ function unlink(path, callback) {
binding.unlink(pathModule.toNamespacedPath(path), req);
}
+/**
+ * Synchronously removes a file or symbolic link.
+ * @param {string | Buffer | URL} path
+ * @returns {void}
+ */
function unlinkSync(path) {
path = getValidatedPath(path);
const ctx = { path };
@@ -1278,6 +1709,13 @@ function unlinkSync(path) {
handleErrorFromBinding(ctx);
}
+/**
+ * Sets the permissions on the file.
+ * @param {number} fd
+ * @param {string | number} mode
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function fchmod(fd, mode, callback) {
fd = getValidatedFd(fd);
mode = parseFileMode(mode, 'mode');
@@ -1288,6 +1726,12 @@ function fchmod(fd, mode, callback) {
binding.fchmod(fd, mode, req);
}
+/**
+ * Synchronously sets the permissions on the file.
+ * @param {number} fd
+ * @param {string | number} mode
+ * @returns {void}
+ */
function fchmodSync(fd, mode) {
fd = getValidatedFd(fd);
mode = parseFileMode(mode, 'mode');
@@ -1296,6 +1740,13 @@ function fchmodSync(fd, mode) {
handleErrorFromBinding(ctx);
}
+/**
+ * Changes the permissions on a symbolic link.
+ * @param {string | Buffer | URL} path
+ * @param {number} mode
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function lchmod(path, mode, callback) {
callback = maybeCallback(callback);
mode = parseFileMode(mode, 'mode');
@@ -1314,6 +1765,12 @@ function lchmod(path, mode, callback) {
});
}
+/**
+ * Synchronously changes the permissions on a symbolic link.
+ * @param {string | Buffer | URL} path
+ * @param {number} mode
+ * @returns {void}
+ */
function lchmodSync(path, mode) {
const fd = fs.openSync(path, O_WRONLY | O_SYMLINK);
@@ -1328,7 +1785,13 @@ function lchmodSync(path, mode) {
return ret;
}
-
+/**
+ * Asynchronously changes the permissions of a file.
+ * @param {string | Buffer | URL} path
+ * @param {string | number} mode
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function chmod(path, mode, callback) {
path = getValidatedPath(path);
mode = parseFileMode(mode, 'mode');
@@ -1339,6 +1802,12 @@ function chmod(path, mode, callback) {
binding.chmod(pathModule.toNamespacedPath(path), mode, req);
}
+/**
+ * Synchronously changes the permissions of a file.
+ * @param {string | Buffer | URL} path
+ * @param {string | number} mode
+ * @returns {void}
+ */
function chmodSync(path, mode) {
path = getValidatedPath(path);
mode = parseFileMode(mode, 'mode');
@@ -1348,6 +1817,14 @@ function chmodSync(path, mode) {
handleErrorFromBinding(ctx);
}
+/**
+ * Sets the owner of the symbolic link.
+ * @param {string | Buffer | URL} path
+ * @param {number} uid
+ * @param {number} gid
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function lchown(path, uid, gid, callback) {
callback = makeCallback(callback);
path = getValidatedPath(path);
@@ -1358,6 +1835,13 @@ function lchown(path, uid, gid, callback) {
binding.lchown(pathModule.toNamespacedPath(path), uid, gid, req);
}
+/**
+ * Synchronously sets the owner of the symbolic link.
+ * @param {string | Buffer | URL} path
+ * @param {number} uid
+ * @param {number} gid
+ * @returns {void}
+ */
function lchownSync(path, uid, gid) {
path = getValidatedPath(path);
validateInteger(uid, 'uid', -1, kMaxUserId);
@@ -1367,6 +1851,14 @@ function lchownSync(path, uid, gid) {
handleErrorFromBinding(ctx);
}
+/**
+ * Sets the owner of the file.
+ * @param {number} fd
+ * @param {number} uid
+ * @param {number} gid
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function fchown(fd, uid, gid, callback) {
fd = getValidatedFd(fd);
validateInteger(uid, 'uid', -1, kMaxUserId);
@@ -1378,6 +1870,13 @@ function fchown(fd, uid, gid, callback) {
binding.fchown(fd, uid, gid, req);
}
+/**
+ * Synchronously sets the owner of the file.
+ * @param {number} fd
+ * @param {number} uid
+ * @param {number} gid
+ * @returns {void}
+ */
function fchownSync(fd, uid, gid) {
fd = getValidatedFd(fd);
validateInteger(uid, 'uid', -1, kMaxUserId);
@@ -1388,6 +1887,15 @@ function fchownSync(fd, uid, gid) {
handleErrorFromBinding(ctx);
}
+/**
+ * Asynchronously changes the owner and group
+ * of a file.
+ * @param {string | Buffer | URL} path
+ * @param {number} uid
+ * @param {number} gid
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function chown(path, uid, gid, callback) {
callback = makeCallback(callback);
path = getValidatedPath(path);
@@ -1399,6 +1907,14 @@ function chown(path, uid, gid, callback) {
binding.chown(pathModule.toNamespacedPath(path), uid, gid, req);
}
+/**
+ * Synchronously changes the owner and group
+ * of a file.
+ * @param {string | Buffer | URL} path
+ * @param {number} uid
+ * @param {number} gid
+ * @returns {void}
+ */
function chownSync(path, uid, gid) {
path = getValidatedPath(path);
validateInteger(uid, 'uid', -1, kMaxUserId);
@@ -1408,6 +1924,15 @@ function chownSync(path, uid, gid) {
handleErrorFromBinding(ctx);
}
+/**
+ * Changes the file system timestamps of the object
+ * referenced by `path`.
+ * @param {string | Buffer | URL} path
+ * @param {number | string | Date} atime
+ * @param {number | string | Date} mtime
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function utimes(path, atime, mtime, callback) {
callback = makeCallback(callback);
path = getValidatedPath(path);
@@ -1420,6 +1945,14 @@ function utimes(path, atime, mtime, callback) {
req);
}
+/**
+ * Synchronously changes the file system timestamps
+ * of the object referenced by `path`.
+ * @param {string | Buffer | URL} path
+ * @param {number | string | Date} atime
+ * @param {number | string | Date} mtime
+ * @returns {void}
+ */
function utimesSync(path, atime, mtime) {
path = getValidatedPath(path);
const ctx = { path };
@@ -1429,6 +1962,15 @@ function utimesSync(path, atime, mtime) {
handleErrorFromBinding(ctx);
}
+/**
+ * Changes the file system timestamps of the object
+ * referenced by the supplied `fd` (file descriptor).
+ * @param {number} fd
+ * @param {number | string | Date} atime
+ * @param {number | string | Date} mtime
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function futimes(fd, atime, mtime, callback) {
fd = getValidatedFd(fd);
atime = toUnixTimestamp(atime, 'atime');
@@ -1440,6 +1982,15 @@ function futimes(fd, atime, mtime, callback) {
binding.futimes(fd, atime, mtime, req);
}
+/**
+ * Synchronously changes the file system timestamps
+ * of the object referenced by the
+ * supplied `fd` (file descriptor).
+ * @param {number} fd
+ * @param {number | string | Date} atime
+ * @param {number | string | Date} mtime
+ * @returns {void}
+ */
function futimesSync(fd, atime, mtime) {
fd = getValidatedFd(fd);
atime = toUnixTimestamp(atime, 'atime');
@@ -1449,6 +2000,15 @@ function futimesSync(fd, atime, mtime) {
handleErrorFromBinding(ctx);
}
+/**
+ * Changes the access and modification times of
+ * a file in the same way as `fs.utimes()`.
+ * @param {string | Buffer | URL} path
+ * @param {number | string | Date} atime
+ * @param {number | string | Date} mtime
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function lutimes(path, atime, mtime, callback) {
callback = makeCallback(callback);
path = getValidatedPath(path);
@@ -1461,6 +2021,14 @@ function lutimes(path, atime, mtime, callback) {
req);
}
+/**
+ * Synchronously changes the access and modification
+ * times of a file in the same way as `fs.utimesSync()`.
+ * @param {string | Buffer | URL} path
+ * @param {number | string | Date} atime
+ * @param {number | string | Date} mtime
+ * @returns {void}
+ */
function lutimesSync(path, atime, mtime) {
path = getValidatedPath(path);
const ctx = { path };
@@ -1507,6 +2075,19 @@ function writeAll(fd, isUserFd, buffer, offset, length, signal, callback) {
});
}
+/**
+ * Asynchronously writes data to the file.
+ * @param {string | Buffer | URL | number} path
+ * @param {string | Buffer | TypedArray | DataView | Object} data
+ * @param {{
+ * encoding?: string | null;
+ * mode?: number;
+ * flag?: string;
+ * signal?: AbortSignal;
+ * } | string} [options]
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function writeFile(path, data, options, callback) {
callback = maybeCallback(callback || options);
options = getOptions(options, { encoding: 'utf8', mode: 0o666, flag: 'w' });
@@ -1538,6 +2119,17 @@ function writeFile(path, data, options, callback) {
});
}
+/**
+ * Synchronously writes data to the file.
+ * @param {string | Buffer | URL | number} path
+ * @param {string | Buffer | TypedArray | DataView | Object} data
+ * @param {{
+ * encoding?: string | null;
+ * mode?: number;
+ * flag?: string;
+ * } | string} [options]
+ * @returns {void}
+ */
function writeFileSync(path, data, options) {
options = getOptions(options, { encoding: 'utf8', mode: 0o666, flag: 'w' });
@@ -1564,6 +2156,18 @@ function writeFileSync(path, data, options) {
}
}
+/**
+ * Asynchronously appends data to a file.
+ * @param {string | Buffer | URL | number} path
+ * @param {string | Buffer} data
+ * @param {{
+ * encoding?: string | null;
+ * mode?: number;
+ * flag?: string;
+ * } | string} [options]
+ * @param {(err?: Error) => any} callback
+ * @returns {void}
+ */
function appendFile(path, data, options, callback) {
callback = maybeCallback(callback || options);
options = getOptions(options, { encoding: 'utf8', mode: 0o666, flag: 'a' });
@@ -1578,6 +2182,17 @@ function appendFile(path, data, options, callback) {
fs.writeFile(path, data, options, callback);
}
+/**
+ * Synchronously appends data to a file.
+ * @param {string | Buffer | URL | number} path
+ * @param {string | Buffer} data
+ * @param {{
+ * encoding?: string | null;
+ * mode?: number;
+ * flag?: string;
+ * } | string} [options]
+ * @returns {void}
+ */
function appendFileSync(path, data, options) {
options = getOptions(options, { encoding: 'utf8', mode: 0o666, flag: 'a' });
@@ -1591,6 +2206,21 @@ function appendFileSync(path, data, options) {
fs.writeFileSync(path, data, options);
}
+/**
+ * Watches for the changes on `filename`.
+ * @param {string | Buffer | URL} filename
+ * @param {string | {
+ * persistent?: boolean;
+ * recursive?: boolean;
+ * encoding?: string;
+ * signal?: AbortSignal;
+ * }} [options]
+ * @param {(
+ * eventType?: string,
+ * filename?: string | Buffer
+ * ) => any} [listener]
+ * @returns {watchers.FSWatcher}
+ */
function watch(filename, options, listener) {
if (typeof options === 'function') {
listener = options;
@@ -1633,6 +2263,20 @@ function watch(filename, options, listener) {
const statWatchers = new SafeMap();
+/**
+ * Watches for changes on `filename`.
+ * @param {string | Buffer | URL} filename
+ * @param {{
+ * bigint?: boolean;
+ * persistent?: boolean;
+ * interval?: number;
+ * }} [options]
+ * @param {(
+ * current?: Stats,
+ * previous?: Stats
+ * ) => any} listener
+ * @returns {watchers.StatWatcher}
+ */
function watchFile(filename, options, listener) {
filename = getValidatedPath(filename);
filename = pathModule.resolve(filename);
@@ -1671,6 +2315,12 @@ function watchFile(filename, options, listener) {
return stat;
}
+/**
+ * Stops watching for changes on `filename`.
+ * @param {string | Buffer | URL} filename
+ * @param {() => any} [listener]
+ * @returns {void}
+ */
function unwatchFile(filename, listener) {
filename = getValidatedPath(filename);
filename = pathModule.resolve(filename);
@@ -1743,6 +2393,13 @@ if (isWindows) {
}
const emptyObj = ObjectCreate(null);
+
+/**
+ * Returns the resolved pathname.
+ * @param {string | Buffer | URL} p
+ * @param {string | { encoding?: string | null; }} [options]
+ * @returns {string | Buffer}
+ */
function realpathSync(p, options) {
options = getOptions(options, emptyObj);
p = toPathIfFileURL(p);
@@ -1874,7 +2531,12 @@ function realpathSync(p, options) {
return encodeRealpathResult(p, options);
}
-
+/**
+ * Returns the resolved pathname.
+ * @param {string | Buffer | URL} p
+ * @param {string | { encoding?: string; }} [options]
+ * @returns {string | Buffer}
+ */
realpathSync.native = (path, options) => {
options = getOptions(options, {});
path = getValidatedPath(path);
@@ -1884,7 +2546,17 @@ realpathSync.native = (path, options) => {
return result;
};
-
+/**
+ * Asynchronously computes the canonical pathname by
+ * resolving `.`, `..` and symbolic links.
+ * @param {string | Buffer | URL} p
+ * @param {string | { encoding?: string; }} [options]
+ * @param {(
+ * err?: Error,
+ * resolvedPath?: string | Buffer
+ * ) => any} callback
+ * @returns {void}
+ */
function realpath(p, options, callback) {
callback = typeof options === 'function' ? options : maybeCallback(callback);
options = getOptions(options, {});
@@ -2012,7 +2684,17 @@ function realpath(p, options, callback) {
}
}
-
+/**
+ * Asynchronously computes the canonical pathname by
+ * resolving `.`, `..` and symbolic links.
+ * @param {string | Buffer | URL} p
+ * @param {string | { encoding?: string; }} [options]
+ * @param {(
+ * err?: Error,
+ * resolvedPath?: string | Buffer
+ * ) => any} callback
+ * @returns {void}
+ */
realpath.native = (path, options, callback) => {
callback = makeCallback(callback || options);
options = getOptions(options, {});
@@ -2022,6 +2704,16 @@ realpath.native = (path, options, callback) => {
return binding.realpath(path, options.encoding, req);
};
+/**
+ * Creates a unique temporary directory.
+ * @param {string} prefix
+ * @param {string | { encoding?: string; }} [options]
+ * @param {(
+ * err?: Error,
+ * directory?: string
+ * ) => any} callback
+ * @returns {void}
+ */
function mkdtemp(prefix, options, callback) {
callback = makeCallback(typeof options === 'function' ? options : callback);
options = getOptions(options, {});
@@ -2035,7 +2727,12 @@ function mkdtemp(prefix, options, callback) {
binding.mkdtemp(`${prefix}XXXXXX`, options.encoding, req);
}
-
+/**
+ * Synchronously creates a unique temporary directory.
+ * @param {string} prefix
+ * @param {string | { encoding?: string; }} [options]
+ * @returns {string}
+ */
function mkdtempSync(prefix, options) {
options = getOptions(options, {});
if (!prefix || typeof prefix !== 'string') {
@@ -2051,7 +2748,15 @@ function mkdtempSync(prefix, options) {
return result;
}
-
+/**
+ * Asynchronously copies `src` to `dest`. By
+ * default, `dest` is overwritten if it already exists.
+ * @param {string | Buffer | URL} src
+ * @param {string | Buffer | URL} dest
+ * @param {number} [mode]
+ * @param {() => any} callback
+ * @returns {void}
+ */
function copyFile(src, dest, mode, callback) {
if (typeof mode === 'function') {
callback = mode;
@@ -2071,7 +2776,14 @@ function copyFile(src, dest, mode, callback) {
binding.copyFile(src, dest, mode, req);
}
-
+/**
+ * Synchronously copies `src` to `dest`. By
+ * default, `dest` is overwritten if it already exists.
+ * @param {string | Buffer | URL} src
+ * @param {string | Buffer | URL} dest
+ * @param {number} [mode]
+ * @returns {void}
+ */
function copyFileSync(src, dest, mode) {
src = getValidatedPath(src, 'src');
dest = getValidatedPath(dest, 'dest');
@@ -2093,11 +2805,44 @@ function lazyLoadStreams() {
}
}
+/**
+ * Creates a readable stream with a default `highWaterMark`
+ * of 64 kb.
+ * @param {string | Buffer | URL} path
+ * @param {string | {
+ * flags?: string;
+ * encoding?: string;
+ * fd?: number | FileHandle;
+ * mode?: number;
+ * autoClose?: boolean;
+ * emitClose?: boolean;
+ * start: number;
+ * end?: number;
+ * highWaterMark?: number;
+ * fs?: Object | null;
+ * }} [options]
+ * @returns {ReadStream}
+ */
function createReadStream(path, options) {
lazyLoadStreams();
return new ReadStream(path, options);
}
+/**
+ * Creates a write stream.
+ * @param {string | Buffer | URL} path
+ * @param {string | {
+ * flags?: string;
+ * encoding?: string;
+ * fd?: number | FileHandle;
+ * mode?: number;
+ * autoClose?: boolean;
+ * emitClose?: boolean;
+ * start: number;
+ * fs?: Object | null;
+ * }} [options]
+ * @returns {WriteStream}
+ */
function createWriteStream(path, options) {
lazyLoadStreams();
return new WriteStream(path, options);
diff --git a/lib/internal/blob.js b/lib/internal/blob.js
index b767426dcb2b7d..927b9f54046bf2 100644
--- a/lib/internal/blob.js
+++ b/lib/internal/blob.js
@@ -20,6 +20,8 @@ const {
FixedSizeBlobCopyJob,
} = internalBinding('buffer');
+const { TextDecoder } = require('internal/encoding');
+
const {
JSTransferable,
kClone,
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
index 46e0e967f79991..81a9547b9071bc 100644
--- a/lib/internal/bootstrap/node.js
+++ b/lib/internal/bootstrap/node.js
@@ -107,8 +107,10 @@ const deprecationHandler = {
get(target, key, receiver) {
const val = ReflectGet(target, key, receiver);
- if (val != null && typeof val === 'object')
+ if (val != null && typeof val === 'object') {
+ // eslint-disable-next-line node-core/prefer-primordials
return new Proxy(val, deprecationHandler);
+ }
return val;
},
@@ -118,6 +120,7 @@ const deprecationHandler = {
}
};
+// eslint-disable-next-line node-core/prefer-primordials
let processConfig = new Proxy(
JSONParse(nativeModule.config),
deprecationHandler);
diff --git a/lib/internal/console/constructor.js b/lib/internal/console/constructor.js
index c3716a8acda8b5..22b84e5e42b956 100644
--- a/lib/internal/console/constructor.js
+++ b/lib/internal/console/constructor.js
@@ -429,7 +429,10 @@ const consoleMethods = {
if (this._stdout.isTTY && process.env.TERM !== 'dumb') {
// The require is here intentionally to avoid readline being
// required too early when console is first loaded.
- const { cursorTo, clearScreenDown } = require('readline');
+ const {
+ cursorTo,
+ clearScreenDown,
+ } = require('internal/readline/callbacks');
cursorTo(this._stdout, 0, 0);
clearScreenDown(this._stdout);
}
diff --git a/lib/internal/crypto/diffiehellman.js b/lib/internal/crypto/diffiehellman.js
index e2106b211ba01b..2e38e95ea1d774 100644
--- a/lib/internal/crypto/diffiehellman.js
+++ b/lib/internal/crypto/diffiehellman.js
@@ -122,9 +122,9 @@ function DiffieHellman(sizeOrKey, keyEncoding, generator, genEncoding) {
generator = DH_GENERATOR;
} else if (typeof generator === 'number') {
validateInt32(generator, 'generator');
- } else if (generator !== true) {
+ } else if (typeof generator === 'string') {
generator = toBuf(generator, genEncoding);
- } else {
+ } else if (!isArrayBufferView(generator) && !isAnyArrayBuffer(generator)) {
throw new ERR_INVALID_ARG_TYPE(
'generator',
['number', 'string', 'ArrayBuffer', 'Buffer', 'TypedArray', 'DataView'],
diff --git a/lib/internal/crypto/keygen.js b/lib/internal/crypto/keygen.js
index 6fc06936a4fb03..06490e24a9c24f 100644
--- a/lib/internal/crypto/keygen.js
+++ b/lib/internal/crypto/keygen.js
@@ -40,6 +40,7 @@ const {
const { customPromisifyArgs } = require('internal/util');
const {
+ isInt32,
isUint32,
validateCallback,
validateString,
@@ -194,7 +195,7 @@ function createJob(mode, type, options) {
throw new ERR_INVALID_ARG_VALUE('options.hash', hash);
if (mgf1Hash !== undefined && typeof mgf1Hash !== 'string')
throw new ERR_INVALID_ARG_VALUE('options.mgf1Hash', mgf1Hash);
- if (saltLength !== undefined && !isUint32(saltLength))
+ if (saltLength !== undefined && (!isInt32(saltLength) || saltLength < 0))
throw new ERR_INVALID_ARG_VALUE('options.saltLength', saltLength);
return new RsaKeyPairGenJob(
@@ -217,7 +218,7 @@ function createJob(mode, type, options) {
let { divisorLength } = options;
if (divisorLength == null) {
divisorLength = -1;
- } else if (!isUint32(divisorLength)) {
+ } else if (!isInt32(divisorLength) || divisorLength < 0) {
throw new ERR_INVALID_ARG_VALUE('options.divisorLength', divisorLength);
}
@@ -292,7 +293,7 @@ function createJob(mode, type, options) {
if (!isArrayBufferView(prime))
throw new ERR_INVALID_ARG_VALUE('options.prime', prime);
} else if (primeLength != null) {
- if (!isUint32(primeLength))
+ if (!isInt32(primeLength) || primeLength < 0)
throw new ERR_INVALID_ARG_VALUE('options.primeLength', primeLength);
} else {
throw new ERR_MISSING_OPTION(
@@ -300,7 +301,7 @@ function createJob(mode, type, options) {
}
if (generator != null) {
- if (!isUint32(generator))
+ if (!isInt32(generator) || generator < 0)
throw new ERR_INVALID_ARG_VALUE('options.generator', generator);
}
return new DhKeyPairGenJob(
diff --git a/lib/internal/crypto/scrypt.js b/lib/internal/crypto/scrypt.js
index 458723df28ffca..45a04905bfd447 100644
--- a/lib/internal/crypto/scrypt.js
+++ b/lib/internal/crypto/scrypt.js
@@ -16,6 +16,7 @@ const {
const {
validateCallback,
validateInteger,
+ validateInt32,
validateUint32,
} = require('internal/validators');
@@ -90,7 +91,7 @@ function check(password, salt, keylen, options) {
password = getArrayBufferOrView(password, 'password');
salt = getArrayBufferOrView(salt, 'salt');
- validateUint32(keylen, 'keylen');
+ validateInt32(keylen, 'keylen', 0);
let { N, r, p, maxmem } = defaults;
if (options && options !== defaults) {
diff --git a/lib/internal/crypto/webcrypto.js b/lib/internal/crypto/webcrypto.js
index 47c34b9ca0d665..b28ee9b8167be5 100644
--- a/lib/internal/crypto/webcrypto.js
+++ b/lib/internal/crypto/webcrypto.js
@@ -26,7 +26,7 @@ const {
validateString,
} = require('internal/validators');
-const { TextDecoder } = require('internal/encoding');
+const { TextDecoder, TextEncoder } = require('internal/encoding');
const {
codes: {
diff --git a/lib/internal/freeze_intrinsics.js b/lib/internal/freeze_intrinsics.js
index e7282588551929..9dd21af4025094 100644
--- a/lib/internal/freeze_intrinsics.js
+++ b/lib/internal/freeze_intrinsics.js
@@ -19,13 +19,16 @@
// https://github.com/google/caja/blob/master/src/com/google/caja/ses/repairES5.js
// https://github.com/tc39/proposal-ses/blob/e5271cc42a257a05dcae2fd94713ed2f46c08620/shim/src/freeze.js
-/* global WebAssembly, SharedArrayBuffer, console */
+/* global console */
'use strict';
const {
+ AggregateError,
+ AggregateErrorPrototype,
Array,
ArrayBuffer,
ArrayBufferPrototype,
+ ArrayIteratorPrototype,
ArrayPrototype,
ArrayPrototypeForEach,
ArrayPrototypePush,
@@ -45,6 +48,8 @@ const {
ErrorPrototype,
EvalError,
EvalErrorPrototype,
+ FinalizationRegistry,
+ FinalizationRegistryPrototype,
Float32Array,
Float32ArrayPrototype,
Float64Array,
@@ -73,6 +78,7 @@ const {
ObjectPrototypeHasOwnProperty,
Promise,
PromisePrototype,
+ Proxy,
RangeError,
RangeErrorPrototype,
ReferenceError,
@@ -84,9 +90,12 @@ const {
Set,
SetPrototype,
String,
+ StringIteratorPrototype,
StringPrototype,
Symbol,
SymbolIterator,
+ SymbolMatchAll,
+ SymbolPrototype,
SyntaxError,
SyntaxErrorPrototype,
TypeError,
@@ -105,14 +114,24 @@ const {
URIErrorPrototype,
WeakMap,
WeakMapPrototype,
+ WeakRef,
+ WeakRefPrototype,
WeakSet,
WeakSetPrototype,
decodeURI,
decodeURIComponent,
encodeURI,
encodeURIComponent,
+ globalThis,
} = primordials;
+const {
+ Atomics,
+ Intl,
+ SharedArrayBuffer,
+ WebAssembly
+} = globalThis;
+
module.exports = function() {
const {
clearImmediate,
@@ -124,34 +143,14 @@ module.exports = function() {
} = require('timers');
const intrinsicPrototypes = [
- // Anonymous Intrinsics
- // IteratorPrototype
- ObjectGetPrototypeOf(
- ObjectGetPrototypeOf(new Array()[SymbolIterator]())
- ),
- // ArrayIteratorPrototype
- ObjectGetPrototypeOf(new Array()[SymbolIterator]()),
- // StringIteratorPrototype
- ObjectGetPrototypeOf(new String()[SymbolIterator]()),
- // MapIteratorPrototype
- ObjectGetPrototypeOf(new Map()[SymbolIterator]()),
- // SetIteratorPrototype
- ObjectGetPrototypeOf(new Set()[SymbolIterator]()),
- // GeneratorFunction
- ObjectGetPrototypeOf(function* () {}),
- // AsyncFunction
- ObjectGetPrototypeOf(async function() {}),
- // AsyncGeneratorFunction
- ObjectGetPrototypeOf(async function* () {}),
- // TypedArray
- TypedArrayPrototype,
-
- // 19 Fundamental Objects
- ObjectPrototype, // 19.1
- FunctionPrototype, // 19.2
- BooleanPrototype, // 19.3
-
- ErrorPrototype, // 19.5
+ // 20 Fundamental Objects
+ ObjectPrototype, // 20.1
+ FunctionPrototype, // 20.2
+ BooleanPrototype, // 20.3
+ SymbolPrototype, // 20.4
+
+ ErrorPrototype, // 20.5
+ AggregateErrorPrototype,
EvalErrorPrototype,
RangeErrorPrototype,
ReferenceErrorPrototype,
@@ -159,17 +158,23 @@ module.exports = function() {
TypeErrorPrototype,
URIErrorPrototype,
- // 20 Numbers and Dates
- NumberPrototype, // 20.1
- DatePrototype, // 20.3
+ // 21 Numbers and Dates
+ NumberPrototype, // 21.1
+ BigIntPrototype, // 21.2
+ DatePrototype, // 21.4
- // 21 Text Processing
- StringPrototype, // 21.1
- RegExpPrototype, // 21.2
+ // 22 Text Processing
+ StringPrototype, // 22.1
+ StringIteratorPrototype, // 22.1.5
+ RegExpPrototype, // 22.2
+ // 22.2.7 RegExpStringIteratorPrototype
+ ObjectGetPrototypeOf(/e/[SymbolMatchAll]()),
- // 22 Indexed Collections
- ArrayPrototype, // 22.1
+ // 23 Indexed Collections
+ ArrayPrototype, // 23.1
+ ArrayIteratorPrototype, // 23.1.5
+ TypedArrayPrototype, // 23.2
Int8ArrayPrototype,
Uint8ArrayPrototype,
Uint8ClampedArrayPrototype,
@@ -182,20 +187,36 @@ module.exports = function() {
BigInt64ArrayPrototype,
BigUint64ArrayPrototype,
- // 23 Keyed Collections
- MapPrototype, // 23.1
- SetPrototype, // 23.2
- WeakMapPrototype, // 23.3
- WeakSetPrototype, // 23.4
-
- // 24 Structured Data
- ArrayBufferPrototype, // 24.1
- DataViewPrototype, // 24.3
- PromisePrototype, // 25.4
+ // 24 Keyed Collections
+ MapPrototype, // 24.1
+ // 24.1.5 MapIteratorPrototype
+ ObjectGetPrototypeOf(new Map()[SymbolIterator]()),
+ SetPrototype, // 24.2
+ // 24.2.5 SetIteratorPrototype
+ ObjectGetPrototypeOf(new Set()[SymbolIterator]()),
+ WeakMapPrototype, // 24.3
+ WeakSetPrototype, // 24.4
+
+ // 25 Structured Data
+ ArrayBufferPrototype, // 25.1
+ SharedArrayBuffer.prototype, // 25.2
+ DataViewPrototype, // 25.3
+
+ // 26 Managing Memory
+ WeakRefPrototype, // 26.1
+ FinalizationRegistryPrototype, // 26.2
+
+ // 27 Control Abstraction Objects
+ // 27.1 Iteration
+ ObjectGetPrototypeOf(ArrayIteratorPrototype), // 27.1.2 IteratorPrototype
+ // 27.1.3 AsyncIteratorPrototype
+ ObjectGetPrototypeOf(ObjectGetPrototypeOf(ObjectGetPrototypeOf(
+ (async function*() {})()
+ ))),
+ PromisePrototype, // 27.2
// Other APIs / Web Compatibility
console.Console.prototype,
- BigIntPrototype,
WebAssembly.Module.prototype,
WebAssembly.Instance.prototype,
WebAssembly.Table.prototype,
@@ -203,34 +224,13 @@ module.exports = function() {
WebAssembly.CompileError.prototype,
WebAssembly.LinkError.prototype,
WebAssembly.RuntimeError.prototype,
- SharedArrayBuffer.prototype,
];
const intrinsics = [
- // Anonymous Intrinsics
- // ThrowTypeError
+ // 10.2.4.1 ThrowTypeError
ObjectGetOwnPropertyDescriptor(FunctionPrototype, 'caller').get,
- // IteratorPrototype
- ObjectGetPrototypeOf(
- ObjectGetPrototypeOf(new Array()[SymbolIterator]())
- ),
- // ArrayIteratorPrototype
- ObjectGetPrototypeOf(new Array()[SymbolIterator]()),
- // StringIteratorPrototype
- ObjectGetPrototypeOf(new String()[SymbolIterator]()),
- // MapIteratorPrototype
- ObjectGetPrototypeOf(new Map()[SymbolIterator]()),
- // SetIteratorPrototype
- ObjectGetPrototypeOf(new Set()[SymbolIterator]()),
- // GeneratorFunction
- ObjectGetPrototypeOf(function* () {}),
- // AsyncFunction
- ObjectGetPrototypeOf(async function() {}),
- // AsyncGeneratorFunction
- ObjectGetPrototypeOf(async function* () {}),
- // TypedArray
- TypedArray,
- // 18 The Global Object
+ // 19 The Global Object
+ // 19.2 Function Properties of the Global Object
eval,
// eslint-disable-next-line node-core/prefer-primordials
isFinite,
@@ -240,18 +240,20 @@ module.exports = function() {
parseFloat,
// eslint-disable-next-line node-core/prefer-primordials
parseInt,
+ // 19.2.6 URI Handling Functions
decodeURI,
decodeURIComponent,
encodeURI,
encodeURIComponent,
- // 19 Fundamental Objects
- Object, // 19.1
- Function, // 19.2
- Boolean, // 19.3
- Symbol, // 19.4
+ // 20 Fundamental Objects
+ Object, // 20.1
+ Function, // 20.2
+ Boolean, // 20.3
+ Symbol, // 20.4
- Error, // 19.5
+ Error, // 20.5
+ AggregateError,
EvalError,
RangeError,
ReferenceError,
@@ -259,19 +261,25 @@ module.exports = function() {
TypeError,
URIError,
- // 20 Numbers and Dates
- Number, // 20.1
+ // 21 Numbers and Dates
+ Number, // 21.1
+ BigInt, // 21.2
// eslint-disable-next-line node-core/prefer-primordials
- Math, // 20.2
- Date, // 20.3
-
- // 21 Text Processing
- String, // 21.1
- RegExp, // 21.2
-
- // 22 Indexed Collections
- Array, // 22.1
-
+ Math, // 21.3
+ Date, // 21.4
+
+ // 22 Text Processing
+ String, // 22.1
+ StringIteratorPrototype, // 22.1.5
+ RegExp, // 22.2
+ // 22.2.7 RegExpStringIteratorPrototype
+ ObjectGetPrototypeOf(/e/[SymbolMatchAll]()),
+
+ // 23 Indexed Collections
+ Array, // 23.1
+ ArrayIteratorPrototype, // 23.1.5
+ // 23.2 TypedArray
+ TypedArray,
Int8Array,
Uint8Array,
Uint8ClampedArray,
@@ -284,23 +292,47 @@ module.exports = function() {
BigInt64Array,
BigUint64Array,
- // 23 Keyed Collections
- Map, // 23.1
- Set, // 23.2
- WeakMap, // 23.3
- WeakSet, // 23.4
-
- // 24 Structured Data
- ArrayBuffer, // 24.1
- DataView, // 24.3
+ // 24 Keyed Collections
+ Map, // 24.1
+ // 24.1.5 MapIteratorPrototype
+ ObjectGetPrototypeOf(new Map()[SymbolIterator]()),
+ Set, // 24.2
+ // 24.2.5 SetIteratorPrototype
+ ObjectGetPrototypeOf(new Set()[SymbolIterator]()),
+ WeakMap, // 24.3
+ WeakSet, // 24.4
+
+ // 25 Structured Data
+ ArrayBuffer, // 25.1
+ SharedArrayBuffer, // 25.2
+ DataView, // 25.3
+ Atomics, // 25.4
// eslint-disable-next-line node-core/prefer-primordials
- JSON, // 24.5
- Promise, // 25.4
+ JSON, // 25.5
+
+ // 26 Managing Memory
+ WeakRef, // 26.1
+ FinalizationRegistry, // 26.2
+
+ // 27 Control Abstraction Objects
+ // 27.1 Iteration
+ ObjectGetPrototypeOf(ArrayIteratorPrototype), // 27.1.2 IteratorPrototype
+ // 27.1.3 AsyncIteratorPrototype
+ ObjectGetPrototypeOf(ObjectGetPrototypeOf(ObjectGetPrototypeOf(
+ (async function*() {})()
+ ))),
+ Promise, // 27.2
+ // 27.3 GeneratorFunction
+ ObjectGetPrototypeOf(function* () {}),
+ // 27.4 AsyncGeneratorFunction
+ ObjectGetPrototypeOf(async function* () {}),
+ // 27.7 AsyncFunction
+ ObjectGetPrototypeOf(async function() {}),
- // 26 Reflection
+ // 28 Reflection
// eslint-disable-next-line node-core/prefer-primordials
- Reflect, // 26.1
- Proxy, // 26.2
+ Reflect, // 28.1
+ Proxy, // 28.2
// B.2.1
escape,
@@ -314,10 +346,7 @@ module.exports = function() {
setInterval,
setTimeout,
console,
- BigInt,
- Atomics,
WebAssembly,
- SharedArrayBuffer,
];
if (typeof Intl !== 'undefined') {
@@ -337,6 +366,13 @@ module.exports = function() {
const frozenSet = new WeakSet();
ArrayPrototypeForEach(intrinsics, deepFreeze);
+ // 19.1 Value Properties of the Global Object
+ ObjectDefineProperty(globalThis, 'globalThis', {
+ configurable: false,
+ writable: false,
+ value: globalThis,
+ });
+
// Objects that are deeply frozen.
function deepFreeze(root) {
/**
diff --git a/lib/internal/fs/promises.js b/lib/internal/fs/promises.js
index 5d51248c8417b9..ac554f961c73ba 100644
--- a/lib/internal/fs/promises.js
+++ b/lib/internal/fs/promises.js
@@ -400,6 +400,9 @@ async function open(path, flags, mode) {
async function read(handle, bufferOrOptions, offset, length, position) {
let buffer = bufferOrOptions;
if (!isArrayBufferView(buffer)) {
+ if (bufferOrOptions === undefined) {
+ bufferOrOptions = {};
+ }
if (bufferOrOptions.buffer) {
buffer = bufferOrOptions.buffer;
validateBuffer(buffer);
@@ -414,7 +417,7 @@ async function read(handle, bufferOrOptions, offset, length, position) {
if (offset == null) {
offset = 0;
} else {
- validateInteger(offset, 'offset');
+ validateInteger(offset, 'offset', 0);
}
length |= 0;
@@ -457,7 +460,7 @@ async function write(handle, buffer, offset, length, position) {
if (offset == null) {
offset = 0;
} else {
- validateInteger(offset, 'offset');
+ validateInteger(offset, 'offset', 0);
}
if (typeof length !== 'number')
length = buffer.byteLength - offset;
diff --git a/lib/internal/fs/streams.js b/lib/internal/fs/streams.js
index 57c2304fca82cc..b388bad80c74a5 100644
--- a/lib/internal/fs/streams.js
+++ b/lib/internal/fs/streams.js
@@ -255,6 +255,10 @@ ReadStream.prototype._read = function(n) {
if (er) {
errorOrDestroy(this, er);
} else if (bytesRead > 0) {
+ if (this.pos !== undefined) {
+ this.pos += bytesRead;
+ }
+
this.bytesRead += bytesRead;
if (bytesRead !== buf.length) {
@@ -271,10 +275,6 @@ ReadStream.prototype._read = function(n) {
this.push(null);
}
});
-
- if (this.pos !== undefined) {
- this.pos += n;
- }
};
ReadStream.prototype._destroy = function(err, cb) {
diff --git a/lib/internal/fs/utils.js b/lib/internal/fs/utils.js
index bf4d8457531c0b..3b7754292821f3 100644
--- a/lib/internal/fs/utils.js
+++ b/lib/internal/fs/utils.js
@@ -655,6 +655,10 @@ const validateOffsetLengthWrite = hideStackFrames(
if (length > byteLength - offset) {
throw new ERR_OUT_OF_RANGE('length', `<= ${byteLength - offset}`, length);
}
+
+ if (length < 0) {
+ throw new ERR_OUT_OF_RANGE('length', '>= 0', length);
+ }
}
);
diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js
index 4795e59581d993..a1ee6cdbbc7777 100644
--- a/lib/internal/http2/compat.js
+++ b/lib/internal/http2/compat.js
@@ -9,6 +9,7 @@ const {
ObjectCreate,
ObjectKeys,
ObjectPrototypeHasOwnProperty,
+ Proxy,
ReflectApply,
ReflectGetPrototypeOf,
StringPrototypeIncludes,
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
index 5427f74a5f2b59..1654f2460cdd5a 100644
--- a/lib/internal/http2/core.js
+++ b/lib/internal/http2/core.js
@@ -18,6 +18,7 @@ const {
ObjectPrototypeHasOwnProperty,
Promise,
PromisePrototypeCatch,
+ Proxy,
ReflectApply,
ReflectGet,
ReflectGetPrototypeOf,
diff --git a/lib/internal/inspector/_inspect.js b/lib/internal/inspector/_inspect.js
new file mode 100644
index 00000000000000..f695fd53f1fda6
--- /dev/null
+++ b/lib/internal/inspector/_inspect.js
@@ -0,0 +1,383 @@
+/*
+ * Copyright Node.js contributors. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+// TODO(aduh95): remove restricted syntax errors
+/* eslint-disable no-restricted-syntax */
+
+'use strict';
+
+const {
+ ArrayPrototypeConcat,
+ ArrayPrototypeForEach,
+ ArrayPrototypeJoin,
+ ArrayPrototypeMap,
+ ArrayPrototypePop,
+ ArrayPrototypeShift,
+ ArrayPrototypeSlice,
+ Error,
+ FunctionPrototypeBind,
+ Number,
+ Promise,
+ PromisePrototypeCatch,
+ PromisePrototypeThen,
+ PromiseResolve,
+ Proxy,
+ RegExpPrototypeSymbolMatch,
+ RegExpPrototypeSymbolSplit,
+ RegExpPrototypeTest,
+ StringPrototypeEndsWith,
+ StringPrototypeSplit,
+} = primordials;
+
+const { spawn } = require('child_process');
+const { EventEmitter } = require('events');
+const net = require('net');
+const util = require('util');
+const {
+ setInterval,
+ setTimeout,
+} = require('timers/promises');
+const {
+ AbortController,
+} = require('internal/abort_controller');
+
+// TODO(aduh95): remove console calls
+const console = require('internal/console/global');
+
+const { 0: InspectClient, 1: createRepl } =
+ [
+ require('internal/inspector/inspect_client'),
+ require('internal/inspector/inspect_repl'),
+ ];
+
+const debuglog = util.debuglog('inspect');
+
+class StartupError extends Error {
+ constructor(message) {
+ super(message);
+ this.name = 'StartupError';
+ }
+}
+
+async function portIsFree(host, port, timeout = 9999) {
+ if (port === 0) return; // Binding to a random port.
+
+ const retryDelay = 150;
+ const ac = new AbortController();
+ const { signal } = ac;
+
+ setTimeout(timeout).then(() => ac.abort());
+
+ // eslint-disable-next-line no-unused-vars
+ for await (const _ of setInterval(retryDelay)) {
+ if (signal.aborted) {
+ throw new StartupError(
+ `Timeout (${timeout}) waiting for ${host}:${port} to be free`);
+ }
+ const error = await new Promise((resolve) => {
+ const socket = net.connect(port, host);
+ socket.on('error', resolve);
+ socket.on('connect', resolve);
+ });
+ if (error?.code === 'ECONNREFUSED') {
+ return;
+ }
+ }
+}
+
+const debugRegex = /Debugger listening on ws:\/\/\[?(.+?)\]?:(\d+)\//;
+async function runScript(script, scriptArgs, inspectHost, inspectPort,
+ childPrint) {
+ await portIsFree(inspectHost, inspectPort);
+ const args = ArrayPrototypeConcat(
+ [`--inspect-brk=${inspectPort}`, script],
+ scriptArgs);
+ const child = spawn(process.execPath, args);
+ child.stdout.setEncoding('utf8');
+ child.stderr.setEncoding('utf8');
+ child.stdout.on('data', (chunk) => childPrint(chunk, 'stdout'));
+ child.stderr.on('data', (chunk) => childPrint(chunk, 'stderr'));
+
+ let output = '';
+ return new Promise((resolve) => {
+ function waitForListenHint(text) {
+ output += text;
+ const debug = RegExpPrototypeSymbolMatch(debugRegex, output);
+ if (debug) {
+ const host = debug[1];
+ const port = Number(debug[2]);
+ child.stderr.removeListener('data', waitForListenHint);
+ resolve([child, port, host]);
+ }
+ }
+
+ child.stderr.on('data', waitForListenHint);
+ });
+}
+
+function createAgentProxy(domain, client) {
+ const agent = new EventEmitter();
+ agent.then = (then, _catch) => {
+ // TODO: potentially fetch the protocol and pretty-print it here.
+ const descriptor = {
+ [util.inspect.custom](depth, { stylize }) {
+ return stylize(`[Agent ${domain}]`, 'special');
+ },
+ };
+ return PromisePrototypeThen(PromiseResolve(descriptor), then, _catch);
+ };
+
+ return new Proxy(agent, {
+ get(target, name) {
+ if (name in target) return target[name];
+ return function callVirtualMethod(params) {
+ return client.callMethod(`${domain}.${name}`, params);
+ };
+ },
+ });
+}
+
+class NodeInspector {
+ constructor(options, stdin, stdout) {
+ this.options = options;
+ this.stdin = stdin;
+ this.stdout = stdout;
+
+ this.paused = true;
+ this.child = null;
+
+ if (options.script) {
+ this._runScript = FunctionPrototypeBind(
+ runScript, null,
+ options.script,
+ options.scriptArgs,
+ options.host,
+ options.port,
+ FunctionPrototypeBind(this.childPrint, this));
+ } else {
+ this._runScript =
+ () => PromiseResolve([null, options.port, options.host]);
+ }
+
+ this.client = new InspectClient();
+
+ this.domainNames = ['Debugger', 'HeapProfiler', 'Profiler', 'Runtime'];
+ ArrayPrototypeForEach(this.domainNames, (domain) => {
+ this[domain] = createAgentProxy(domain, this.client);
+ });
+ this.handleDebugEvent = (fullName, params) => {
+ const { 0: domain, 1: name } = StringPrototypeSplit(fullName, '.');
+ if (domain in this) {
+ this[domain].emit(name, params);
+ }
+ };
+ this.client.on('debugEvent', this.handleDebugEvent);
+ const startRepl = createRepl(this);
+
+ // Handle all possible exits
+ process.on('exit', () => this.killChild());
+ const exitCodeZero = () => process.exit(0);
+ process.once('SIGTERM', exitCodeZero);
+ process.once('SIGHUP', exitCodeZero);
+
+ PromisePrototypeCatch(PromisePrototypeThen(this.run(), () => {
+ const repl = startRepl();
+ this.repl = repl;
+ this.repl.on('exit', exitCodeZero);
+ this.paused = false;
+ }), (error) => process.nextTick(() => { throw error; }));
+ }
+
+ suspendReplWhile(fn) {
+ if (this.repl) {
+ this.repl.pause();
+ }
+ this.stdin.pause();
+ this.paused = true;
+ return PromisePrototypeCatch(PromisePrototypeThen(new Promise((resolve) => {
+ resolve(fn());
+ }), () => {
+ this.paused = false;
+ if (this.repl) {
+ this.repl.resume();
+ this.repl.displayPrompt();
+ }
+ this.stdin.resume();
+ }), (error) => process.nextTick(() => { throw error; }));
+ }
+
+ killChild() {
+ this.client.reset();
+ if (this.child) {
+ this.child.kill();
+ this.child = null;
+ }
+ }
+
+ async run() {
+ this.killChild();
+
+ const { 0: child, 1: port, 2: host } = await this._runScript();
+ this.child = child;
+
+ this.print(`connecting to ${host}:${port} ..`, false);
+ for (let attempt = 0; attempt < 5; attempt++) {
+ debuglog('connection attempt #%d', attempt);
+ this.stdout.write('.');
+ try {
+ await this.client.connect(port, host);
+ debuglog('connection established');
+ this.stdout.write(' ok\n');
+ return;
+ } catch (error) {
+ debuglog('connect failed', error);
+ await setTimeout(1000);
+ }
+ }
+ this.stdout.write(' failed to connect, please retry\n');
+ process.exit(1);
+ }
+
+ clearLine() {
+ if (this.stdout.isTTY) {
+ this.stdout.cursorTo(0);
+ this.stdout.clearLine(1);
+ } else {
+ this.stdout.write('\b');
+ }
+ }
+
+ print(text, appendNewline = false) {
+ this.clearLine();
+ this.stdout.write(appendNewline ? `${text}\n` : text);
+ }
+
+ #stdioBuffers = { stdout: '', stderr: '' };
+ childPrint(text, which) {
+ const lines = RegExpPrototypeSymbolSplit(
+ /\r\n|\r|\n/g,
+ this.#stdioBuffers[which] + text);
+
+ this.#stdioBuffers[which] = '';
+
+ if (lines[lines.length - 1] !== '') {
+ this.#stdioBuffers[which] = ArrayPrototypePop(lines);
+ }
+
+ const textToPrint = ArrayPrototypeJoin(
+ ArrayPrototypeMap(lines, (chunk) => `< ${chunk}`),
+ '\n');
+
+ if (lines.length) {
+ this.print(textToPrint, true);
+ if (!this.paused) {
+ this.repl.displayPrompt(true);
+ }
+ }
+
+ if (StringPrototypeEndsWith(
+ textToPrint,
+ 'Waiting for the debugger to disconnect...\n'
+ )) {
+ this.killChild();
+ }
+ }
+}
+
+function parseArgv(args) {
+ const target = ArrayPrototypeShift(args);
+ let host = '127.0.0.1';
+ let port = 9229;
+ let isRemote = false;
+ let script = target;
+ let scriptArgs = args;
+
+ const hostMatch = RegExpPrototypeSymbolMatch(/^([^:]+):(\d+)$/, target);
+ const portMatch = RegExpPrototypeSymbolMatch(/^--port=(\d+)$/, target);
+
+ if (hostMatch) {
+ // Connecting to remote debugger
+ host = hostMatch[1];
+ port = Number(hostMatch[2]);
+ isRemote = true;
+ script = null;
+ } else if (portMatch) {
+ // Start on custom port
+ port = Number(portMatch[1]);
+ script = args[0];
+ scriptArgs = ArrayPrototypeSlice(args, 1);
+ } else if (args.length === 1 && RegExpPrototypeTest(/^\d+$/, args[0]) &&
+ target === '-p') {
+ // Start debugger against a given pid
+ const pid = Number(args[0]);
+ try {
+ process._debugProcess(pid);
+ } catch (e) {
+ if (e.code === 'ESRCH') {
+ console.error(`Target process: ${pid} doesn't exist.`);
+ process.exit(1);
+ }
+ throw e;
+ }
+ script = null;
+ isRemote = true;
+ }
+
+ return {
+ host, port, isRemote, script, scriptArgs,
+ };
+}
+
+function startInspect(argv = ArrayPrototypeSlice(process.argv, 2),
+ stdin = process.stdin,
+ stdout = process.stdout) {
+ if (argv.length < 1) {
+ const invokedAs = `${process.argv0} ${process.argv[1]}`;
+
+ console.error(`Usage: ${invokedAs} script.js`);
+ console.error(` ${invokedAs} :`);
+ console.error(` ${invokedAs} --port=`);
+ console.error(` ${invokedAs} -p `);
+ process.exit(1);
+ }
+
+ const options = parseArgv(argv);
+ const inspector = new NodeInspector(options, stdin, stdout);
+
+ stdin.resume();
+
+ function handleUnexpectedError(e) {
+ if (!(e instanceof StartupError)) {
+ console.error('There was an internal error in Node.js. ' +
+ 'Please report this bug.');
+ console.error(e.message);
+ console.error(e.stack);
+ } else {
+ console.error(e.message);
+ }
+ if (inspector.child) inspector.child.kill();
+ process.exit(1);
+ }
+
+ process.on('uncaughtException', handleUnexpectedError);
+}
+exports.start = startInspect;
diff --git a/deps/node-inspect/lib/internal/inspect_client.js b/lib/internal/inspector/inspect_client.js
similarity index 87%
rename from deps/node-inspect/lib/internal/inspect_client.js
rename to lib/internal/inspector/inspect_client.js
index 9b8529de21aae2..ba1e9bc30ce5ce 100644
--- a/deps/node-inspect/lib/internal/inspect_client.js
+++ b/lib/internal/inspector/inspect_client.js
@@ -19,15 +19,29 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
+
+// TODO(aduh95): use errors exported by the internal/errors module
+/* eslint-disable no-restricted-syntax */
+
'use strict';
+
+const {
+ ArrayPrototypePush,
+ Error,
+ ErrorCaptureStackTrace,
+ FunctionPrototypeBind,
+ JSONParse,
+ JSONStringify,
+ ObjectKeys,
+ Promise,
+} = primordials;
+
const Buffer = require('buffer').Buffer;
-const crypto = require('crypto');
const { EventEmitter } = require('events');
const http = require('http');
const URL = require('url');
-const util = require('util');
-const debuglog = util.debuglog('inspect');
+const debuglog = require('internal/util/debuglog').debuglog('inspect');
const kOpCodeText = 0x1;
const kOpCodeClose = 0x8;
@@ -46,14 +60,10 @@ const kTwoBytePayloadLengthField = 126;
const kEightBytePayloadLengthField = 127;
const kMaskingKeyWidthInBytes = 4;
-function isEmpty(obj) {
- return Object.keys(obj).length === 0;
-}
-
function unpackError({ code, message, data }) {
const err = new Error(`${message} - ${data}`);
err.code = code;
- Error.captureStackTrace(err, unpackError);
+ ErrorCaptureStackTrace(err, unpackError);
return err;
}
@@ -166,7 +176,7 @@ function decodeFrameHybi17(data) {
class Client extends EventEmitter {
constructor() {
super();
- this.handleChunk = this._handleChunk.bind(this);
+ this.handleChunk = FunctionPrototypeBind(this._handleChunk, this);
this._port = undefined;
this._host = undefined;
@@ -189,7 +199,7 @@ class Client extends EventEmitter {
this.reset();
return;
}
- if (payloadBuffer === null) break;
+ if (payloadBuffer === null || payloadBuffer.length === 0) break;
const payloadStr = payloadBuffer.toString();
debuglog('< %s', payloadStr);
@@ -199,7 +209,7 @@ class Client extends EventEmitter {
}
let payload;
try {
- payload = JSON.parse(payloadStr);
+ payload = JSONParse(payloadStr);
} catch (parseError) {
parseError.string = payloadStr;
throw parseError;
@@ -225,6 +235,9 @@ class Client extends EventEmitter {
if (this._http) {
this._http.destroy();
}
+ if (this._socket) {
+ this._socket.destroy();
+ }
this._http = null;
this._lastId = 0;
this._socket = null;
@@ -241,9 +254,9 @@ class Client extends EventEmitter {
const data = { id: ++this._lastId, method, params };
this._pending[data.id] = (error, result) => {
if (error) reject(unpackError(error));
- else resolve(isEmpty(result) ? undefined : result);
+ else resolve(ObjectKeys(result).length ? result : undefined);
};
- const json = JSON.stringify(data);
+ const json = JSONStringify(data);
debuglog('> %s', json);
this._socket.write(encodeFrameHybi17(Buffer.from(json)));
});
@@ -267,15 +280,15 @@ class Client extends EventEmitter {
return;
}
try {
- resolve(JSON.parse(resBody));
- } catch (parseError) {
+ resolve(JSONParse(resBody));
+ } catch {
reject(new Error(`Response didn't contain JSON: ${resBody}`));
- return;
+
}
}
httpRes.on('error', reject);
- httpRes.on('data', (chunk) => chunks.push(chunk));
+ httpRes.on('data', (chunk) => ArrayPrototypePush(chunks, chunk));
httpRes.on('end', parseChunks);
}
@@ -284,23 +297,22 @@ class Client extends EventEmitter {
});
}
- connect(port, host) {
+ async connect(port, host) {
this._port = port;
this._host = host;
- return this._discoverWebsocketPath()
- .then((urlPath) => this._connectWebsocket(urlPath));
+ const urlPath = await this._discoverWebsocketPath();
+ return this._connectWebsocket(urlPath);
}
- _discoverWebsocketPath() {
- return this._fetchJSON('/json')
- .then(([{ webSocketDebuggerUrl }]) =>
- URL.parse(webSocketDebuggerUrl).path);
+ async _discoverWebsocketPath() {
+ const { 0: { webSocketDebuggerUrl } } = await this._fetchJSON('/json');
+ return URL.parse(webSocketDebuggerUrl).path;
}
_connectWebsocket(urlPath) {
this.reset();
- const key1 = crypto.randomBytes(16).toString('base64');
+ const key1 = require('crypto').randomBytes(16).toString('base64');
debuglog('request websocket', key1);
const httpReq = this._http = http.request({
@@ -308,8 +320,8 @@ class Client extends EventEmitter {
port: this._port,
path: urlPath,
headers: {
- Connection: 'Upgrade',
- Upgrade: 'websocket',
+ 'Connection': 'Upgrade',
+ 'Upgrade': 'websocket',
'Sec-WebSocket-Key': key1,
'Sec-WebSocket-Version': '13',
},
diff --git a/deps/node-inspect/lib/internal/inspect_repl.js b/lib/internal/inspector/inspect_repl.js
similarity index 94%
rename from deps/node-inspect/lib/internal/inspect_repl.js
rename to lib/internal/inspector/inspect_repl.js
index bfbedf66a71b79..ab75abddd408db 100644
--- a/deps/node-inspect/lib/internal/inspect_repl.js
+++ b/lib/internal/inspector/inspect_repl.js
@@ -19,6 +19,10 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
+
+// TODO(trott): enable ESLint
+/* eslint-disable */
+
'use strict';
const FS = require('fs');
const Path = require('path');
@@ -86,11 +90,11 @@ function extractFunctionName(description) {
}
const PUBLIC_BUILTINS = require('module').builtinModules;
-const NATIVES = PUBLIC_BUILTINS ? process.binding('natives') : {};
+const NATIVES = PUBLIC_BUILTINS ? internalBinding('natives') : {};
function isNativeUrl(url) {
url = url.replace(/\.js$/, '');
if (PUBLIC_BUILTINS) {
- if (url.startsWith('internal/') || PUBLIC_BUILTINS.includes(url))
+ if (url.startsWith('node:internal/') || PUBLIC_BUILTINS.includes(url))
return true;
}
@@ -286,7 +290,7 @@ function aliasProperties(target, mapping) {
function createRepl(inspector) {
const { Debugger, HeapProfiler, Profiler, Runtime } = inspector;
- let repl; // eslint-disable-line prefer-const
+ let repl;
// Things we want to keep around
const history = { control: [], debug: [] };
@@ -316,9 +320,9 @@ function createRepl(inspector) {
return util.inspect(value, INSPECT_OPTIONS);
}
- function print(value, oneline = false) {
+ function print(value, addNewline = true) {
const text = typeof value === 'string' ? value : inspect(value);
- return inspector.print(text, oneline);
+ return inspector.print(text, addNewline);
}
function getCurrentLocation() {
@@ -349,6 +353,7 @@ function createRepl(inspector) {
})
.join('\n');
}
+
function listScripts(displayNatives = false) {
print(formatScripts(displayNatives));
}
@@ -398,9 +403,9 @@ function createRepl(inspector) {
const i = start + offset;
const isCurrent = i === (lineNumber + 1);
- const markedLine = isCurrent
- ? markSourceColumn(lineText, columnNumber, options.colors)
- : lineText;
+ const markedLine = isCurrent ?
+ markSourceColumn(lineText, columnNumber, options.colors) :
+ lineText;
let isBreakpoint = false;
knownBreakpoints.forEach(({ location }) => {
@@ -484,7 +489,7 @@ function createRepl(inspector) {
function prepareControlCode(input) {
if (input === '\n') return lastCommand;
- // exec process.title => exec("process.title");
+ // Add parentheses: exec process.title => exec("process.title");
const match = input.match(/^\s*exec\s+([^\n]*)/);
if (match) {
lastCommand = `exec(${JSON.stringify(match[1])})`;
@@ -577,7 +582,7 @@ function createRepl(inspector) {
const lines = watchedExpressions
.map((expr, idx) => {
const prefix = `${leftPad(idx, ' ', lastIndex)}: ${expr} =`;
- const value = inspect(values[idx], { colors: true });
+ const value = inspect(values[idx]);
if (value.indexOf('\n') === -1) {
return `${prefix} ${value}`;
}
@@ -674,13 +679,13 @@ function createRepl(inspector) {
// setBreakpoint('fn()'): Break when a function is called
if (script.endsWith('()')) {
const debugExpr = `debug(${script.slice(0, -2)})`;
- const debugCall = selectedFrame
- ? Debugger.evaluateOnCallFrame({
+ const debugCall = selectedFrame ?
+ Debugger.evaluateOnCallFrame({
callFrameId: selectedFrame.callFrameId,
expression: debugExpr,
includeCommandLineAPI: true,
- })
- : Runtime.evaluate({
+ }) :
+ Runtime.evaluate({
expression: debugExpr,
includeCommandLineAPI: true,
});
@@ -803,7 +808,7 @@ function createRepl(inspector) {
inspector.suspendReplWhile(() =>
Promise.all([formatWatchers(true), selectedFrame.list(2)])
- .then(([watcherList, context]) => {
+ .then(({ 0: watcherList, 1: context }) => {
if (watcherList) {
return `${watcherList}\n${inspect(context)}`;
}
@@ -825,9 +830,7 @@ function createRepl(inspector) {
Debugger.on('scriptParsed', (script) => {
const { scriptId, url } = script;
if (url) {
- knownScripts[scriptId] = Object.assign({
- isNative: isNativeUrl(url),
- }, script);
+ knownScripts[scriptId] = { isNative: isNativeUrl(url), ...script };
}
});
@@ -835,7 +838,7 @@ function createRepl(inspector) {
Profile.createAndRegister({ profile });
print([
'Captured new CPU profile.',
- `Access it with profiles[${profiles.length - 1}]`
+ `Access it with profiles[${profiles.length - 1}]`,
].join('\n'));
});
@@ -924,14 +927,16 @@ function createRepl(inspector) {
if (finished) {
print('Heap snaphost prepared.');
} else {
- print(`Heap snapshot: ${done}/${total}`, true);
+ print(`Heap snapshot: ${done}/${total}`, false);
}
}
+
function onChunk({ chunk }) {
sizeWritten += chunk.length;
writer.write(chunk);
- print(`Writing snapshot: ${sizeWritten}`, true);
+ print(`Writing snapshot: ${sizeWritten}`, false);
}
+
function onResolve() {
writer.end(() => {
teardown();
@@ -939,10 +944,12 @@ function createRepl(inspector) {
resolve();
});
}
+
function onReject(error) {
teardown();
reject(error);
}
+
function teardown() {
HeapProfiler.removeListener(
'reportHeapSnapshotProgress', onProgress);
@@ -952,7 +959,7 @@ function createRepl(inspector) {
HeapProfiler.on('reportHeapSnapshotProgress', onProgress);
HeapProfiler.on('addHeapSnapshotChunk', onChunk);
- print('Heap snapshot: 0/0', true);
+ print('Heap snapshot: 0/0', false);
HeapProfiler.takeHeapSnapshot({ reportProgress: true })
.then(onResolve, onReject);
});
@@ -1023,7 +1030,7 @@ function createRepl(inspector) {
repl.setPrompt('> ');
- print('Press Ctrl + C to leave debug repl');
+ print('Press Ctrl+C to leave debug repl');
repl.displayPrompt();
},
@@ -1058,19 +1065,16 @@ function createRepl(inspector) {
}
function initAfterStart() {
- const setupTasks = [
- Runtime.enable(),
- Profiler.enable(),
- Profiler.setSamplingInterval({ interval: 100 }),
- Debugger.enable(),
- Debugger.setPauseOnExceptions({ state: 'none' }),
- Debugger.setAsyncCallStackDepth({ maxDepth: 0 }),
- Debugger.setBlackboxPatterns({ patterns: [] }),
- Debugger.setPauseOnExceptions({ state: pauseOnExceptionState }),
- restoreBreakpoints(),
- Runtime.runIfWaitingForDebugger(),
- ];
- return Promise.all(setupTasks);
+ return Runtime.enable()
+ .then(() => Profiler.enable())
+ .then(() => Profiler.setSamplingInterval({ interval: 100 }))
+ .then(() => Debugger.enable())
+ .then(() => Debugger.setPauseOnExceptions({ state: 'none' }))
+ .then(() => Debugger.setAsyncCallStackDepth({ maxDepth: 0 }))
+ .then(() => Debugger.setBlackboxPatterns({ patterns: [] }))
+ .then(() => Debugger.setPauseOnExceptions({ state: pauseOnExceptionState }))
+ .then(() => restoreBreakpoints())
+ .then(() => Runtime.runIfWaitingForDebugger());
}
return function startRepl() {
@@ -1090,12 +1094,12 @@ function createRepl(inspector) {
ignoreUndefined: true,
};
- repl = Repl.start(replOptions); // eslint-disable-line prefer-const
+ repl = Repl.start(replOptions);
initializeContext(repl.context);
repl.on('reset', initializeContext);
repl.defineCommand('interrupt', () => {
- // We want this for testing purposes where sending CTRL-C can be tricky.
+ // We want this for testing purposes where sending Ctrl+C can be tricky.
repl.emit('SIGINT');
});
diff --git a/lib/internal/main/inspect.js b/lib/internal/main/inspect.js
index 4873683048cc79..d9dab0dc92b118 100644
--- a/lib/internal/main/inspect.js
+++ b/lib/internal/main/inspect.js
@@ -13,5 +13,5 @@ markBootstrapComplete();
// Start the debugger agent.
process.nextTick(() => {
- require('internal/deps/node-inspect/lib/_inspect').start();
+ require('internal/inspector/_inspect').start();
});
diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
index cd092381eaef73..e22fd17fa2d214 100644
--- a/lib/internal/main/worker_thread.js
+++ b/lib/internal/main/worker_thread.js
@@ -9,6 +9,7 @@ const {
ArrayPrototypeSplice,
ObjectDefineProperty,
PromisePrototypeCatch,
+ globalThis: { Atomics },
} = primordials;
const {
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index 61f6e9cb786e94..fbfc17ba6d1885 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -45,6 +45,7 @@ const {
ObjectPrototype,
ObjectPrototypeHasOwnProperty,
ObjectSetPrototypeOf,
+ Proxy,
ReflectApply,
ReflectSet,
RegExpPrototypeTest,
diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
index 43cc31c633c169..6d295089e42c70 100644
--- a/lib/internal/modules/esm/translators.js
+++ b/lib/internal/modules/esm/translators.js
@@ -1,7 +1,5 @@
'use strict';
-/* global WebAssembly */
-
const {
ArrayPrototypeForEach,
ArrayPrototypeMap,
@@ -21,6 +19,7 @@ const {
StringPrototypeSplit,
StringPrototypeStartsWith,
SyntaxErrorPrototype,
+ globalThis: { WebAssembly },
} = primordials;
let _TYPES = null;
@@ -63,6 +62,7 @@ const experimentalImportMetaResolve =
getOptionValue('--experimental-import-meta-resolve');
const asyncESM = require('internal/process/esm_loader');
const { emitWarningSync } = require('internal/process/warning');
+const { TextDecoder } = require('internal/encoding');
let cjsParse;
async function initCJSParse() {
diff --git a/lib/internal/per_context/primordials.js b/lib/internal/per_context/primordials.js
index f6832030381b6b..78f778b65703c5 100644
--- a/lib/internal/per_context/primordials.js
+++ b/lib/internal/per_context/primordials.js
@@ -137,6 +137,7 @@ function copyPrototype(src, dest, prefix) {
// Create copies of configurable value properties of the global object
[
+ 'Proxy',
'globalThis',
].forEach((name) => {
// eslint-disable-next-line no-restricted-globals
@@ -157,6 +158,7 @@ function copyPrototype(src, dest, prefix) {
[
'JSON',
'Math',
+ 'Proxy',
'Reflect',
].forEach((name) => {
// eslint-disable-next-line no-restricted-globals
diff --git a/lib/internal/perf/observe.js b/lib/internal/perf/observe.js
index 4d71666882a3ba..c96925c723f64e 100644
--- a/lib/internal/perf/observe.js
+++ b/lib/internal/perf/observe.js
@@ -72,6 +72,8 @@ const kDeprecationMessage =
const kTypeSingle = 0;
const kTypeMultiple = 1;
+let gcTrackingInstalled = false;
+
const kSupportedEntryTypes = ObjectFreeze([
'function',
'gc',
@@ -124,8 +126,11 @@ function maybeIncrementObserverCount(type) {
if (observerType !== undefined) {
observerCounts[observerType]++;
- if (observerType === NODE_PERFORMANCE_ENTRY_TYPE_GC)
+ if (!gcTrackingInstalled &&
+ observerType === NODE_PERFORMANCE_ENTRY_TYPE_GC) {
installGarbageCollectionTracking();
+ gcTrackingInstalled = true;
+ }
}
}
diff --git a/lib/internal/process/execution.js b/lib/internal/process/execution.js
index e370770643ca6f..e2d9898012d2d7 100644
--- a/lib/internal/process/execution.js
+++ b/lib/internal/process/execution.js
@@ -152,10 +152,13 @@ function createOnGlobalUncaughtException() {
try {
const report = internalBinding('report');
if (report != null && report.shouldReportOnUncaughtException()) {
- report.writeReport(er ? er.message : 'Exception',
- 'Exception',
- null,
- er ? er : {});
+ report.writeReport(
+ typeof er?.message === 'string' ?
+ er.message :
+ 'Exception',
+ 'Exception',
+ null,
+ er ? er : {});
}
} catch {} // Ignore the exception. Diagnostic reporting is unavailable.
}
diff --git a/lib/internal/readline/callbacks.js b/lib/internal/readline/callbacks.js
new file mode 100644
index 00000000000000..ae7cf0c07dda0b
--- /dev/null
+++ b/lib/internal/readline/callbacks.js
@@ -0,0 +1,132 @@
+'use strict';
+
+const {
+ NumberIsNaN,
+} = primordials;
+
+const {
+ codes: {
+ ERR_INVALID_ARG_VALUE,
+ ERR_INVALID_CURSOR_POS,
+ },
+} = require('internal/errors');
+
+const {
+ validateCallback,
+} = require('internal/validators');
+const {
+ CSI,
+} = require('internal/readline/utils');
+
+const {
+ kClearLine,
+ kClearScreenDown,
+ kClearToLineBeginning,
+ kClearToLineEnd,
+} = CSI;
+
+
+/**
+ * moves the cursor to the x and y coordinate on the given stream
+ */
+
+function cursorTo(stream, x, y, callback) {
+ if (callback !== undefined) {
+ validateCallback(callback);
+ }
+
+ if (typeof y === 'function') {
+ callback = y;
+ y = undefined;
+ }
+
+ if (NumberIsNaN(x)) throw new ERR_INVALID_ARG_VALUE('x', x);
+ if (NumberIsNaN(y)) throw new ERR_INVALID_ARG_VALUE('y', y);
+
+ if (stream == null || (typeof x !== 'number' && typeof y !== 'number')) {
+ if (typeof callback === 'function') process.nextTick(callback, null);
+ return true;
+ }
+
+ if (typeof x !== 'number') throw new ERR_INVALID_CURSOR_POS();
+
+ const data = typeof y !== 'number' ? CSI`${x + 1}G` : CSI`${y + 1};${x + 1}H`;
+ return stream.write(data, callback);
+}
+
+/**
+ * moves the cursor relative to its current location
+ */
+
+function moveCursor(stream, dx, dy, callback) {
+ if (callback !== undefined) {
+ validateCallback(callback);
+ }
+
+ if (stream == null || !(dx || dy)) {
+ if (typeof callback === 'function') process.nextTick(callback, null);
+ return true;
+ }
+
+ let data = '';
+
+ if (dx < 0) {
+ data += CSI`${-dx}D`;
+ } else if (dx > 0) {
+ data += CSI`${dx}C`;
+ }
+
+ if (dy < 0) {
+ data += CSI`${-dy}A`;
+ } else if (dy > 0) {
+ data += CSI`${dy}B`;
+ }
+
+ return stream.write(data, callback);
+}
+
+/**
+ * clears the current line the cursor is on:
+ * -1 for left of the cursor
+ * +1 for right of the cursor
+ * 0 for the entire line
+ */
+
+function clearLine(stream, dir, callback) {
+ if (callback !== undefined) {
+ validateCallback(callback);
+ }
+
+ if (stream === null || stream === undefined) {
+ if (typeof callback === 'function') process.nextTick(callback, null);
+ return true;
+ }
+
+ const type =
+ dir < 0 ? kClearToLineBeginning : dir > 0 ? kClearToLineEnd : kClearLine;
+ return stream.write(type, callback);
+}
+
+/**
+ * clears the screen from the current position of the cursor down
+ */
+
+function clearScreenDown(stream, callback) {
+ if (callback !== undefined) {
+ validateCallback(callback);
+ }
+
+ if (stream === null || stream === undefined) {
+ if (typeof callback === 'function') process.nextTick(callback, null);
+ return true;
+ }
+
+ return stream.write(kClearScreenDown, callback);
+}
+
+module.exports = {
+ clearLine,
+ clearScreenDown,
+ cursorTo,
+ moveCursor,
+};
diff --git a/lib/internal/readline/emitKeypressEvents.js b/lib/internal/readline/emitKeypressEvents.js
new file mode 100644
index 00000000000000..9c5a2554de9d22
--- /dev/null
+++ b/lib/internal/readline/emitKeypressEvents.js
@@ -0,0 +1,96 @@
+'use strict';
+
+const {
+ SafeStringIterator,
+ Symbol,
+} = primordials;
+
+const {
+ charLengthAt,
+ CSI,
+ emitKeys,
+} = require('internal/readline/utils');
+
+const { clearTimeout, setTimeout } = require('timers');
+const {
+ kEscape,
+} = CSI;
+
+const { StringDecoder } = require('string_decoder');
+
+const KEYPRESS_DECODER = Symbol('keypress-decoder');
+const ESCAPE_DECODER = Symbol('escape-decoder');
+
+// GNU readline library - keyseq-timeout is 500ms (default)
+const ESCAPE_CODE_TIMEOUT = 500;
+
+/**
+ * accepts a readable Stream instance and makes it emit "keypress" events
+ */
+
+function emitKeypressEvents(stream, iface = {}) {
+ if (stream[KEYPRESS_DECODER]) return;
+
+ stream[KEYPRESS_DECODER] = new StringDecoder('utf8');
+
+ stream[ESCAPE_DECODER] = emitKeys(stream);
+ stream[ESCAPE_DECODER].next();
+
+ const triggerEscape = () => stream[ESCAPE_DECODER].next('');
+ const { escapeCodeTimeout = ESCAPE_CODE_TIMEOUT } = iface;
+ let timeoutId;
+
+ function onData(input) {
+ if (stream.listenerCount('keypress') > 0) {
+ const string = stream[KEYPRESS_DECODER].write(input);
+ if (string) {
+ clearTimeout(timeoutId);
+
+ // This supports characters of length 2.
+ iface._sawKeyPress = charLengthAt(string, 0) === string.length;
+ iface.isCompletionEnabled = false;
+
+ let length = 0;
+ for (const character of new SafeStringIterator(string)) {
+ length += character.length;
+ if (length === string.length) {
+ iface.isCompletionEnabled = true;
+ }
+
+ try {
+ stream[ESCAPE_DECODER].next(character);
+ // Escape letter at the tail position
+ if (length === string.length && character === kEscape) {
+ timeoutId = setTimeout(triggerEscape, escapeCodeTimeout);
+ }
+ } catch (err) {
+ // If the generator throws (it could happen in the `keypress`
+ // event), we need to restart it.
+ stream[ESCAPE_DECODER] = emitKeys(stream);
+ stream[ESCAPE_DECODER].next();
+ throw err;
+ }
+ }
+ }
+ } else {
+ // Nobody's watching anyway
+ stream.removeListener('data', onData);
+ stream.on('newListener', onNewListener);
+ }
+ }
+
+ function onNewListener(event) {
+ if (event === 'keypress') {
+ stream.on('data', onData);
+ stream.removeListener('newListener', onNewListener);
+ }
+ }
+
+ if (stream.listenerCount('keypress') > 0) {
+ stream.on('data', onData);
+ } else {
+ stream.on('newListener', onNewListener);
+ }
+}
+
+module.exports = emitKeypressEvents;
diff --git a/lib/internal/repl/utils.js b/lib/internal/repl/utils.js
index 80c56144051e19..aff7dafe16e95a 100644
--- a/lib/internal/repl/utils.js
+++ b/lib/internal/repl/utils.js
@@ -41,7 +41,7 @@ const {
clearScreenDown,
cursorTo,
moveCursor,
-} = require('readline');
+} = require('internal/readline/callbacks');
const {
commonPrefix,
diff --git a/lib/internal/test/transfer.js b/lib/internal/test/transfer.js
new file mode 100644
index 00000000000000..b814c37fe6dc6d
--- /dev/null
+++ b/lib/internal/test/transfer.js
@@ -0,0 +1,42 @@
+'use strict';
+
+const {
+ makeTransferable,
+ kClone,
+ kDeserialize,
+} = require('internal/worker/js_transferable');
+
+process.emitWarning(
+ 'These APIs are for internal testing only. Do not use them.',
+ 'internal/test/transfer');
+
+// Used as part of parallel/test-messaging-maketransferable.
+// This has to exist within the lib/internal/ path in order
+// for deserialization to work.
+
+class E {
+ constructor(b) {
+ this.b = b;
+ }
+}
+
+class F extends E {
+ constructor(b) {
+ super(b);
+ /* eslint-disable-next-line no-constructor-return */
+ return makeTransferable(this);
+ }
+
+ [kClone]() {
+ return {
+ data: { b: this.b },
+ deserializeInfo: 'internal/test/transfer:F'
+ };
+ }
+
+ [kDeserialize]({ b }) {
+ this.b = b;
+ }
+}
+
+module.exports = { E, F };
diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
index dd9ef50228a296..73cac2caa51b8d 100644
--- a/lib/internal/util/inspect.js
+++ b/lib/internal/util/inspect.js
@@ -5,6 +5,7 @@ const {
ArrayIsArray,
ArrayPrototypeFilter,
ArrayPrototypeForEach,
+ ArrayPrototypePop,
ArrayPrototypePush,
ArrayPrototypePushApply,
ArrayPrototypeSort,
@@ -620,6 +621,7 @@ function addPrototypeProperties(ctx, main, obj, recurseTimes, output) {
}
// Get all own property names and symbols.
keys = ReflectOwnKeys(obj);
+ ArrayPrototypePush(ctx.seen, main);
for (const key of keys) {
// Ignore the `constructor` property and keys that exist on layers above.
if (key === 'constructor' ||
@@ -640,6 +642,7 @@ function addPrototypeProperties(ctx, main, obj, recurseTimes, output) {
ArrayPrototypePush(output, value);
}
}
+ ArrayPrototypePop(ctx.seen);
// Limit the inspection to up to three prototype layers. Using `recurseTimes`
// is not a good choice here, because it's as if the properties are declared
// on the current object from the users perspective.
diff --git a/lib/internal/v8_prof_polyfill.js b/lib/internal/v8_prof_polyfill.js
index 2b6b90c58d1147..21d9b932c10f4b 100644
--- a/lib/internal/v8_prof_polyfill.js
+++ b/lib/internal/v8_prof_polyfill.js
@@ -28,7 +28,7 @@
'use strict';
/* eslint-disable node-core/prefer-primordials */
-/* global Buffer, console */
+/* global console */
module.exports = { versionCheck };
@@ -40,6 +40,7 @@ if (module.id === 'internal/v8_prof_polyfill') return;
// Node polyfill
const fs = require('fs');
const cp = require('child_process');
+const { Buffer } = require('buffer');
const os = {
system: function(name, args) {
if (process.platform === 'linux' && name === 'nm') {
diff --git a/lib/internal/worker.js b/lib/internal/worker.js
index 0d60235395d9c0..f1da0d4ded4cea 100644
--- a/lib/internal/worker.js
+++ b/lib/internal/worker.js
@@ -1,7 +1,5 @@
'use strict';
-/* global SharedArrayBuffer */
-
const {
ArrayIsArray,
ArrayPrototypeForEach,
@@ -24,6 +22,7 @@ const {
SymbolFor,
TypedArrayPrototypeFill,
Uint32Array,
+ globalThis: { Atomics, SharedArrayBuffer },
} = primordials;
const EventEmitter = require('events');
diff --git a/lib/internal/worker/io.js b/lib/internal/worker/io.js
index fdfbe10b5fefcf..adacdd913c6693 100644
--- a/lib/internal/worker/io.js
+++ b/lib/internal/worker/io.js
@@ -41,6 +41,7 @@ const {
const { Readable, Writable } = require('stream');
const {
Event,
+ EventTarget,
NodeEventTarget,
defineEventHandler,
initNodeEventTarget,
diff --git a/lib/internal/worker/js_transferable.js b/lib/internal/worker/js_transferable.js
index ce95cf64e21987..7bd6c8cafc32e2 100644
--- a/lib/internal/worker/js_transferable.js
+++ b/lib/internal/worker/js_transferable.js
@@ -1,6 +1,11 @@
'use strict';
const {
Error,
+ ObjectDefineProperties,
+ ObjectGetOwnPropertyDescriptors,
+ ObjectGetPrototypeOf,
+ ObjectSetPrototypeOf,
+ ReflectConstruct,
StringPrototypeSplit,
} = primordials;
const {
@@ -22,21 +27,30 @@ function setup() {
const { 0: module, 1: ctor } = StringPrototypeSplit(deserializeInfo, ':');
const Ctor = require(module)[ctor];
if (typeof Ctor !== 'function' ||
- !(Ctor.prototype instanceof JSTransferable)) {
+ typeof Ctor.prototype[messaging_deserialize_symbol] !== 'function') {
// Not one of the official errors because one should not be able to get
// here without messing with Node.js internals.
// eslint-disable-next-line no-restricted-syntax
throw new Error(`Unknown deserialize spec ${deserializeInfo}`);
}
+
return new Ctor();
});
}
+function makeTransferable(obj) {
+ const inst = ReflectConstruct(JSTransferable, [], obj.constructor);
+ ObjectDefineProperties(inst, ObjectGetOwnPropertyDescriptors(obj));
+ ObjectSetPrototypeOf(inst, ObjectGetPrototypeOf(obj));
+ return inst;
+}
+
module.exports = {
+ makeTransferable,
setup,
JSTransferable,
kClone: messaging_clone_symbol,
kDeserialize: messaging_deserialize_symbol,
kTransfer: messaging_transfer_symbol,
- kTransferList: messaging_transfer_list_symbol
+ kTransferList: messaging_transfer_list_symbol,
};
diff --git a/lib/os.js b/lib/os.js
index 7e23110b3085ae..4396fcefd533c4 100644
--- a/lib/os.js
+++ b/lib/os.js
@@ -286,7 +286,7 @@ function networkInterfaces() {
}
/**
- * @param {number} pid
+ * @param {number} [pid=0]
* @param {number} priority
* @returns {void}
*/
@@ -306,7 +306,7 @@ function setPriority(pid, priority) {
}
/**
- * @param {number} pid
+ * @param {number} [pid=0]
* @returns {number}
*/
function getPriority(pid) {
@@ -325,9 +325,9 @@ function getPriority(pid) {
}
/**
- * @param {{ encoding?: string }} options If `encoding` is set to `'buffer'`,
- * the `username`, `shell`, and `homedir` values will be `Buffer` instances.
- * Default: `'utf8'`
+ * @param {{ encoding?: string }} [options=utf8] If `encoding` is set to
+ * `'buffer'`, the `username`, `shell`, and `homedir` values will
+ * be `Buffer` instances.
* @returns {{
* uid: number
* gid: number
diff --git a/lib/perf_hooks.js b/lib/perf_hooks.js
index 1f9a665a3ca006..a92a040f2de839 100644
--- a/lib/perf_hooks.js
+++ b/lib/perf_hooks.js
@@ -59,6 +59,15 @@ class Performance extends EventTarget {
timeOrigin: this.timeOrigin,
}, opts)}`;
}
+
+}
+
+function toJSON() {
+ return {
+ nodeTiming: this.nodeTiming,
+ timeOrigin: this.timeOrigin,
+ eventLoopUtilization: this.eventLoopUtilization()
+ };
}
class InternalPerformance extends EventTarget {}
@@ -105,6 +114,11 @@ ObjectDefineProperties(Performance.prototype, {
configurable: true,
enumerable: true,
value: timeOriginTimestamp,
+ },
+ toJSON: {
+ configurable: true,
+ enumerable: true,
+ value: toJSON,
}
});
diff --git a/lib/readline.js b/lib/readline.js
index 582fc26baf7a97..30762bb0bf71a9 100644
--- a/lib/readline.js
+++ b/lib/readline.js
@@ -65,6 +65,14 @@ const {
SafeStringIterator,
} = primordials;
+const {
+ clearLine,
+ clearScreenDown,
+ cursorTo,
+ moveCursor,
+} = require('internal/readline/callbacks');
+const emitKeypressEvents = require('internal/readline/emitKeypressEvents');
+
const {
AbortError,
codes
@@ -72,12 +80,10 @@ const {
const {
ERR_INVALID_ARG_VALUE,
- ERR_INVALID_CURSOR_POS,
} = codes;
const {
validateAbortSignal,
validateArray,
- validateCallback,
validateString,
validateUint32,
} = require('internal/validators');
@@ -91,23 +97,11 @@ const {
charLengthAt,
charLengthLeft,
commonPrefix,
- CSI,
- emitKeys,
kSubstringSearch,
} = require('internal/readline/utils');
const { promisify } = require('internal/util');
-const { clearTimeout, setTimeout } = require('timers');
-const {
- kEscape,
- kClearToLineBeginning,
- kClearToLineEnd,
- kClearLine,
- kClearScreenDown
-} = CSI;
-
-
const { StringDecoder } = require('string_decoder');
// Lazy load Readable for startup performance.
@@ -121,9 +115,6 @@ const lineEnding = /\r?\n|\r(?!\n)/;
const kLineObjectStream = Symbol('line object stream');
const kQuestionCancel = Symbol('kQuestionCancel');
-const KEYPRESS_DECODER = Symbol('keypress-decoder');
-const ESCAPE_DECODER = Symbol('escape-decoder');
-
// GNU readline library - keyseq-timeout is 500ms (default)
const ESCAPE_CODE_TIMEOUT = 500;
@@ -1244,183 +1235,6 @@ Interface.prototype[SymbolAsyncIterator] = function() {
return this[kLineObjectStream][SymbolAsyncIterator]();
};
-/**
- * accepts a readable Stream instance and makes it emit "keypress" events
- */
-
-function emitKeypressEvents(stream, iface = {}) {
- if (stream[KEYPRESS_DECODER]) return;
-
- stream[KEYPRESS_DECODER] = new StringDecoder('utf8');
-
- stream[ESCAPE_DECODER] = emitKeys(stream);
- stream[ESCAPE_DECODER].next();
-
- const triggerEscape = () => stream[ESCAPE_DECODER].next('');
- const { escapeCodeTimeout = ESCAPE_CODE_TIMEOUT } = iface;
- let timeoutId;
-
- function onData(input) {
- if (stream.listenerCount('keypress') > 0) {
- const string = stream[KEYPRESS_DECODER].write(input);
- if (string) {
- clearTimeout(timeoutId);
-
- // This supports characters of length 2.
- iface._sawKeyPress = charLengthAt(string, 0) === string.length;
- iface.isCompletionEnabled = false;
-
- let length = 0;
- for (const character of new SafeStringIterator(string)) {
- length += character.length;
- if (length === string.length) {
- iface.isCompletionEnabled = true;
- }
-
- try {
- stream[ESCAPE_DECODER].next(character);
- // Escape letter at the tail position
- if (length === string.length && character === kEscape) {
- timeoutId = setTimeout(triggerEscape, escapeCodeTimeout);
- }
- } catch (err) {
- // If the generator throws (it could happen in the `keypress`
- // event), we need to restart it.
- stream[ESCAPE_DECODER] = emitKeys(stream);
- stream[ESCAPE_DECODER].next();
- throw err;
- }
- }
- }
- } else {
- // Nobody's watching anyway
- stream.removeListener('data', onData);
- stream.on('newListener', onNewListener);
- }
- }
-
- function onNewListener(event) {
- if (event === 'keypress') {
- stream.on('data', onData);
- stream.removeListener('newListener', onNewListener);
- }
- }
-
- if (stream.listenerCount('keypress') > 0) {
- stream.on('data', onData);
- } else {
- stream.on('newListener', onNewListener);
- }
-}
-
-/**
- * moves the cursor to the x and y coordinate on the given stream
- */
-
-function cursorTo(stream, x, y, callback) {
- if (callback !== undefined) {
- validateCallback(callback);
- }
-
- if (typeof y === 'function') {
- callback = y;
- y = undefined;
- }
-
- if (NumberIsNaN(x))
- throw new ERR_INVALID_ARG_VALUE('x', x);
- if (NumberIsNaN(y))
- throw new ERR_INVALID_ARG_VALUE('y', y);
-
- if (stream == null || (typeof x !== 'number' && typeof y !== 'number')) {
- if (typeof callback === 'function')
- process.nextTick(callback, null);
- return true;
- }
-
- if (typeof x !== 'number')
- throw new ERR_INVALID_CURSOR_POS();
-
- const data = typeof y !== 'number' ? CSI`${x + 1}G` : CSI`${y + 1};${x + 1}H`;
- return stream.write(data, callback);
-}
-
-/**
- * moves the cursor relative to its current location
- */
-
-function moveCursor(stream, dx, dy, callback) {
- if (callback !== undefined) {
- validateCallback(callback);
- }
-
- if (stream == null || !(dx || dy)) {
- if (typeof callback === 'function')
- process.nextTick(callback, null);
- return true;
- }
-
- let data = '';
-
- if (dx < 0) {
- data += CSI`${-dx}D`;
- } else if (dx > 0) {
- data += CSI`${dx}C`;
- }
-
- if (dy < 0) {
- data += CSI`${-dy}A`;
- } else if (dy > 0) {
- data += CSI`${dy}B`;
- }
-
- return stream.write(data, callback);
-}
-
-/**
- * clears the current line the cursor is on:
- * -1 for left of the cursor
- * +1 for right of the cursor
- * 0 for the entire line
- */
-
-function clearLine(stream, dir, callback) {
- if (callback !== undefined) {
- validateCallback(callback);
- }
-
- if (stream === null || stream === undefined) {
- if (typeof callback === 'function')
- process.nextTick(callback, null);
- return true;
- }
-
- const type = dir < 0 ?
- kClearToLineBeginning :
- dir > 0 ?
- kClearToLineEnd :
- kClearLine;
- return stream.write(type, callback);
-}
-
-/**
- * clears the screen from the current position of the cursor down
- */
-
-function clearScreenDown(stream, callback) {
- if (callback !== undefined) {
- validateCallback(callback);
- }
-
- if (stream === null || stream === undefined) {
- if (typeof callback === 'function')
- process.nextTick(callback, null);
- return true;
- }
-
- return stream.write(kClearScreenDown, callback);
-}
-
module.exports = {
Interface,
clearLine,
diff --git a/lib/repl.js b/lib/repl.js
index 26d992adbae0fc..cf544fb224a446 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -889,8 +889,11 @@ function REPLServer(prompt,
self.output.write(self.writer(ret) + '\n');
}
- // Display prompt again
- self.displayPrompt();
+ // Display prompt again (unless we already did by emitting the 'error'
+ // event on the domain instance).
+ if (!e) {
+ self.displayPrompt();
+ }
}
});
diff --git a/lib/timers/promises.js b/lib/timers/promises.js
index ec13e873d8443c..1f245580f86ab5 100644
--- a/lib/timers/promises.js
+++ b/lib/timers/promises.js
@@ -61,8 +61,7 @@ function setTimeout(after, value, options = {}) {
}
let oncancel;
const ret = new Promise((resolve, reject) => {
- const timeout = new Timeout(resolve, after, args, false, true);
- if (!ref) timeout.unref();
+ const timeout = new Timeout(resolve, after, args, false, ref);
insert(timeout, timeout._idleTimeout);
if (signal) {
oncancel = FunctionPrototypeBind(cancelListenerHandler,
@@ -141,8 +140,7 @@ async function* setInterval(after, value, options = {}) {
callback();
callback = undefined;
}
- }, after, undefined, true, true);
- if (!ref) interval.unref();
+ }, after, undefined, true, ref);
insert(interval, interval._idleTimeout);
if (signal) {
onCancel = () => {
diff --git a/lib/util.js b/lib/util.js
index f3c10bb7720e58..bcb1c81933c0c0 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -74,51 +74,109 @@ const {
let internalDeepEqual;
+/**
+ * @deprecated since v4.0.0
+ * @param {any} arg
+ * @returns {arg is boolean}
+ */
function isBoolean(arg) {
return typeof arg === 'boolean';
}
+/**
+ * @deprecated since v4.0.0
+ * @param {any} arg
+ * @returns {arg is null}
+ */
function isNull(arg) {
return arg === null;
}
+/**
+ * @deprecated since v4.0.0
+ * @param {any} arg
+ * @returns {arg is (null | undefined)}
+ */
function isNullOrUndefined(arg) {
return arg === null || arg === undefined;
}
+/**
+ * @deprecated since v4.0.0
+ * @param {any} arg
+ * @returns {arg is number}
+ */
function isNumber(arg) {
return typeof arg === 'number';
}
+/**
+ * @param {any} arg
+ * @returns {arg is string}
+ */
function isString(arg) {
return typeof arg === 'string';
}
+/**
+ * @deprecated since v4.0.0
+ * @param {any} arg
+ * @returns {arg is symbol}
+ */
function isSymbol(arg) {
return typeof arg === 'symbol';
}
+/**
+ * @deprecated since v4.0.0
+ * @param {any} arg
+ * @returns {arg is undefined}
+ */
function isUndefined(arg) {
return arg === undefined;
}
+/**
+ * @deprecated since v4.0.0
+ * @param {any} arg
+ * @returns {a is NonNullable}
+ */
function isObject(arg) {
return arg !== null && typeof arg === 'object';
}
+/**
+ * @deprecated since v4.0.0
+ * @param {any} e
+ * @returns {arg is Error}
+ */
function isError(e) {
return ObjectPrototypeToString(e) === '[object Error]' || e instanceof Error;
}
+/**
+ * @deprecated since v4.0.0
+ * @param {any} arg
+ * @returns {arg is Function}
+ */
function isFunction(arg) {
return typeof arg === 'function';
}
+/**
+ * @deprecated since v4.0.0
+ * @param {any} arg
+ * @returns {arg is (boolean | null | number | string | symbol | undefined)}
+ */
function isPrimitive(arg) {
return arg === null ||
(typeof arg !== 'object' && typeof arg !== 'function');
}
+/**
+ * @param {number} n
+ * @returns {string}
+ */
function pad(n) {
return StringPrototypePadStart(n.toString(), 2, '0');
}
@@ -126,7 +184,9 @@ function pad(n) {
const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
'Oct', 'Nov', 'Dec'];
-// 26 Feb 16:19:34
+/**
+ * @returns {string} 26 Feb 16:19:34
+ */
function timestamp() {
const d = new Date();
const t = ArrayPrototypeJoin([
@@ -138,7 +198,11 @@ function timestamp() {
}
let console;
-// Log is just a thin wrapper to console.log that prepends a timestamp
+/**
+ * Log is just a thin wrapper to console.log that prepends a timestamp
+ * @deprecated since v6.0.0
+ * @type {(...args: any[]) => void}
+ */
function log(...args) {
if (!console) {
console = require('internal/console/global');
@@ -155,9 +219,9 @@ function log(...args) {
* functions as prototype setup using normal JavaScript does not work as
* expected during bootstrapping (see mirror.js in r114903).
*
- * @param {function} ctor Constructor function which needs to inherit the
+ * @param {Function} ctor Constructor function which needs to inherit the
* prototype.
- * @param {function} superCtor Constructor function to inherit prototype from.
+ * @param {Function} superCtor Constructor function to inherit prototype from.
* @throws {TypeError} Will error if either constructor is null, or if
* the super constructor lacks a prototype.
*/
@@ -181,6 +245,14 @@ function inherits(ctor, superCtor) {
ObjectSetPrototypeOf(ctor.prototype, superCtor.prototype);
}
+/**
+ * @deprecated since v6.0.0
+ * @template T
+ * @template S
+ * @param {T} target
+ * @param {S} source
+ * @returns {S extends null ? T : (T & S)}
+ */
function _extend(target, source) {
// Don't do anything if source isn't an object
if (source === null || typeof source !== 'object') return target;
@@ -204,6 +276,14 @@ const callbackifyOnRejected = hideStackFrames((reason, cb) => {
return cb(reason);
});
+/**
+ * @template {(...args: any[]) => Promise} T
+ * @param {T} original
+ * @returns {T extends (...args: infer TArgs) => Promise ?
+ * ((...params: [...TArgs, ((err: Error, ret: TReturn) => any)]) => void) :
+ * never
+ * }
+ */
function callbackify(original) {
if (typeof original !== 'function') {
throw new ERR_INVALID_ARG_TYPE('original', 'Function', original);
@@ -238,6 +318,10 @@ function callbackify(original) {
return callbackified;
}
+/**
+ * @param {number} err
+ * @returns {string}
+ */
function getSystemErrorName(err) {
validateNumber(err, 'err');
if (err >= 0 || !NumberIsSafeInteger(err)) {
diff --git a/lib/zlib.js b/lib/zlib.js
index 5fcd736f6652a1..c0c7f601758224 100644
--- a/lib/zlib.js
+++ b/lib/zlib.js
@@ -89,7 +89,7 @@ const {
BROTLI_DECODE, BROTLI_ENCODE,
// Brotli operations (~flush levels)
BROTLI_OPERATION_PROCESS, BROTLI_OPERATION_FLUSH,
- BROTLI_OPERATION_FINISH
+ BROTLI_OPERATION_FINISH, BROTLI_OPERATION_EMIT_METADATA,
} = constants;
// Translation table for return codes.
@@ -238,6 +238,13 @@ const checkRangesOrGetDefault = hideStackFrames(
}
);
+const FLUSH_BOUND = [
+ [ Z_NO_FLUSH, Z_BLOCK ],
+ [ BROTLI_OPERATION_PROCESS, BROTLI_OPERATION_EMIT_METADATA ],
+];
+const FLUSH_BOUND_IDX_NORMAL = 0;
+const FLUSH_BOUND_IDX_BROTLI = 1;
+
// The base class for all Zlib-style streams.
function ZlibBase(opts, mode, handle, { flush, finishFlush, fullFlush }) {
let chunkSize = Z_DEFAULT_CHUNK;
@@ -247,6 +254,13 @@ function ZlibBase(opts, mode, handle, { flush, finishFlush, fullFlush }) {
assert(typeof mode === 'number');
assert(mode >= DEFLATE && mode <= BROTLI_ENCODE);
+ let flushBoundIdx;
+ if (mode !== BROTLI_ENCODE && mode !== BROTLI_DECODE) {
+ flushBoundIdx = FLUSH_BOUND_IDX_NORMAL;
+ } else {
+ flushBoundIdx = FLUSH_BOUND_IDX_BROTLI;
+ }
+
if (opts) {
chunkSize = opts.chunkSize;
if (!checkFiniteNumber(chunkSize, 'options.chunkSize')) {
@@ -258,11 +272,12 @@ function ZlibBase(opts, mode, handle, { flush, finishFlush, fullFlush }) {
flush = checkRangesOrGetDefault(
opts.flush, 'options.flush',
- Z_NO_FLUSH, Z_BLOCK, flush);
+ FLUSH_BOUND[flushBoundIdx][0], FLUSH_BOUND[flushBoundIdx][1], flush);
finishFlush = checkRangesOrGetDefault(
opts.finishFlush, 'options.finishFlush',
- Z_NO_FLUSH, Z_BLOCK, finishFlush);
+ FLUSH_BOUND[flushBoundIdx][0], FLUSH_BOUND[flushBoundIdx][1],
+ finishFlush);
maxOutputLength = checkRangesOrGetDefault(
opts.maxOutputLength, 'options.maxOutputLength',
diff --git a/node.gyp b/node.gyp
index acae34fa393339..642a9767fb64d8 100644
--- a/node.gyp
+++ b/node.gyp
@@ -166,6 +166,9 @@
'lib/internal/heap_utils.js',
'lib/internal/histogram.js',
'lib/internal/idna.js',
+ 'lib/internal/inspector/_inspect.js',
+ 'lib/internal/inspector/inspect_client.js',
+ 'lib/internal/inspector/inspect_repl.js',
'lib/internal/inspector_async_hook.js',
'lib/internal/js_stream_socket.js',
'lib/internal/legacy/processbinding.js',
@@ -215,6 +218,8 @@
'lib/internal/process/signal.js',
'lib/internal/process/task_queues.js',
'lib/internal/querystring.js',
+ 'lib/internal/readline/callbacks.js',
+ 'lib/internal/readline/emitKeypressEvents.js',
'lib/internal/readline/utils.js',
'lib/internal/repl.js',
'lib/internal/repl/await.js',
@@ -226,6 +231,7 @@
'lib/internal/source_map/source_map.js',
'lib/internal/source_map/source_map_cache.js',
'lib/internal/test/binding.js',
+ 'lib/internal/test/transfer.js',
'lib/internal/timers.js',
'lib/internal/tls.js',
'lib/internal/trace_events_async_hooks.js',
@@ -277,9 +283,6 @@
'deps/v8/tools/tickprocessor.mjs',
'deps/v8/tools/sourcemap.mjs',
'deps/v8/tools/tickprocessor-driver.mjs',
- 'deps/node-inspect/lib/_inspect.js',
- 'deps/node-inspect/lib/internal/inspect_client.js',
- 'deps/node-inspect/lib/internal/inspect_repl.js',
'deps/acorn/acorn/dist/acorn.js',
'deps/acorn/acorn-walk/dist/walk.js',
'deps/acorn-plugins/acorn-class-fields/index.js',
diff --git a/src/crypto/crypto_cipher.cc b/src/crypto/crypto_cipher.cc
index b15795b691ea0b..5ce466582823ae 100644
--- a/src/crypto/crypto_cipher.cc
+++ b/src/crypto/crypto_cipher.cc
@@ -511,10 +511,10 @@ bool CipherBase::InitAuthenticated(
if (mode == EVP_CIPH_GCM_MODE) {
if (auth_tag_len != kNoAuthTagLength) {
if (!IsValidGCMTagLength(auth_tag_len)) {
- char msg[50];
- snprintf(msg, sizeof(msg),
- "Invalid authentication tag length: %u", auth_tag_len);
- THROW_ERR_CRYPTO_INVALID_AUTH_TAG(env(), msg);
+ THROW_ERR_CRYPTO_INVALID_AUTH_TAG(
+ env(),
+ "Invalid authentication tag length: %u",
+ auth_tag_len);
return false;
}
@@ -523,9 +523,8 @@ bool CipherBase::InitAuthenticated(
}
} else {
if (auth_tag_len == kNoAuthTagLength) {
- char msg[128];
- snprintf(msg, sizeof(msg), "authTagLength required for %s", cipher_type);
- THROW_ERR_CRYPTO_INVALID_AUTH_TAG(env(), msg);
+ THROW_ERR_CRYPTO_INVALID_AUTH_TAG(
+ env(), "authTagLength required for %s", cipher_type);
return false;
}
@@ -633,10 +632,8 @@ void CipherBase::SetAuthTag(const FunctionCallbackInfo& args) {
}
if (!is_valid) {
- char msg[50];
- snprintf(msg, sizeof(msg),
- "Invalid authentication tag length: %u", tag_len);
- return THROW_ERR_CRYPTO_INVALID_AUTH_TAG(env, msg);
+ return THROW_ERR_CRYPTO_INVALID_AUTH_TAG(
+ env, "Invalid authentication tag length: %u", tag_len);
}
cipher->auth_tag_len_ = tag_len;
diff --git a/src/crypto/crypto_common.cc b/src/crypto/crypto_common.cc
index 1b863a1241edb3..f4b7bd3ad8548a 100644
--- a/src/crypto/crypto_common.cc
+++ b/src/crypto/crypto_common.cc
@@ -480,8 +480,16 @@ MaybeLocal GetLastIssuedCert(
return MaybeLocal();
issuer_chain = ca_info;
+ // Take the value of cert->get() before the call to cert->reset()
+ // in order to compare it to ca after and provide a way to exit this loop
+ // in case it gets stuck.
+ X509* value_before_reset = cert->get();
+
// Delete previous cert and continue aggregating issuers.
cert->reset(ca);
+
+ if (value_before_reset == ca)
+ break;
}
return MaybeLocal(issuer_chain);
}
diff --git a/src/crypto/crypto_dsa.cc b/src/crypto/crypto_dsa.cc
index 6ee8cf7e18c02e..271db427fa8539 100644
--- a/src/crypto/crypto_dsa.cc
+++ b/src/crypto/crypto_dsa.cc
@@ -84,9 +84,7 @@ Maybe DsaKeyGenTraits::AdditionalConfig(
params->params.modulus_bits = args[*offset].As()->Value();
params->params.divisor_bits = args[*offset + 1].As()->Value();
if (params->params.divisor_bits < -1) {
- char msg[1024];
- snprintf(msg, sizeof(msg), "invalid value for divisor_bits");
- THROW_ERR_OUT_OF_RANGE(env, msg);
+ THROW_ERR_OUT_OF_RANGE(env, "invalid value for divisor_bits");
return Nothing();
}
diff --git a/src/crypto/crypto_hash.cc b/src/crypto/crypto_hash.cc
index 664ffb847215af..ba2c52268a23ff 100644
--- a/src/crypto/crypto_hash.cc
+++ b/src/crypto/crypto_hash.cc
@@ -233,9 +233,7 @@ Maybe HashTraits::AdditionalConfig(
Utf8Value digest(env->isolate(), args[offset]);
params->digest = EVP_get_digestbyname(*digest);
if (UNLIKELY(params->digest == nullptr)) {
- char msg[1024];
- snprintf(msg, sizeof(msg), "Invalid digest: %s", *digest);
- THROW_ERR_CRYPTO_INVALID_DIGEST(env);
+ THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *digest);
return Nothing();
}
diff --git a/src/crypto/crypto_keys.cc b/src/crypto/crypto_keys.cc
index be12022bdb7f1d..21cc988cee6a18 100644
--- a/src/crypto/crypto_keys.cc
+++ b/src/crypto/crypto_keys.cc
@@ -515,9 +515,7 @@ std::shared_ptr ImportJWKAsymmetricKey(
return ImportJWKEcKey(env, jwk, args, offset);
}
- char msg[1024];
- snprintf(msg, sizeof(msg), "%s is not a supported JWK key type", kty);
- THROW_ERR_CRYPTO_INVALID_JWK(env, msg);
+ THROW_ERR_CRYPTO_INVALID_JWK(env, "%s is not a supported JWK key type", kty);
return std::shared_ptr();
}
diff --git a/src/crypto/crypto_pbkdf2.cc b/src/crypto/crypto_pbkdf2.cc
index cc9a0d072ad13c..495722927ab5be 100644
--- a/src/crypto/crypto_pbkdf2.cc
+++ b/src/crypto/crypto_pbkdf2.cc
@@ -92,26 +92,20 @@ Maybe PBKDF2Traits::AdditionalConfig(
params->iterations = args[offset + 2].As()->Value();
if (params->iterations < 0) {
- char msg[1024];
- snprintf(msg, sizeof(msg), "iterations must be <= %d", INT_MAX);
- THROW_ERR_OUT_OF_RANGE(env, msg);
+ THROW_ERR_OUT_OF_RANGE(env, "iterations must be <= %d", INT_MAX);
return Nothing();
}
params->length = args[offset + 3].As()->Value();
if (params->length < 0) {
- char msg[1024];
- snprintf(msg, sizeof(msg), "length must be <= %d", INT_MAX);
- THROW_ERR_OUT_OF_RANGE(env, msg);
+ THROW_ERR_OUT_OF_RANGE(env, "length must be <= %d", INT_MAX);
return Nothing();
}
Utf8Value name(args.GetIsolate(), args[offset + 4]);
params->digest = EVP_get_digestbyname(*name);
if (params->digest == nullptr) {
- char errmsg[1024];
- snprintf(errmsg, sizeof(errmsg), "Invalid digest: %s", *name);
- THROW_ERR_CRYPTO_INVALID_DIGEST(env, errmsg);
+ THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *name);
return Nothing();
}
diff --git a/src/crypto/crypto_rsa.cc b/src/crypto/crypto_rsa.cc
index a77ded918ebdda..5fa91cce1a6ad2 100644
--- a/src/crypto/crypto_rsa.cc
+++ b/src/crypto/crypto_rsa.cc
@@ -138,9 +138,7 @@ Maybe RsaKeyGenTraits::AdditionalConfig(
Utf8Value digest(env->isolate(), args[*offset]);
params->params.md = EVP_get_digestbyname(*digest);
if (params->params.md == nullptr) {
- char msg[1024];
- snprintf(msg, sizeof(msg), "md specifies an invalid digest");
- THROW_ERR_CRYPTO_INVALID_DIGEST(env, msg);
+ THROW_ERR_CRYPTO_INVALID_DIGEST(env, "md specifies an invalid digest");
return Nothing();
}
}
@@ -150,9 +148,8 @@ Maybe RsaKeyGenTraits::AdditionalConfig(
Utf8Value digest(env->isolate(), args[*offset + 1]);
params->params.mgf1_md = EVP_get_digestbyname(*digest);
if (params->params.mgf1_md == nullptr) {
- char msg[1024];
- snprintf(msg, sizeof(msg), "mgf1_md specifies an invalid digest");
- THROW_ERR_CRYPTO_INVALID_DIGEST(env, msg);
+ THROW_ERR_CRYPTO_INVALID_DIGEST(env,
+ "mgf1_md specifies an invalid digest");
return Nothing();
}
}
@@ -161,9 +158,9 @@ Maybe RsaKeyGenTraits::AdditionalConfig(
CHECK(args[*offset + 2]->IsInt32());
params->params.saltlen = args[*offset + 2].As()->Value();
if (params->params.saltlen < 0) {
- char msg[1024];
- snprintf(msg, sizeof(msg), "salt length is out of range");
- THROW_ERR_OUT_OF_RANGE(env, msg);
+ THROW_ERR_OUT_OF_RANGE(
+ env,
+ "salt length is out of range");
return Nothing();
}
}
diff --git a/src/crypto/crypto_scrypt.cc b/src/crypto/crypto_scrypt.cc
index 39d6b3fd0d8d6a..077c26554b2f1f 100644
--- a/src/crypto/crypto_scrypt.cc
+++ b/src/crypto/crypto_scrypt.cc
@@ -111,9 +111,7 @@ Maybe ScryptTraits::AdditionalConfig(
params->length = args[offset + 6].As()->Value();
if (params->length < 0) {
- char msg[1024];
- snprintf(msg, sizeof(msg), "length must be <= %d", INT_MAX);
- THROW_ERR_OUT_OF_RANGE(env, msg);
+ THROW_ERR_OUT_OF_RANGE(env, "length must be <= %d", INT_MAX);
return Nothing();
}
@@ -151,4 +149,3 @@ bool ScryptTraits::DeriveBits(
} // namespace crypto
} // namespace node
-
diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
index 2226c432839e18..4b30c177bea55c 100644
--- a/src/inspector_agent.cc
+++ b/src/inspector_agent.cc
@@ -898,13 +898,6 @@ void Agent::ContextCreated(Local context, const ContextInfo& info) {
client_->contextCreated(context, info);
}
-bool Agent::WillWaitForConnect() {
- if (debug_options_.wait_for_connect()) return true;
- if (parent_handle_)
- return parent_handle_->WaitForConnect();
- return false;
-}
-
bool Agent::IsActive() {
if (client_ == nullptr)
return false;
diff --git a/src/inspector_agent.h b/src/inspector_agent.h
index 08b8817f436286..1c8d496ba27a9e 100644
--- a/src/inspector_agent.h
+++ b/src/inspector_agent.h
@@ -59,8 +59,6 @@ class Agent {
// --inspect command line flag) or if inspector JS API had been used.
bool IsActive();
- // Option is set to wait for session connection
- bool WillWaitForConnect();
// Blocks till frontend connects and sends "runIfWaitingForDebugger"
void WaitForConnect();
// Blocks till all the sessions with "WaitForDisconnectOnShutdown" disconnect
diff --git a/src/large_pages/node_text_start.S b/src/large_pages/node_text_start.S
index 3227b62464932c..d27dd39cc236f0 100644
--- a/src/large_pages/node_text_start.S
+++ b/src/large_pages/node_text_start.S
@@ -1,5 +1,5 @@
#if defined(__ELF__)
-.section .note.GNU-stack,"",@progbits
+.section .note.GNU-stack,"",%progbits
#endif
.text
.align 0x2000
diff --git a/src/node_buffer.cc b/src/node_buffer.cc
index 485e273f2fbe9e..9006c1de767533 100644
--- a/src/node_buffer.cc
+++ b/src/node_buffer.cc
@@ -303,28 +303,36 @@ MaybeLocal New(Isolate* isolate,
if (!StringBytes::Size(isolate, string, enc).To(&length))
return Local();
size_t actual = 0;
- char* data = nullptr;
+ std::unique_ptr store;
if (length > 0) {
- data = UncheckedMalloc(length);
+ store = ArrayBuffer::NewBackingStore(isolate, length);
- if (data == nullptr) {
+ if (UNLIKELY(!store)) {
THROW_ERR_MEMORY_ALLOCATION_FAILED(isolate);
return Local();
}
- actual = StringBytes::Write(isolate, data, length, string, enc);
+ actual = StringBytes::Write(
+ isolate,
+ static_cast(store->Data()),
+ length,
+ string,
+ enc);
CHECK(actual <= length);
- if (actual == 0) {
- free(data);
- data = nullptr;
- } else if (actual < length) {
- data = node::Realloc(data, actual);
+ if (LIKELY(actual > 0)) {
+ if (actual < length)
+ store = BackingStore::Reallocate(isolate, std::move(store), actual);
+ Local buf = ArrayBuffer::New(isolate, std::move(store));
+ Local obj;
+ if (UNLIKELY(!New(isolate, buf, 0, actual).ToLocal(&obj)))
+ return MaybeLocal();
+ return scope.Escape(obj);
}
}
- return scope.EscapeMaybe(New(isolate, data, actual));
+ return scope.EscapeMaybe(New(isolate, 0));
}
diff --git a/src/node_i18n.cc b/src/node_i18n.cc
index 48f95ceb68d9c1..42e618ac30181f 100644
--- a/src/node_i18n.cc
+++ b/src/node_i18n.cc
@@ -148,8 +148,13 @@ MaybeLocal Transcode(Environment* env,
*status = U_ZERO_ERROR;
MaybeLocal ret;
MaybeStackBuffer result;
- Converter to(toEncoding, "?");
+ Converter to(toEncoding);
Converter from(fromEncoding);
+
+ size_t sublen = ucnv_getMinCharSize(to.conv());
+ std::string sub(sublen, '?');
+ to.set_subst_chars(sub.c_str());
+
const uint32_t limit = source_length * to.max_char_size();
result.AllocateSufficientStorage(limit);
char* target = *result;
@@ -190,7 +195,12 @@ MaybeLocal TranscodeFromUcs2(Environment* env,
*status = U_ZERO_ERROR;
MaybeStackBuffer sourcebuf;
MaybeLocal ret;
- Converter to(toEncoding, "?");
+ Converter to(toEncoding);
+
+ size_t sublen = ucnv_getMinCharSize(to.conv());
+ std::string sub(sublen, '?');
+ to.set_subst_chars(sub.c_str());
+
const size_t length_in_chars = source_length / sizeof(UChar);
CopySourceBuffer(&sourcebuf, source, source_length, length_in_chars);
MaybeStackBuffer destbuf(length_in_chars);
diff --git a/src/node_report.cc b/src/node_report.cc
index 13f87b1e52e5d6..0144d22c17d13b 100644
--- a/src/node_report.cc
+++ b/src/node_report.cc
@@ -39,10 +39,15 @@ using node::TIME_TYPE;
using node::worker::Worker;
using v8::Array;
using v8::Context;
+using v8::HandleScope;
using v8::HeapSpaceStatistics;
using v8::HeapStatistics;
using v8::Isolate;
+using v8::Just;
using v8::Local;
+using v8::Maybe;
+using v8::MaybeLocal;
+using v8::Nothing;
using v8::Object;
using v8::String;
using v8::TryCatch;
@@ -58,16 +63,16 @@ static void WriteNodeReport(Isolate* isolate,
const char* trigger,
const std::string& filename,
std::ostream& out,
- Local error,
+ Local error,
bool compact);
static void PrintVersionInformation(JSONWriter* writer);
static void PrintJavaScriptErrorStack(JSONWriter* writer,
Isolate* isolate,
- Local error,
+ Local error,
const char* trigger);
static void PrintJavaScriptErrorProperties(JSONWriter* writer,
Isolate* isolate,
- Local error);
+ Local error);
static void PrintNativeStack(JSONWriter* writer);
static void PrintResourceUsage(JSONWriter* writer);
static void PrintGCStatistics(JSONWriter* writer, Isolate* isolate);
@@ -84,7 +89,7 @@ std::string TriggerNodeReport(Isolate* isolate,
const char* message,
const char* trigger,
const std::string& name,
- Local error) {
+ Local error) {
std::string filename;
// Determine the required report filename. In order of priority:
@@ -169,7 +174,7 @@ void GetNodeReport(Isolate* isolate,
Environment* env,
const char* message,
const char* trigger,
- Local error,
+ Local error,
std::ostream& out) {
WriteNodeReport(isolate, env, message, trigger, "", out, error, false);
}
@@ -182,7 +187,7 @@ static void WriteNodeReport(Isolate* isolate,
const char* trigger,
const std::string& filename,
std::ostream& out,
- Local error,
+ Local error,
bool compact) {
// Obtain the current time and the pid.
TIME_TYPE tm_struct;
@@ -474,13 +479,14 @@ static void PrintNetworkInterfaceInfo(JSONWriter* writer) {
static void PrintJavaScriptErrorProperties(JSONWriter* writer,
Isolate* isolate,
- Local error) {
+ Local error) {
writer->json_objectstart("errorProperties");
- if (!error.IsEmpty()) {
+ if (!error.IsEmpty() && error->IsObject()) {
TryCatch try_catch(isolate);
- Local context = error->GetIsolate()->GetCurrentContext();
+ Local error_obj = error.As();
+ Local context = error_obj->GetIsolate()->GetCurrentContext();
Local keys;
- if (!error->GetOwnPropertyNames(context).ToLocal(&keys)) {
+ if (!error_obj->GetOwnPropertyNames(context).ToLocal(&keys)) {
return writer->json_objectend(); // the end of 'errorProperties'
}
uint32_t keys_length = keys->Length();
@@ -491,7 +497,7 @@ static void PrintJavaScriptErrorProperties(JSONWriter* writer,
}
Local value;
Local value_string;
- if (!error->Get(context, key).ToLocal(&value) ||
+ if (!error_obj->Get(context, key).ToLocal(&value) ||
!value->ToString(context).ToLocal(&value_string)) {
continue;
}
@@ -505,26 +511,50 @@ static void PrintJavaScriptErrorProperties(JSONWriter* writer,
writer->json_objectend(); // the end of 'errorProperties'
}
+static Maybe ErrorToString(Isolate* isolate,
+ Local context,
+ Local error) {
+ if (error.IsEmpty()) {
+ return Nothing();
+ }
+
+ MaybeLocal maybe_str;
+ // `ToString` is not available to Symbols.
+ if (error->IsSymbol()) {
+ maybe_str = error.As()->ToDetailString(context);
+ } else if (!error->IsObject()) {
+ maybe_str = error->ToString(context);
+ } else if (error->IsObject()) {
+ MaybeLocal stack = error.As()->Get(
+ context, node::FIXED_ONE_BYTE_STRING(isolate, "stack"));
+ if (!stack.IsEmpty() && stack.ToLocalChecked()->IsString()) {
+ maybe_str = stack.ToLocalChecked().As();
+ }
+ }
+
+ Local js_str;
+ if (!maybe_str.ToLocal(&js_str)) {
+ return Nothing();
+ }
+ String::Utf8Value sv(isolate, js_str);
+ return Just<>(std::string(*sv, sv.length()));
+}
+
// Report the JavaScript stack.
static void PrintJavaScriptErrorStack(JSONWriter* writer,
- Isolate* isolate,
- Local error,
- const char* trigger) {
- Local stackstr;
- std::string ss = "";
+ Isolate* isolate,
+ Local error,
+ const char* trigger) {
TryCatch try_catch(isolate);
+ HandleScope scope(isolate);
+ Local context = isolate->GetCurrentContext();
+ std::string ss = "";
if ((!strcmp(trigger, "FatalError")) ||
- (!strcmp(trigger, "Signal"))) {
+ (!strcmp(trigger, "Signal")) ||
+ (!ErrorToString(isolate, context, error).To(&ss))) {
ss = "No stack.\nUnavailable.\n";
- } else if (!error.IsEmpty() &&
- error
- ->Get(isolate->GetCurrentContext(),
- node::FIXED_ONE_BYTE_STRING(isolate,
- "stack"))
- .ToLocal(&stackstr)) {
- String::Utf8Value sv(isolate, stackstr);
- ss = std::string(*sv, sv.length());
}
+
int line = ss.find('\n');
if (line == -1) {
writer->json_keyvalue("message", ss);
diff --git a/src/node_report.h b/src/node_report.h
index f4992f220221ed..a8292eb2dd477d 100644
--- a/src/node_report.h
+++ b/src/node_report.h
@@ -20,12 +20,12 @@ std::string TriggerNodeReport(v8::Isolate* isolate,
const char* message,
const char* trigger,
const std::string& name,
- v8::Local error);
+ v8::Local error);
void GetNodeReport(v8::Isolate* isolate,
node::Environment* env,
const char* message,
const char* trigger,
- v8::Local error,
+ v8::Local error,
std::ostream& out);
// Function declarations - utility functions in src/node_report_utils.cc
diff --git a/src/node_report_module.cc b/src/node_report_module.cc
index 97c6bea3ad5ec5..190755a85b2369 100644
--- a/src/node_report_module.cc
+++ b/src/node_report_module.cc
@@ -32,7 +32,7 @@ void WriteReport(const FunctionCallbackInfo& info) {
Isolate* isolate = env->isolate();
HandleScope scope(isolate);
std::string filename;
- Local error;
+ Local error;
CHECK_EQ(info.Length(), 4);
String::Utf8Value message(isolate, info[0].As());
@@ -40,10 +40,10 @@ void WriteReport(const FunctionCallbackInfo& info) {
if (info[2]->IsString())
filename = *String::Utf8Value(isolate, info[2]);
- if (!info[3].IsEmpty() && info[3]->IsObject())
- error = info[3].As();
+ if (!info[3].IsEmpty())
+ error = info[3];
else
- error = Local();
+ error = Local();
filename = TriggerNodeReport(
isolate, env, *message, *trigger, filename, error);
diff --git a/src/node_version.h b/src/node_version.h
index 442c61185fd1e0..9879d4c34e4d21 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -23,13 +23,13 @@
#define SRC_NODE_VERSION_H_
#define NODE_MAJOR_VERSION 16
-#define NODE_MINOR_VERSION 0
-#define NODE_PATCH_VERSION 1
+#define NODE_MINOR_VERSION 1
+#define NODE_PATCH_VERSION 0
#define NODE_VERSION_IS_LTS 0
#define NODE_VERSION_LTS_CODENAME ""
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_STRINGIFY
#define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)
diff --git a/test/README.md b/test/README.md
index 834af7dc5896a2..e535605080199a 100644
--- a/test/README.md
+++ b/test/README.md
@@ -15,7 +15,7 @@ For the tests to run on Windows, be sure to clone Node.js source code with the
| Directory | Runs on CI | Purpose |
| ---------------- | ---------- | --------------- |
-| `abort` | Yes | Tests for when the `--abort-on-uncaught-exception` flag is used. |
+| `abort` | Yes | Tests that use `--abort-on-uncaught-exception` and other situations where we want to test something but avoid generating a core file. |
| `addons` | Yes | Tests for [addon](https://nodejs.org/api/addons.html) functionality along with some tests that require an addon. |
| `async-hooks` | Yes | Tests for [async_hooks](https://nodejs.org/api/async_hooks.html) functionality. |
| `benchmark` | Yes | Test minimal functionality of benchmarks. |
@@ -25,6 +25,7 @@ For the tests to run on Windows, be sure to clone Node.js source code with the
| `doctool` | Yes | Tests for the documentation generator. |
| `es-module` | Yes | Test ESM module loading. |
| `fixtures` | | Test fixtures used in various tests throughout the test suite. |
+| `inspector-cli` | Yes | Tests for `node inspect` |
| `internet` | No | Tests that make real outbound network connections. Tests for networking related modules may also be present in other directories, but those tests do not make outbound connections. |
| `js-native-api` | Yes | Tests for Node.js-agnostic [n-api](https://nodejs.org/api/n-api.html) functionality. |
| `known_issues` | Yes | Tests reproducing known issues within the system. All tests inside of this directory are expected to fail. If a test doesn't fail on certain platforms, those should be skipped via `known_issues.status`. |
diff --git a/test/pummel/test-abort-fatal-error.js b/test/abort/test-abort-fatal-error.js
similarity index 100%
rename from test/pummel/test-abort-fatal-error.js
rename to test/abort/test-abort-fatal-error.js
diff --git a/test/common/README.md b/test/common/README.md
index 2f2ee17a0f01e4..9929cd39144add 100644
--- a/test/common/README.md
+++ b/test/common/README.md
@@ -16,6 +16,7 @@ This directory contains modules used to test the Node.js implementation.
* [Heap dump checker module](#heap-dump-checker-module)
* [hijackstdio module](#hijackstdio-module)
* [HTTP2 module](#http2-module)
+* [Inspector CLI module](#inspector-cli-module)
* [Internet module](#internet-module)
* [ongc module](#ongc-module)
* [Report module](#report-module)
@@ -370,10 +371,12 @@ const { spawn } = require('child_process');
spawn(...common.pwdCommand, { stdio: ['pipe'] });
```
-### `requireNoPackageJSONAbove()`
+### `requireNoPackageJSONAbove([dir])`
-Throws an `AssertionError` if a `package.json` file is in any ancestor
-directory. Such files may interfere with proper test functionality.
+* `dir` [<string>][] default = \_\_dirname
+
+Throws an `AssertionError` if a `package.json` file exists in any ancestor
+directory above `dir`. Such files may interfere with proper test functionality.
### `runWithInvalidFD(func)`
@@ -821,6 +824,34 @@ upon initial establishment of a connection.
socket.write(http2.kClientMagic);
```
+## Inspector CLI module
+
+Provides common functionality for tests for `node inspect`.
+
+### `startCLI(args[[, flags], spawnOpts])`
+
+* `args` [<string>][]
+* `flags` [<string>][] default = []
+* `showOpts` [<Object>][] default = {}
+* return [<Object>][]
+
+Returns a null-prototype object with properties that are functions and getters
+used to interact with the `node inspect` CLI. These functions are:
+
+* `flushOutput()`
+* `waitFor()`
+* `waitForPrompt()`
+* `waitForInitialBreak()`
+* `breakInfo`
+* `ctrlC()`
+* `output`
+* `rawOutput`
+* `parseSourceLines()`
+* `writeLine()`
+* `command()`
+* `stepCommand()`
+* `quit()`
+
## Internet Module
The `common/internet` module provides utilities for working with
diff --git a/test/common/index.js b/test/common/index.js
index f0d8c72d4a1017..d67baa5caf0ad1 100644
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -387,10 +387,28 @@ function _mustCallInner(fn, criteria = 1, field) {
mustCallChecks.push(context);
- return function() {
+ const _return = function() { // eslint-disable-line func-style
context.actual++;
return fn.apply(this, arguments);
};
+ // Function instances have own properties that may be relevant.
+ // Let's replicate those properties to the returned function.
+ // Refs: https://tc39.es/ecma262/#sec-function-instances
+ Object.defineProperties(_return, {
+ name: {
+ value: fn.name,
+ writable: false,
+ enumerable: false,
+ configurable: true,
+ },
+ length: {
+ value: fn.length,
+ writable: false,
+ enumerable: false,
+ configurable: true,
+ },
+ });
+ return _return;
}
function hasMultiLocalhost() {
@@ -708,8 +726,8 @@ function gcUntil(name, condition) {
});
}
-function requireNoPackageJSONAbove() {
- let possiblePackage = path.join(__dirname, '..', 'package.json');
+function requireNoPackageJSONAbove(dir = __dirname) {
+ let possiblePackage = path.join(dir, '..', 'package.json');
let lastPackage = null;
while (possiblePackage !== lastPackage) {
if (fs.existsSync(possiblePackage)) {
diff --git a/deps/node-inspect/test/cli/start-cli.js b/test/common/inspector-cli.js
similarity index 67%
rename from deps/node-inspect/test/cli/start-cli.js
rename to test/common/inspector-cli.js
index 32c666c7647c68..36d6328dcc9b39 100644
--- a/deps/node-inspect/test/cli/start-cli.js
+++ b/test/common/inspector-cli.js
@@ -1,42 +1,33 @@
'use strict';
+const common = require('../common');
const spawn = require('child_process').spawn;
-// This allows us to keep the helper inside of `test/` without tap warning
-// about "pending" test files.
-const tap = require('tap');
-tap.test('startCLI', (t) => t.end());
-
-const CLI =
- process.env.USE_EMBEDDED_NODE_INSPECT === '1' ?
- 'inspect' :
- require.resolve('../../cli.js');
-
const BREAK_MESSAGE = new RegExp('(?:' + [
'assert', 'break', 'break on start', 'debugCommand',
'exception', 'other', 'promiseRejection',
].join('|') + ') in', 'i');
+const TIMEOUT = common.platformTimeout(5000);
+
function isPreBreak(output) {
return /Break on start/.test(output) && /1 \(function \(exports/.test(output);
}
function startCLI(args, flags = [], spawnOpts = {}) {
- const child = spawn(process.execPath, [...flags, CLI, ...args], spawnOpts);
- let isFirstStdoutChunk = true;
+ let stderrOutput = '';
+ const child =
+ spawn(process.execPath, [...flags, 'inspect', ...args], spawnOpts);
const outputBuffer = [];
function bufferOutput(chunk) {
- if (isFirstStdoutChunk) {
- isFirstStdoutChunk = false;
- outputBuffer.push(chunk.replace(/^debug>\s*/, ''));
- } else {
- outputBuffer.push(chunk);
+ if (this === child.stderr) {
+ stderrOutput += chunk;
}
+ outputBuffer.push(chunk);
}
function getOutput() {
- return outputBuffer.join('').toString()
- .replace(/^[^\n]*?[\b]/mg, '');
+ return outputBuffer.join('\n').replaceAll('\b', '');
}
child.stdout.setEncoding('utf8');
@@ -45,7 +36,7 @@ function startCLI(args, flags = [], spawnOpts = {}) {
child.stderr.on('data', bufferOutput);
if (process.env.VERBOSE === '1') {
- child.stdout.pipe(process.stderr);
+ child.stdout.pipe(process.stdout);
child.stderr.pipe(process.stderr);
}
@@ -56,7 +47,7 @@ function startCLI(args, flags = [], spawnOpts = {}) {
return output;
},
- waitFor(pattern, timeout = 2000) {
+ waitFor(pattern) {
function checkPattern(str) {
if (Array.isArray(pattern)) {
return pattern.every((p) => p.test(str));
@@ -67,47 +58,57 @@ function startCLI(args, flags = [], spawnOpts = {}) {
return new Promise((resolve, reject) => {
function checkOutput() {
if (checkPattern(getOutput())) {
- tearDown(); // eslint-disable-line no-use-before-define
+ tearDown();
resolve();
}
}
- function onChildExit() {
- tearDown(); // eslint-disable-line no-use-before-define
- reject(new Error(
- `Child quit while waiting for ${pattern}; found: ${this.output}`));
+ function onChildClose(code, signal) {
+ tearDown();
+ let message = 'Child exited';
+ if (code) {
+ message += `, code ${code}`;
+ }
+ if (signal) {
+ message += `, signal ${signal}`;
+ }
+ message += ` while waiting for ${pattern}; found: ${this.output}`;
+ if (stderrOutput) {
+ message += `\n STDERR: ${stderrOutput}`;
+ }
+ reject(new Error(message));
}
const timer = setTimeout(() => {
- tearDown(); // eslint-disable-line no-use-before-define
+ tearDown();
reject(new Error([
- `Timeout (${timeout}) while waiting for ${pattern}`,
+ `Timeout (${TIMEOUT}) while waiting for ${pattern}`,
`found: ${this.output}`,
].join('; ')));
- }, timeout);
+ }, TIMEOUT);
function tearDown() {
clearTimeout(timer);
child.stdout.removeListener('data', checkOutput);
- child.removeListener('exit', onChildExit);
+ child.removeListener('close', onChildClose);
}
- child.on('exit', onChildExit);
+ child.on('close', onChildClose);
child.stdout.on('data', checkOutput);
checkOutput();
});
},
- waitForPrompt(timeout = 2000) {
- return this.waitFor(/>\s+$/, timeout);
+ waitForPrompt() {
+ return this.waitFor(/>\s+$/);
},
- waitForInitialBreak(timeout = 2000) {
- return this.waitFor(/break (?:on start )?in/i, timeout)
+ waitForInitialBreak() {
+ return this.waitFor(/break (?:on start )?in/i)
.then(() => {
if (isPreBreak(this.output)) {
return this.command('next', false)
- .then(() => this.waitFor(/break in/, timeout));
+ .then(() => this.waitFor(/break in/));
}
});
},
@@ -169,7 +170,7 @@ function startCLI(args, flags = [], spawnOpts = {}) {
quit() {
return new Promise((resolve) => {
child.stdin.end();
- child.on('exit', resolve);
+ child.on('close', resolve);
});
},
};
diff --git a/test/common/internet.js b/test/common/internet.js
index 1c53587fb6dbf7..accea74969e276 100644
--- a/test/common/internet.js
+++ b/test/common/internet.js
@@ -24,7 +24,7 @@ const addresses = {
MX_HOST: 'nodejs.org',
// On some systems, .invalid returns a server failure/try again rather than
// record not found. Use this to guarantee record not found.
- NOT_FOUND: 'come.on.fhqwhgads',
+ NOT_FOUND: 'come.on.fhqwhgads.test',
// A host with SRV records registered
SRV_HOST: '_jabber._tcp.google.com',
// A host with PTR records registered
diff --git a/test/fixtures/es-modules/cjs-exports.mjs b/test/fixtures/es-modules/cjs-exports.mjs
index ac6f60e6aa9dc1..6001ce06364454 100644
--- a/test/fixtures/es-modules/cjs-exports.mjs
+++ b/test/fixtures/es-modules/cjs-exports.mjs
@@ -3,11 +3,14 @@ import { strictEqual, deepEqual } from 'assert';
import m, { π } from './exports-cases.js';
import * as ns from './exports-cases.js';
-deepEqual(Object.keys(ns), ['default', 'isObject', 'z', 'π']);
+deepEqual(Object.keys(ns), ['?invalid', 'default', 'invalid identifier', 'isObject', 'package', 'z', 'π', '\u{d83c}\u{df10}']);
strictEqual(π, 'yes');
strictEqual(typeof m.isObject, 'undefined');
strictEqual(m.π, 'yes');
strictEqual(m.z, 'yes');
+strictEqual(m.package, 10);
+strictEqual(m['invalid identifier'], 'yes');
+strictEqual(m['?invalid'], 'yes');
import m2, { __esModule as __esModule2, name as name2 } from './exports-cases2.js';
import * as ns2 from './exports-cases2.js';
diff --git a/test/fixtures/es-modules/exports-cases.js b/test/fixtures/es-modules/exports-cases.js
index eec3d31bc7290c..94bbde74d1d40e 100644
--- a/test/fixtures/es-modules/exports-cases.js
+++ b/test/fixtures/es-modules/exports-cases.js
@@ -1,7 +1,9 @@
if (global.maybe)
module.exports = require('../is-object');
-exports['invalid identifier'] = 'no';
-module.exports['?invalid'] = 'no';
+exports['invalid identifier'] = 'yes';
+module.exports['?invalid'] = 'yes';
module.exports['π'] = 'yes';
-exports.package = 10; // reserved word -> not used
+exports['\u{D83C}'] = 'no';
+exports['\u{D83C}\u{DF10}'] = 'yes';
+exports.package = 10; // reserved word
Object.defineProperty(exports, 'z', { value: 'yes' });
diff --git a/deps/node-inspect/examples/alive.js b/test/fixtures/inspector-cli/alive.js
similarity index 100%
rename from deps/node-inspect/examples/alive.js
rename to test/fixtures/inspector-cli/alive.js
diff --git a/deps/node-inspect/examples/backtrace.js b/test/fixtures/inspector-cli/backtrace.js
similarity index 100%
rename from deps/node-inspect/examples/backtrace.js
rename to test/fixtures/inspector-cli/backtrace.js
diff --git a/deps/node-inspect/examples/break.js b/test/fixtures/inspector-cli/break.js
similarity index 100%
rename from deps/node-inspect/examples/break.js
rename to test/fixtures/inspector-cli/break.js
diff --git a/deps/node-inspect/examples/cjs/index.js b/test/fixtures/inspector-cli/cjs/index.js
similarity index 100%
rename from deps/node-inspect/examples/cjs/index.js
rename to test/fixtures/inspector-cli/cjs/index.js
diff --git a/deps/node-inspect/examples/cjs/other.js b/test/fixtures/inspector-cli/cjs/other.js
similarity index 100%
rename from deps/node-inspect/examples/cjs/other.js
rename to test/fixtures/inspector-cli/cjs/other.js
diff --git a/deps/node-inspect/examples/empty.js b/test/fixtures/inspector-cli/empty.js
similarity index 100%
rename from deps/node-inspect/examples/empty.js
rename to test/fixtures/inspector-cli/empty.js
diff --git a/deps/node-inspect/examples/exceptions.js b/test/fixtures/inspector-cli/exceptions.js
similarity index 100%
rename from deps/node-inspect/examples/exceptions.js
rename to test/fixtures/inspector-cli/exceptions.js
diff --git a/deps/node-inspect/examples/three-lines.js b/test/fixtures/inspector-cli/three-lines.js
similarity index 100%
rename from deps/node-inspect/examples/three-lines.js
rename to test/fixtures/inspector-cli/three-lines.js
diff --git a/deps/node-inspect/examples/use-strict.js b/test/fixtures/inspector-cli/use-strict.js
similarity index 100%
rename from deps/node-inspect/examples/use-strict.js
rename to test/fixtures/inspector-cli/use-strict.js
diff --git a/test/fixtures/keys/selfsigned-no-keycertsign/README.md b/test/fixtures/keys/selfsigned-no-keycertsign/README.md
new file mode 100644
index 00000000000000..0dcd69007a9142
--- /dev/null
+++ b/test/fixtures/keys/selfsigned-no-keycertsign/README.md
@@ -0,0 +1,2 @@
+# Self-signed certificate without keyCertSign bit
+The self-signed certificate ([cert.pem](./cert.pem)) and the key ([key.pem](./key.pem)) in this folder are used by the test [test-https-selfsigned-no-keycertsign-no-crash](../../../parallel/test-https-selfsigned-no-keycertsign-no-crash.js). The config ([cert.conf](./cert.conf)) and the file used to generate key and certificate in this folder ([https-renew-cert.sh](./https_renew_cert.sh)) are not used by the test but for reference.
diff --git a/test/fixtures/keys/selfsigned-no-keycertsign/cert.conf b/test/fixtures/keys/selfsigned-no-keycertsign/cert.conf
new file mode 100644
index 00000000000000..60901bb26d6937
--- /dev/null
+++ b/test/fixtures/keys/selfsigned-no-keycertsign/cert.conf
@@ -0,0 +1,17 @@
+[req]
+distinguished_name = req_distinguished_name
+req_extensions = v3_req
+prompt = no
+
+[req_distinguished_name]
+C = DE
+CN = localhost
+
+[v3_req]
+keyUsage = digitalSignature, keyEncipherment
+extendedKeyUsage = serverAuth
+subjectAltName = @alt_names
+[alt_names]
+DNS.1 = 127.0.0.1
+DNS.2 = localhost
+IP.1 = 127.0.0.1
diff --git a/test/fixtures/keys/selfsigned-no-keycertsign/cert.pem b/test/fixtures/keys/selfsigned-no-keycertsign/cert.pem
new file mode 100644
index 00000000000000..c0829b82caf8d3
--- /dev/null
+++ b/test/fixtures/keys/selfsigned-no-keycertsign/cert.pem
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC9jCCAd6gAwIBAgIJANHflGRpZM1IMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDAeFw0yMTAzMTUwOTEzMjdaFw0yMjAzMTUwOTEzMjdaMBQx
+EjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBANMt6TLw9gIxucRgZBn8owavEIMAddxMTjkHiR7jGfaBrvvVTB8ymsIizw/Q
+KTANmu2r3EOqeR9Ht25KZFKxOKCDMd3aKHht38HInXIF6CQe8c5P0xsVKZAWkell
+8ohL05EsFpcrJODIdHfaovODrtX8w1WexqDsUoPQdEk7pISJ2HhmXzpf7QmV00Ux
+8J+64v2pTg8/C9VgpSgxE4oXlfJEqdSIAzGDT+VX96GWXTh7QqLjiQ9T96QHUJEn
+Bx0Sr4rO9mY2lOQG408QuCLR/ng2J+lYx+03SC8Lq7lrtt4M06Ffr8TQRgpDAjkU
+0YitbuysD5XgtCeFq0Fi3v1z700CAwEAAaNLMEkwCwYDVR0PBAQDAgWgMBMGA1Ud
+JQQMMAoGCCsGAQUFBwMBMCUGA1UdEQQeMByCCTEyNy4wLjAuMYIJbG9jYWxob3N0
+hwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQDAUCt/8Le2EO0ONOkQYUcPmSut6Siz
+UIQrJ8Lwfs0fb+Zk9ElNGLwYTzooKDgzK8cLQ8g8F2WkolBEPXDsy1Ab+e66WkJH
+NH/zAgEyG6cXXRNc+ObM5KbjY0YuDGiajKcndknuuCB+onlC1Pv5oFUSNa3/06+S
+sziFloGbg5S0AHT6lYnwZSM6G7Pre8mcRNRxL6Yw1FOOUpQZKPd7juy4GBRlCucn
+wmp/Fl0wIBDs91Vprig2TO+U6GvtqJ3n/RKXUz1ykUKETtRneSkqa6hFYjwRzawd
+ANpjy/orrVkqXriAbI/1xvBMInWdcMpXNeiOkxQeQdy8TLBk0ZViSJnf
+-----END CERTIFICATE-----
diff --git a/test/fixtures/keys/selfsigned-no-keycertsign/https_renew_cert.sh b/test/fixtures/keys/selfsigned-no-keycertsign/https_renew_cert.sh
new file mode 100644
index 00000000000000..092f27a8867cbb
--- /dev/null
+++ b/test/fixtures/keys/selfsigned-no-keycertsign/https_renew_cert.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+openssl genrsa -out rsa.pem 2048
+openssl rsa -in rsa.pem -out key.pem
+openssl req -sha256 -new -key key.pem -out csr.pem -subj "/CN=localhost"
+openssl x509 -req -extfile cert.conf -extensions v3_req -days 365 -in csr.pem -signkey key.pem -out cert.pem
+
diff --git a/test/fixtures/keys/selfsigned-no-keycertsign/key.pem b/test/fixtures/keys/selfsigned-no-keycertsign/key.pem
new file mode 100644
index 00000000000000..5f0549276a4cae
--- /dev/null
+++ b/test/fixtures/keys/selfsigned-no-keycertsign/key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA0y3pMvD2AjG5xGBkGfyjBq8QgwB13ExOOQeJHuMZ9oGu+9VM
+HzKawiLPD9ApMA2a7avcQ6p5H0e3bkpkUrE4oIMx3dooeG3fwcidcgXoJB7xzk/T
+GxUpkBaR6WXyiEvTkSwWlysk4Mh0d9qi84Ou1fzDVZ7GoOxSg9B0STukhInYeGZf
+Ol/tCZXTRTHwn7ri/alODz8L1WClKDETiheV8kSp1IgDMYNP5Vf3oZZdOHtCouOJ
+D1P3pAdQkScHHRKvis72ZjaU5AbjTxC4ItH+eDYn6VjH7TdILwuruWu23gzToV+v
+xNBGCkMCORTRiK1u7KwPleC0J4WrQWLe/XPvTQIDAQABAoIBAFIlWMIVE0z1NNLb
+v/SP3oaaEK00v6QLFp5+fOtD4fSOq5eQeATmtWZxDeSTz4G+uRZctNipdmYhiovf
+ajj0cReXEQ3Ab9+wtcp2lDAndg6e7uaXDIJLcBh5fxawLnCwNkMRSFRTVwwNTajV
+pm9dOORKZ11l3tP4OXzG2IUoKy3Wj/1SKLL4zrdHi7802+L/GstK6/BGma+NFrFz
+U6yNqpvuzv7BH7w9G3nSz7u+8SjcY22Vs6q69GAQG3yf356cYCJhV7QIJXU0/VAF
+GFx5UDwlsOT2NhoOd/b9Q9RexKDl+qDupXQo0YFOObHIjHs8UGLOZkBtv4apCarA
+6u+BOwECgYEA9GbrP/5SfmN8xvF2XVjqjk9IUcvWAuTM4Bxav72e6aR9IOdye9vi
++GhwM6qON+LOnMVNhUKJ0+R/jjLy6Jq+00uKU65Q79x7lCBVSDDXWacV0IFIoAOp
+P4LkykjRZyzpIvjK5HGL1JYqZi89im93uuOiyMjoFS2syU+19b83UUECgYEA3TNk
+JVGWYLMcD3uVTe2e/yZSsX+0+QL8hm3bUSOIJ/mIe2dqCXb6MK0ndMS0aCLGtDSt
+wGTWwuc4rFattHYEI8Iro+tshgQs9bLM037hmiCrZvmcQsgt+3FNuYv4oCGp5U85
+mWYF5SVUYRyv8M9aZoKTjc8meR0Wv3ZGGC9iDw0CgYA0XKyAPGO+MmB0Wx1J6Jfw
+P2o2JB7I5e5DAbArrluSoSwx1YSApt6c6/tGBn+L16r+iYMPTu8ql6UAeUfzr9u8
+d02+mfU7Ppi3Zqn+2n/49ERHNLuzlLU5JzkPYcSDf2q/lGAby3vy4u1YkTx1IWac
+gtLIg8q9ZtjDFLHeYcZfQQKBgCCOpdjQT1/gPOsSd4FGzjYjv9wcPdjA1cY7eSJS
+JoIruijfqb3G40Ay3DHVmfAR3kk7z68XqHx7Z94Fy/9Zt3ZD6ARybEC1cKChNoCS
+lkYHNPMtHhC+QfZWUOhUb72x9r2nkYTAfXGisu6wOD0rZ9TatzkSGkmNPIHluJ9q
+qfYpAoGAPJiBBdSt7DC9ZZraQGMEHfRkE5CxEIRbIHJ9+U3Z7LTQT6MJ1y3VfcGs
+PetHcWtbU0Cl8blShaSwpxyCI01x3tUPw/b7tXMan/ImzjUgRe7kQXh2sf39V3b/
+fvzKXWBvOvc1lgG0pFgI/2xtGQQGTe74MzX5xFgw6eadRUnJeKI=
+-----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/wpt/README.md b/test/fixtures/wpt/README.md
index 37d52a069aebc9..fef6bb0fd8c30d 100644
--- a/test/fixtures/wpt/README.md
+++ b/test/fixtures/wpt/README.md
@@ -21,7 +21,7 @@ Last update:
- html/webappapis/timers: https://github.com/web-platform-tests/wpt/tree/5873f2d8f1/html/webappapis/timers
- interfaces: https://github.com/web-platform-tests/wpt/tree/79fa4cf76e/interfaces
- resources: https://github.com/web-platform-tests/wpt/tree/972ca5b669/resources
-- url: https://github.com/web-platform-tests/wpt/tree/5eebfdb1f6/url
+- url: https://github.com/web-platform-tests/wpt/tree/1439087f27/url
[Web Platform Tests]: https://github.com/web-platform-tests/wpt
[`git node wpt`]: https://github.com/nodejs/node-core-utils/blob/master/docs/git-node.md#git-node-wpt
diff --git a/test/fixtures/wpt/url/resources/urltestdata.json b/test/fixtures/wpt/url/resources/urltestdata.json
index dfb226deacde13..bb156f126bf9b6 100644
--- a/test/fixtures/wpt/url/resources/urltestdata.json
+++ b/test/fixtures/wpt/url/resources/urltestdata.json
@@ -5945,6 +5945,120 @@
"search": "",
"hash": ""
},
+ "# Copy the host from the base URL in the following cases",
+ {
+ "input": "C|/",
+ "base": "file://host/",
+ "href": "file://host/C:/",
+ "protocol": "file:",
+ "username": "",
+ "password": "",
+ "host": "host",
+ "hostname": "host",
+ "port": "",
+ "pathname": "/C:/",
+ "search": "",
+ "hash": ""
+ },
+ {
+ "input": "/C:/",
+ "base": "file://host/",
+ "href": "file://host/C:/",
+ "protocol": "file:",
+ "username": "",
+ "password": "",
+ "host": "host",
+ "hostname": "host",
+ "port": "",
+ "pathname": "/C:/",
+ "search": "",
+ "hash": ""
+ },
+ {
+ "input": "file:C:/",
+ "base": "file://host/",
+ "href": "file://host/C:/",
+ "protocol": "file:",
+ "username": "",
+ "password": "",
+ "host": "host",
+ "hostname": "host",
+ "port": "",
+ "pathname": "/C:/",
+ "search": "",
+ "hash": ""
+ },
+ {
+ "input": "file:/C:/",
+ "base": "file://host/",
+ "href": "file://host/C:/",
+ "protocol": "file:",
+ "username": "",
+ "password": "",
+ "host": "host",
+ "hostname": "host",
+ "port": "",
+ "pathname": "/C:/",
+ "search": "",
+ "hash": ""
+ },
+ "# Copy the empty host from the input in the following cases",
+ {
+ "input": "//C:/",
+ "base": "file://host/",
+ "href": "file:///C:/",
+ "protocol": "file:",
+ "username": "",
+ "password": "",
+ "host": "",
+ "hostname": "",
+ "port": "",
+ "pathname": "/C:/",
+ "search": "",
+ "hash": ""
+ },
+ {
+ "input": "file://C:/",
+ "base": "file://host/",
+ "href": "file:///C:/",
+ "protocol": "file:",
+ "username": "",
+ "password": "",
+ "host": "",
+ "hostname": "",
+ "port": "",
+ "pathname": "/C:/",
+ "search": "",
+ "hash": ""
+ },
+ {
+ "input": "///C:/",
+ "base": "file://host/",
+ "href": "file:///C:/",
+ "protocol": "file:",
+ "username": "",
+ "password": "",
+ "host": "",
+ "hostname": "",
+ "port": "",
+ "pathname": "/C:/",
+ "search": "",
+ "hash": ""
+ },
+ {
+ "input": "file:///C:/",
+ "base": "file://host/",
+ "href": "file:///C:/",
+ "protocol": "file:",
+ "username": "",
+ "password": "",
+ "host": "",
+ "hostname": "",
+ "port": "",
+ "pathname": "/C:/",
+ "search": "",
+ "hash": ""
+ },
"# Windows drive letter quirk (no host)",
{
"input": "file:/C|/",
diff --git a/test/fixtures/wpt/url/urlsearchparams-stringifier.any.js b/test/fixtures/wpt/url/urlsearchparams-stringifier.any.js
index bc7bedd533f58d..6187db64b1747d 100644
--- a/test/fixtures/wpt/url/urlsearchparams-stringifier.any.js
+++ b/test/fixtures/wpt/url/urlsearchparams-stringifier.any.js
@@ -133,3 +133,13 @@ test(() => {
assert_equals(url.toString(), 'http://www.example.com/?a=b%2Cc&x=y');
assert_equals(params.toString(), 'a=b%2Cc&x=y');
}, 'URLSearchParams connected to URL');
+
+test(() => {
+ const url = new URL('http://www.example.com/');
+ const params = url.searchParams;
+
+ params.append('a\nb', 'c\rd');
+ params.append('e\n\rf', 'g\r\nh');
+
+ assert_equals(params.toString(), "a%0Ab=c%0Dd&e%0A%0Df=g%0D%0Ah");
+}, 'URLSearchParams must not do newline normalization');
diff --git a/test/fixtures/wpt/versions.json b/test/fixtures/wpt/versions.json
index b637bc8a8ab344..67df1aaa931761 100644
--- a/test/fixtures/wpt/versions.json
+++ b/test/fixtures/wpt/versions.json
@@ -44,7 +44,7 @@
"path": "resources"
},
"url": {
- "commit": "5eebfdb1f68059549b3efff380dd190bc6078266",
+ "commit": "1439087f27135b06deb70ffbf43e65ff64ff1ee6",
"path": "url"
}
}
\ No newline at end of file
diff --git a/test/inspector-cli/inspector-cli.status b/test/inspector-cli/inspector-cli.status
new file mode 100644
index 00000000000000..23a6558541513a
--- /dev/null
+++ b/test/inspector-cli/inspector-cli.status
@@ -0,0 +1,7 @@
+prefix inspector-cli
+
+# To mark a test as flaky, list the test name in the appropriate section
+# below, without ".js", followed by ": PASS,FLAKY". Example:
+# sample-test : PASS,FLAKY
+
+[true] # This section applies to all platforms
diff --git a/deps/node-inspect/test/cli/address.test.js b/test/inspector-cli/test-inspector-cli-address.js
similarity index 68%
rename from deps/node-inspect/test/cli/address.test.js
rename to test/inspector-cli/test-inspector-cli-address.js
index 1dbe4f37b42175..89c70687c819b8 100644
--- a/deps/node-inspect/test/cli/address.test.js
+++ b/test/inspector-cli/test-inspector-cli-address.js
@@ -1,9 +1,13 @@
'use strict';
-const { spawn } = require('child_process');
-const Path = require('path');
-const { test } = require('tap');
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
-const startCLI = require('./start-cli');
+const assert = require('assert');
+const { spawn } = require('child_process');
// NOTE(oyyd): We might want to import this regexp from "lib/_inspect.js"?
const kDebuggerMsgReg = /Debugger listening on ws:\/\/\[?(.+?)\]?:(\d+)\//;
@@ -12,11 +16,13 @@ function launchTarget(...args) {
const childProc = spawn(process.execPath, args);
return new Promise((resolve, reject) => {
const onExit = () => {
- reject(new Error('Child process exits unexpectly'));
+ reject(new Error('Child process exits unexpectedly'));
};
childProc.on('exit', onExit);
childProc.stderr.setEncoding('utf8');
- childProc.stderr.on('data', (data) => {
+ let data = '';
+ childProc.stderr.on('data', (chunk) => {
+ data += chunk;
const ret = kDebuggerMsgReg.exec(data);
childProc.removeListener('exit', onExit);
if (ret) {
@@ -30,12 +36,8 @@ function launchTarget(...args) {
});
}
-// process.debugPort is our proxy for "the version of node used to run this
-// test suite doesn't support SIGUSR1 for enabling --inspect for a process".
-const defaultsToOldProtocol = process.debugPort === 5858;
-
-test('examples/alive.js', { skip: defaultsToOldProtocol }, (t) => {
- const script = Path.join('examples', 'alive.js');
+{
+ const script = fixtures.path('inspector-cli/alive.js');
let cli = null;
let target = null;
@@ -48,7 +50,7 @@ test('examples/alive.js', { skip: defaultsToOldProtocol }, (t) => {
target.kill();
target = null;
}
- if (error) throw error;
+ assert.ifError(error);
}
return launchTarget('--inspect=0', script)
@@ -61,11 +63,11 @@ test('examples/alive.js', { skip: defaultsToOldProtocol }, (t) => {
.then(() => cli.waitFor(/break/))
.then(() => cli.waitForPrompt())
.then(() => {
- t.match(
+ assert.match(
cli.output,
- '> 3 ++x;',
+ /> 3 \+\+x;/,
'marks the 3rd line');
})
.then(() => cleanup())
.then(null, cleanup);
-});
+}
diff --git a/test/inspector-cli/test-inspector-cli-auto-resume.js b/test/inspector-cli/test-inspector-cli-auto-resume.js
new file mode 100644
index 00000000000000..bd498bc536535d
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-auto-resume.js
@@ -0,0 +1,36 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+const { addLibraryPath } = require('../common/shared-lib-util');
+
+const assert = require('assert');
+const path = require('path');
+
+addLibraryPath(process.env);
+
+// Auto-resume on start if the environment variable is defined.
+{
+ const scriptFullPath = fixtures.path('inspector-cli', 'break.js');
+ const script = path.relative(process.cwd(), scriptFullPath);
+
+ const env = { ...process.env };
+ env.NODE_INSPECT_RESUME_ON_START = '1';
+
+ const cli = startCLI([script], [], { env });
+
+ cli.waitForInitialBreak()
+ .then(() => {
+ assert.deepStrictEqual(
+ cli.breakInfo,
+ { filename: script, line: 10 },
+ );
+ })
+ .then(() => cli.quit())
+ .then((code) => {
+ assert.strictEqual(code, 0);
+ });
+}
diff --git a/test/inspector-cli/test-inspector-cli-backtrace.js b/test/inspector-cli/test-inspector-cli-backtrace.js
new file mode 100644
index 00000000000000..a705efe5fe4270
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-backtrace.js
@@ -0,0 +1,36 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+const path = require('path');
+
+// Display and navigate backtrace.
+{
+ const scriptFullPath = fixtures.path('inspector-cli', 'backtrace.js');
+ const script = path.relative(process.cwd(), scriptFullPath);
+ const cli = startCLI([script]);
+
+ function onFatal(error) {
+ cli.quit();
+ throw error;
+ }
+
+ return cli.waitForInitialBreak()
+ .then(() => cli.waitForPrompt())
+ .then(() => cli.stepCommand('c'))
+ .then(() => cli.command('bt'))
+ .then(() => {
+ assert.ok(cli.output.includes(`#0 topFn ${script}:7:2`));
+ })
+ .then(() => cli.command('backtrace'))
+ .then(() => {
+ assert.ok(cli.output.includes(`#0 topFn ${script}:7:2`));
+ })
+ .then(() => cli.quit())
+ .then(null, onFatal);
+}
diff --git a/test/inspector-cli/test-inspector-cli-break.js b/test/inspector-cli/test-inspector-cli-break.js
new file mode 100644
index 00000000000000..50373541854fa1
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-break.js
@@ -0,0 +1,131 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+const path = require('path');
+
+// Stepping through breakpoints.
+{
+ const scriptFullPath = fixtures.path('inspector-cli', 'break.js');
+ const script = path.relative(process.cwd(), scriptFullPath);
+ const cli = startCLI([script]);
+
+ function onFatal(error) {
+ cli.quit();
+ throw error;
+ }
+
+ cli.waitForInitialBreak()
+ .then(() => cli.waitForPrompt())
+ .then(() => {
+ assert.deepStrictEqual(
+ cli.breakInfo,
+ { filename: script, line: 1 },
+ );
+ assert.match(
+ cli.output,
+ /> 1 (?:\(function \([^)]+\) \{ )?const x = 10;/,
+ 'shows the source and marks the current line');
+ })
+ .then(() => cli.stepCommand('n'))
+ .then(() => {
+ assert.ok(
+ cli.output.includes(`break in ${script}:2`),
+ 'pauses in next line of the script');
+ assert.match(
+ cli.output,
+ /> 2 let name = 'World';/,
+ 'marks the 2nd line');
+ })
+ .then(() => cli.stepCommand('next'))
+ .then(() => {
+ assert.ok(
+ cli.output.includes(`break in ${script}:3`),
+ 'pauses in next line of the script');
+ assert.match(
+ cli.output,
+ /> 3 name = 'Robin';/,
+ 'marks the 3nd line');
+ })
+ .then(() => cli.stepCommand('cont'))
+ .then(() => {
+ assert.ok(
+ cli.output.includes(`break in ${script}:10`),
+ 'pauses on the next breakpoint');
+ assert.match(
+ cli.output,
+ />10 debugger;/,
+ 'marks the debugger line');
+ })
+
+ // Prepare additional breakpoints
+ .then(() => cli.command('sb("break.js", 6)'))
+ .then(() => assert.doesNotMatch(cli.output, /Could not resolve breakpoint/))
+ .then(() => cli.command('sb("otherFunction()")'))
+ .then(() => cli.command('sb(16)'))
+ .then(() => assert.doesNotMatch(cli.output, /Could not resolve breakpoint/))
+ .then(() => cli.command('breakpoints'))
+ .then(() => {
+ assert.ok(cli.output.includes(`#0 ${script}:6`));
+ assert.ok(cli.output.includes(`#1 ${script}:16`));
+ })
+
+ .then(() => cli.command('list()'))
+ .then(() => {
+ assert.match(
+ cli.output,
+ />10 debugger;/,
+ 'prints and marks current line'
+ );
+ assert.deepStrictEqual(
+ cli.parseSourceLines(),
+ [5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
+ );
+ })
+ .then(() => cli.command('list(2)'))
+ .then(() => {
+ assert.match(
+ cli.output,
+ />10 debugger;/,
+ 'prints and marks current line'
+ );
+ assert.deepStrictEqual(
+ cli.parseSourceLines(),
+ [8, 9, 10, 11, 12],
+ );
+ })
+
+ .then(() => cli.stepCommand('s'))
+ .then(() => cli.stepCommand(''))
+ .then(() => {
+ assert.match(
+ cli.output,
+ /break in node:timers/,
+ 'entered timers.js');
+ })
+ .then(() => cli.stepCommand('cont'))
+ .then(() => {
+ assert.ok(
+ cli.output.includes(`break in ${script}:16`),
+ 'found breakpoint we set above w/ line number only');
+ })
+ .then(() => cli.stepCommand('cont'))
+ .then(() => {
+ assert.ok(
+ cli.output.includes(`break in ${script}:6`),
+ 'found breakpoint we set above w/ line number & script');
+ })
+ .then(() => cli.stepCommand(''))
+ .then(() => {
+ assert.ok(
+ cli.output.includes(`debugCommand in ${script}:14`),
+ 'found function breakpoint we set above');
+ })
+ .then(() => cli.quit())
+ .then(null, onFatal);
+}
diff --git a/test/inspector-cli/test-inspector-cli-clear-breakpoints.js b/test/inspector-cli/test-inspector-cli-clear-breakpoints.js
new file mode 100644
index 00000000000000..f85e33280c6dfd
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-clear-breakpoints.js
@@ -0,0 +1,53 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+const path = require('path');
+
+// clearBreakpoint
+{
+ const scriptFullPath = fixtures.path('inspector-cli', 'break.js');
+ const script = path.relative(process.cwd(), scriptFullPath);
+ const cli = startCLI([script]);
+
+ function onFatal(error) {
+ cli.quit();
+ throw error;
+ }
+
+ return cli.waitForInitialBreak()
+ .then(() => cli.waitForPrompt())
+ .then(() => cli.command('sb("break.js", 3)'))
+ .then(() => cli.command('sb("break.js", 9)'))
+ .then(() => cli.command('breakpoints'))
+ .then(() => {
+ assert.ok(cli.output.includes(`#0 ${script}:3`));
+ assert.ok(cli.output.includes(`#1 ${script}:9`));
+ })
+ .then(() => cli.command('clearBreakpoint("break.js", 4)'))
+ .then(() => {
+ assert.match(cli.output, /Could not find breakpoint/);
+ })
+ .then(() => cli.command('clearBreakpoint("not-such-script.js", 3)'))
+ .then(() => {
+ assert.match(cli.output, /Could not find breakpoint/);
+ })
+ .then(() => cli.command('clearBreakpoint("break.js", 3)'))
+ .then(() => cli.command('breakpoints'))
+ .then(() => {
+ assert.ok(cli.output.includes(`#0 ${script}:9`));
+ })
+ .then(() => cli.stepCommand('cont'))
+ .then(() => {
+ assert.ok(
+ cli.output.includes(`break in ${script}:9`),
+ 'hits the 2nd breakpoint because the 1st was cleared');
+ })
+ .then(() => cli.quit())
+ .then(null, onFatal);
+}
diff --git a/test/inspector-cli/test-inspector-cli-custom-port.js b/test/inspector-cli/test-inspector-cli-custom-port.js
new file mode 100644
index 00000000000000..4b788a6488169a
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-custom-port.js
@@ -0,0 +1,30 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+
+// Custom port.
+{
+ const script = fixtures.path('inspector-cli', 'three-lines.js');
+
+ const cli = startCLI([`--port=${common.PORT}`, script]);
+
+ cli.waitForInitialBreak()
+ .then(() => cli.waitForPrompt())
+ .then(() => {
+ assert.match(cli.output, /debug>/, 'prints a prompt');
+ assert.match(
+ cli.output,
+ new RegExp(`< Debugger listening on [^\n]*${common.PORT}`),
+ 'forwards child output');
+ })
+ .then(() => cli.quit())
+ .then((code) => {
+ assert.strictEqual(code, 0);
+ });
+}
diff --git a/deps/node-inspect/test/cli/exceptions.test.js b/test/inspector-cli/test-inspector-cli-exceptions.js
similarity index 55%
rename from deps/node-inspect/test/cli/exceptions.test.js
rename to test/inspector-cli/test-inspector-cli-exceptions.js
index 69d42d0a25bb1a..324f6f6bde2bf2 100644
--- a/deps/node-inspect/test/cli/exceptions.test.js
+++ b/test/inspector-cli/test-inspector-cli-exceptions.js
@@ -1,12 +1,18 @@
'use strict';
-const Path = require('path');
+const common = require('../common');
-const { test } = require('tap');
+common.skipIfInspectorDisabled();
-const startCLI = require('./start-cli');
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
-test('break on (uncaught) exceptions', (t) => {
- const script = Path.join('examples', 'exceptions.js');
+const assert = require('assert');
+const path = require('path');
+
+// Break on (uncaught) exceptions.
+{
+ const scriptFullPath = fixtures.path('inspector-cli', 'exceptions.js');
+ const script = path.relative(process.cwd(), scriptFullPath);
const cli = startCLI([script]);
function onFatal(error) {
@@ -14,42 +20,42 @@ test('break on (uncaught) exceptions', (t) => {
throw error;
}
- return cli.waitForInitialBreak()
+ cli.waitForInitialBreak()
.then(() => cli.waitForPrompt())
.then(() => {
- t.match(cli.breakInfo, { filename: script, line: 1 });
+ assert.deepStrictEqual(cli.breakInfo, { filename: script, line: 1 });
})
- // making sure it will die by default:
+ // Making sure it will die by default:
.then(() => cli.command('c'))
- // TODO: Remove FATAL ERROR once node doesn't show a FATAL ERROR anymore
+ // TODO: Remove FATAL ERROR once node doesn't show a FATAL ERROR anymore.
.then(() => cli.waitFor(/disconnect|FATAL ERROR/))
- // Next run: With `breakOnException` it pauses in both places
+ // Next run: With `breakOnException` it pauses in both places.
.then(() => cli.stepCommand('r'))
.then(() => cli.waitForInitialBreak())
.then(() => {
- t.match(cli.breakInfo, { filename: script, line: 1 });
+ assert.deepStrictEqual(cli.breakInfo, { filename: script, line: 1 });
})
.then(() => cli.command('breakOnException'))
.then(() => cli.stepCommand('c'))
.then(() => {
- t.match(cli.output, `exception in ${script}:3`);
+ assert.ok(cli.output.includes(`exception in ${script}:3`));
})
.then(() => cli.stepCommand('c'))
.then(() => {
- t.match(cli.output, `exception in ${script}:9`);
+ assert.ok(cli.output.includes(`exception in ${script}:9`));
})
- // Next run: With `breakOnUncaught` it only pauses on the 2nd exception
+ // Next run: With `breakOnUncaught` it only pauses on the 2nd exception.
.then(() => cli.command('breakOnUncaught'))
- .then(() => cli.stepCommand('r')) // also, the setting survives the restart
+ .then(() => cli.stepCommand('r')) // Also, the setting survives the restart.
.then(() => cli.waitForInitialBreak())
.then(() => {
- t.match(cli.breakInfo, { filename: script, line: 1 });
+ assert.deepStrictEqual(cli.breakInfo, { filename: script, line: 1 });
})
.then(() => cli.stepCommand('c'))
.then(() => {
- t.match(cli.output, `exception in ${script}:9`);
+ assert.ok(cli.output.includes(`exception in ${script}:9`));
})
// Next run: Back to the initial state! It should die again.
@@ -57,7 +63,7 @@ test('break on (uncaught) exceptions', (t) => {
.then(() => cli.stepCommand('r'))
.then(() => cli.waitForInitialBreak())
.then(() => {
- t.match(cli.breakInfo, { filename: script, line: 1 });
+ assert.deepStrictEqual(cli.breakInfo, { filename: script, line: 1 });
})
.then(() => cli.command('c'))
// TODO: Remove FATAL ERROR once node doesn't show a FATAL ERROR anymore
@@ -65,4 +71,4 @@ test('break on (uncaught) exceptions', (t) => {
.then(() => cli.quit())
.then(null, onFatal);
-});
+}
diff --git a/test/inspector-cli/test-inspector-cli-exec-scope.js b/test/inspector-cli/test-inspector-cli-exec-scope.js
new file mode 100644
index 00000000000000..ef1455c0b6231e
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-exec-scope.js
@@ -0,0 +1,38 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+
+// exec .scope
+{
+ const cli = startCLI([fixtures.path('inspector-cli/backtrace.js')]);
+
+ function onFatal(error) {
+ cli.quit();
+ throw error;
+ }
+
+ cli.waitForInitialBreak()
+ .then(() => cli.waitForPrompt())
+ .then(() => cli.stepCommand('c'))
+ .then(() => cli.command('exec .scope'))
+ .then(() => {
+ assert.match(
+ cli.output,
+ /'moduleScoped'/, 'displays closure from module body');
+ assert.match(cli.output, /'a'/, 'displays local / function arg');
+ assert.match(cli.output, /'l1'/, 'displays local scope');
+ assert.doesNotMatch(
+ cli.output,
+ /'encodeURIComponent'/,
+ 'omits global scope'
+ );
+ })
+ .then(() => cli.quit())
+ .then(null, onFatal);
+}
diff --git a/test/inspector-cli/test-inspector-cli-exec.js b/test/inspector-cli/test-inspector-cli-exec.js
new file mode 100644
index 00000000000000..f47eaaa5a6f62d
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-exec.js
@@ -0,0 +1,67 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+
+{
+
+ const cli = startCLI([fixtures.path('inspector-cli/alive.js')]);
+
+ function onFatal(error) {
+ cli.quit();
+ throw error;
+ }
+
+ cli.waitForInitialBreak()
+ .then(() => cli.waitForPrompt())
+ .then(() => cli.command('exec [typeof heartbeat, typeof process.exit]'))
+ .then(() => {
+ assert.match(
+ cli.output,
+ /\[ 'function', 'function' \]/,
+ 'works w/o paren'
+ );
+ })
+ .then(() => cli.command('repl'))
+ .then(() => {
+ assert.match(
+ cli.output,
+ /Press Ctrl\+C to leave debug repl\n+> /,
+ 'shows hint for how to leave repl');
+ assert.doesNotMatch(cli.output, /debug>/, 'changes the repl style');
+ })
+ .then(() => cli.command('[typeof heartbeat, typeof process.exit]'))
+ .then(() => cli.waitFor(/function/))
+ .then(() => cli.waitForPrompt())
+ .then(() => {
+ assert.match(
+ cli.output,
+ /\[ 'function', 'function' \]/, 'can evaluate in the repl');
+ assert.match(cli.output, /> $/);
+ })
+ .then(() => cli.ctrlC())
+ .then(() => cli.waitFor(/debug> $/))
+ .then(() => cli.command('exec("[typeof heartbeat, typeof process.exit]")'))
+ .then(() => {
+ assert.match(
+ cli.output,
+ /\[ 'function', 'function' \]/,
+ 'works w/ paren'
+ );
+ })
+ .then(() => cli.command('cont'))
+ .then(() => cli.command('exec [typeof heartbeat, typeof process.exit]'))
+ .then(() => {
+ assert.match(
+ cli.output,
+ /\[ 'undefined', 'function' \]/,
+ 'non-paused exec can see global but not module-scope values');
+ })
+ .then(() => cli.quit())
+ .then(null, onFatal);
+}
diff --git a/test/inspector-cli/test-inspector-cli-heap-profiler.js b/test/inspector-cli/test-inspector-cli-heap-profiler.js
new file mode 100644
index 00000000000000..689604b1c597cb
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-heap-profiler.js
@@ -0,0 +1,37 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+if (!common.isMainThread) {
+ common.skip('process.chdir() is not available in workers');
+}
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+const tmpdir = require('../common/tmpdir');
+
+tmpdir.refresh();
+process.chdir(tmpdir.path);
+
+const { readFileSync } = require('fs');
+
+const filename = 'node.heapsnapshot';
+
+// Heap profiler take snapshot.
+{
+ const cli = startCLI([fixtures.path('inspector-cli/empty.js')]);
+
+ function onFatal(error) {
+ cli.quit();
+ throw error;
+ }
+
+ // Check that the snapshot is valid JSON.
+ return cli.waitForInitialBreak()
+ .then(() => cli.waitForPrompt())
+ .then(() => cli.command('takeHeapSnapshot()'))
+ .then(() => JSON.parse(readFileSync(filename, 'utf8')))
+ .then(() => cli.quit())
+ .then(null, onFatal);
+}
diff --git a/test/inspector-cli/test-inspector-cli-help.js b/test/inspector-cli/test-inspector-cli-help.js
new file mode 100644
index 00000000000000..f72d4960a75755
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-help.js
@@ -0,0 +1,27 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+
+{
+ const cli = startCLI([fixtures.path('inspector-cli/empty.js')]);
+
+ function onFatal(error) {
+ cli.quit();
+ throw error;
+ }
+
+ return cli.waitForInitialBreak()
+ .then(() => cli.waitForPrompt())
+ .then(() => cli.command('help'))
+ .then(() => {
+ assert.match(cli.output, /run, restart, r\s+/m);
+ })
+ .then(() => cli.quit())
+ .then(null, onFatal);
+}
diff --git a/test/inspector-cli/test-inspector-cli-invalid-args.js b/test/inspector-cli/test-inspector-cli-invalid-args.js
new file mode 100644
index 00000000000000..841d7a883178d7
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-invalid-args.js
@@ -0,0 +1,59 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+const { createServer } = require('net');
+
+// Launch CLI w/o args.
+{
+ const cli = startCLI([]);
+ cli.quit()
+ .then((code) => {
+ assert.strictEqual(code, 1);
+ assert.match(cli.output, /^Usage:/, 'Prints usage info');
+ });
+}
+
+// Launch w/ invalid host:port.
+{
+ const cli = startCLI(['localhost:914']);
+ cli.quit()
+ .then((code) => {
+ assert.match(
+ cli.output,
+ /failed to connect/,
+ 'Tells the user that the connection failed');
+ assert.strictEqual(code, 1);
+ });
+}
+
+// Launch w/ unavailable port.
+(async () => {
+ const blocker = createServer((socket) => socket.end());
+ const port = await new Promise((resolve, reject) => {
+ blocker.on('error', reject);
+ blocker.listen(0, '127.0.0.1', () => resolve(blocker.address().port));
+ });
+
+ try {
+ const script = fixtures.path('inspector-cli', 'three-lines.js');
+ const cli = startCLI([`--port=${port}`, script]);
+ const code = await cli.quit();
+
+ assert.doesNotMatch(
+ cli.output,
+ /report this bug/,
+ 'Omits message about reporting this as a bug');
+ assert.ok(
+ cli.output.includes(`waiting for 127.0.0.1:${port} to be free`),
+ 'Tells the user that the port wasn\'t available');
+ assert.strictEqual(code, 1);
+ } finally {
+ blocker.close();
+ }
+})().then(common.mustCall());
diff --git a/test/inspector-cli/test-inspector-cli-launch.js b/test/inspector-cli/test-inspector-cli-launch.js
new file mode 100644
index 00000000000000..60f09334b4ef27
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-launch.js
@@ -0,0 +1,47 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+
+{
+ const script = fixtures.path('inspector-cli', 'three-lines.js');
+ const cli = startCLI([script]);
+
+ cli.waitForInitialBreak()
+ .then(() => cli.waitForPrompt())
+ .then(() => {
+ assert.match(cli.output, /debug>/, 'prints a prompt');
+ assert.match(
+ cli.output,
+ /< Debugger listening on [^\n]*9229/,
+ 'forwards child output');
+ })
+ .then(() => cli.command('["hello", "world"].join(" ")'))
+ .then(() => {
+ assert.match(cli.output, /hello world/, 'prints the result');
+ })
+ .then(() => cli.command(''))
+ .then(() => {
+ assert.match(
+ cli.output,
+ /hello world/,
+ 'repeats the last command on '
+ );
+ })
+ .then(() => cli.command('version'))
+ .then(() => {
+ assert.ok(
+ cli.output.includes(process.versions.v8),
+ 'version prints the v8 version'
+ );
+ })
+ .then(() => cli.quit())
+ .then((code) => {
+ assert.strictEqual(code, 0);
+ });
+}
diff --git a/deps/node-inspect/test/cli/low-level.test.js b/test/inspector-cli/test-inspector-cli-low-level.js
similarity index 57%
rename from deps/node-inspect/test/cli/low-level.test.js
rename to test/inspector-cli/test-inspector-cli-low-level.js
index 2a41359825612f..5fafc7c361c33b 100644
--- a/deps/node-inspect/test/cli/low-level.test.js
+++ b/test/inspector-cli/test-inspector-cli-low-level.js
@@ -1,11 +1,16 @@
'use strict';
-const { test } = require('tap');
+const common = require('../common');
-const startCLI = require('./start-cli');
+common.skipIfInspectorDisabled();
-test('Debugger agent direct access', (t) => {
- const cli = startCLI(['examples/three-lines.js']);
- const scriptPattern = /^\* (\d+): examples(?:\/|\\)three-lines.js/;
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+const assert = require('assert');
+
+// Debugger agent direct access.
+{
+ const cli = startCLI([fixtures.path('inspector-cli/three-lines.js')]);
+ const scriptPattern = /^\* (\d+): \S+inspector-cli(?:\/|\\)three-lines\.js/m;
function onFatal(error) {
cli.quit();
@@ -22,13 +27,13 @@ test('Debugger agent direct access', (t) => {
);
})
.then(() => {
- t.match(
+ assert.match(
cli.output,
/scriptSource:[ \n]*'(?:\(function \(|let x = 1)/);
- t.match(
+ assert.match(
cli.output,
/let x = 1;/);
})
.then(() => cli.quit())
.then(null, onFatal);
-});
+}
diff --git a/test/inspector-cli/test-inspector-cli-pid.js b/test/inspector-cli/test-inspector-cli-pid.js
new file mode 100644
index 00000000000000..92c81177650af3
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-pid.js
@@ -0,0 +1,61 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+const { spawn } = require('child_process');
+
+
+function launchTarget(...args) {
+ const childProc = spawn(process.execPath, args);
+ return Promise.resolve(childProc);
+}
+
+{
+ const script = fixtures.path('inspector-cli', 'alive.js');
+ let cli = null;
+ let target = null;
+
+ function cleanup(error) {
+ if (cli) {
+ cli.quit();
+ cli = null;
+ }
+ if (target) {
+ target.kill();
+ target = null;
+ }
+ assert.ifError(error);
+ }
+
+ return launchTarget(script)
+ .then((childProc) => {
+ target = childProc;
+ cli = startCLI(['-p', `${target.pid}`]);
+ return cli.waitForPrompt();
+ })
+ .then(() => cli.command('sb("alive.js", 3)'))
+ .then(() => cli.waitFor(/break/))
+ // TODO: There is a known issue on AIX and some other operating systems
+ // where the breakpoints aren't properly resolved yet when we reach this
+ // point. Eventually that should be figured out but for now we don't
+ // want to fail builds because of it.
+ // What it should be:
+ //
+ // .then(() => cli.waitForPrompt())
+ //
+ // What we're diong for now:
+ .then(() => cli.waitFor(/>\s+(?:\n1 breakpoints restored\.)?$/))
+ .then(() => {
+ assert.match(
+ cli.output,
+ /> 3 \+\+x;/,
+ 'marks the 3rd line');
+ })
+ .then(() => cleanup())
+ .then(null, cleanup);
+}
diff --git a/test/inspector-cli/test-inspector-cli-preserve-breaks.js b/test/inspector-cli/test-inspector-cli-preserve-breaks.js
new file mode 100644
index 00000000000000..fb751016ec7614
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-preserve-breaks.js
@@ -0,0 +1,72 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+const path = require('path');
+
+// Run after quit.
+{
+ const scriptFullPath = fixtures.path('inspector-cli', 'three-lines.js');
+ const script = path.relative(process.cwd(), scriptFullPath);
+ const cli = startCLI([script]);
+
+ function onFatal(error) {
+ cli.quit();
+ throw error;
+ }
+
+ return cli.waitForInitialBreak()
+ .then(() => cli.waitForPrompt())
+ .then(() => cli.command('breakpoints'))
+ .then(() => {
+ assert.match(cli.output, /No breakpoints yet/);
+ })
+ .then(() => cli.command('sb(2)'))
+ .then(() => cli.command('sb(3)'))
+ .then(() => cli.command('breakpoints'))
+ .then(() => {
+ assert.ok(cli.output.includes(`#0 ${script}:2`));
+ assert.ok(cli.output.includes(`#1 ${script}:3`));
+ })
+ .then(() => cli.stepCommand('c')) // hit line 2
+ .then(() => cli.stepCommand('c')) // hit line 3
+ .then(() => {
+ assert.deepStrictEqual(cli.breakInfo, { filename: script, line: 3 });
+ })
+ .then(() => cli.command('restart'))
+ .then(() => cli.waitForInitialBreak())
+ .then(() => {
+ assert.deepStrictEqual(cli.breakInfo, { filename: script, line: 1 });
+ })
+ .then(() => cli.stepCommand('c'))
+ .then(() => {
+ assert.deepStrictEqual(cli.breakInfo, { filename: script, line: 2 });
+ })
+ .then(() => cli.stepCommand('c'))
+ .then(() => {
+ assert.deepStrictEqual(cli.breakInfo, { filename: script, line: 3 });
+ })
+ .then(() => cli.command('breakpoints'))
+ .then(() => {
+ // TODO: There is a known issue on AIX and some other operating systems
+ // where the breakpoints aren't properly resolved yet when we reach this
+ // point. Eventually that should be figured out but for now we don't
+ // want to fail builds because of it.
+ // What it should be:
+ //
+ // const msg = `SCRIPT: ${script}, OUTPUT: ${cli.output}`;
+ // assert.ok(cli.output.includes(`#0 ${script}:2`), msg);
+ // assert.ok(cli.output.includes(`#1 ${script}:3`), msg);
+ //
+ // What we're doing for now instead:
+ assert.match(cli.output, /#0 [^\n]+three-lines\.js\$?:2/);
+ assert.match(cli.output, /#1 [^\n]+three-lines\.js\$?:3/);
+ })
+ .then(() => cli.quit())
+ .then(null, onFatal);
+}
diff --git a/deps/node-inspect/test/cli/profile.test.js b/test/inspector-cli/test-inspector-cli-profile.js
similarity index 52%
rename from deps/node-inspect/test/cli/profile.test.js
rename to test/inspector-cli/test-inspector-cli-profile.js
index 0f900c5a2b06f8..a683d78b06f204 100644
--- a/deps/node-inspect/test/cli/profile.test.js
+++ b/test/inspector-cli/test-inspector-cli-profile.js
@@ -1,14 +1,20 @@
'use strict';
-const { test } = require('tap');
+const common = require('../common');
-const startCLI = require('./start-cli');
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
function delay(ms) {
return new Promise((resolve) => setTimeout(resolve, ms));
}
-test('profiles', (t) => {
- const cli = startCLI(['examples/empty.js']);
+// Profiles.
+{
+ const cli = startCLI([fixtures.path('inspector-cli/empty.js')]);
function onFatal(error) {
cli.quit();
@@ -19,14 +25,14 @@ test('profiles', (t) => {
.then(() => cli.waitForPrompt())
.then(() => cli.command('exec console.profile()'))
.then(() => {
- t.match(cli.output, 'undefined');
+ assert.match(cli.output, /undefined/);
})
.then(() => cli.command('exec console.profileEnd()'))
.then(() => delay(250))
.then(() => {
- t.match(cli.output, 'undefined');
- t.match(cli.output, 'Captured new CPU profile.');
+ assert.match(cli.output, /undefined/);
+ assert.match(cli.output, /Captured new CPU profile\./);
})
.then(() => cli.quit())
.then(null, onFatal);
-});
+}
diff --git a/test/inspector-cli/test-inspector-cli-random-port-with-inspect-port.js b/test/inspector-cli/test-inspector-cli-random-port-with-inspect-port.js
new file mode 100644
index 00000000000000..9089f352f4c91b
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-random-port-with-inspect-port.js
@@ -0,0 +1,30 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+
+// Random port with --inspect-port=0.
+{
+ const script = fixtures.path('inspector-cli', 'three-lines.js');
+
+ const cli = startCLI(['--inspect-port=0', script]);
+
+ cli.waitForInitialBreak()
+ .then(() => cli.waitForPrompt())
+ .then(() => {
+ assert.match(cli.output, /debug>/, 'prints a prompt');
+ assert.match(
+ cli.output,
+ /< Debugger listening on /,
+ 'forwards child output');
+ })
+ .then(() => cli.quit())
+ .then((code) => {
+ assert.strictEqual(code, 0);
+ });
+}
diff --git a/test/inspector-cli/test-inspector-cli-random-port.js b/test/inspector-cli/test-inspector-cli-random-port.js
new file mode 100644
index 00000000000000..aecadc549ce9c9
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-random-port.js
@@ -0,0 +1,30 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+
+// Random port.
+{
+ const script = fixtures.path('inspector-cli', 'three-lines.js');
+
+ const cli = startCLI(['--port=0', script]);
+
+ cli.waitForInitialBreak()
+ .then(() => cli.waitForPrompt())
+ .then(() => {
+ assert.match(cli.output, /debug>/, 'prints a prompt');
+ assert.match(
+ cli.output,
+ /< Debugger listening on /,
+ 'forwards child output');
+ })
+ .then(() => cli.quit())
+ .then((code) => {
+ assert.strictEqual(code, 0);
+ });
+}
diff --git a/test/inspector-cli/test-inspector-cli-run-after-quit-restart.js b/test/inspector-cli/test-inspector-cli-run-after-quit-restart.js
new file mode 100644
index 00000000000000..0e0233d1209d53
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-run-after-quit-restart.js
@@ -0,0 +1,90 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+const path = require('path');
+
+// Run after quit/restart.
+{
+ const scriptFullPath = fixtures.path('inspector-cli', 'three-lines.js');
+ const script = path.relative(process.cwd(), scriptFullPath);
+ const cli = startCLI([script]);
+
+ function onFatal(error) {
+ cli.quit();
+ throw error;
+ }
+
+ cli.waitForInitialBreak()
+ .then(() => cli.waitForPrompt())
+ .then(() => cli.stepCommand('n'))
+ .then(() => {
+ assert.ok(
+ cli.output.includes(`break in ${script}:2`),
+ 'steps to the 2nd line'
+ );
+ })
+ .then(() => cli.command('cont'))
+ .then(() => cli.waitFor(/disconnect/))
+ .then(() => {
+ assert.match(
+ cli.output,
+ /Waiting for the debugger to disconnect/,
+ 'the child was done');
+ })
+ .then(() => {
+ // On windows the socket won't close by itself
+ return cli.command('kill');
+ })
+ .then(() => cli.command('cont'))
+ .then(() => cli.waitFor(/start the app/))
+ .then(() => {
+ assert.match(cli.output, /Use `run` to start the app again/);
+ })
+ .then(() => cli.stepCommand('run'))
+ .then(() => cli.waitForInitialBreak())
+ .then(() => cli.waitForPrompt())
+ .then(() => {
+ assert.deepStrictEqual(
+ cli.breakInfo,
+ { filename: script, line: 1 },
+ );
+ })
+ .then(() => cli.stepCommand('n'))
+ .then(() => {
+ assert.deepStrictEqual(
+ cli.breakInfo,
+ { filename: script, line: 2 },
+ );
+ })
+ .then(() => cli.stepCommand('restart'))
+ .then(() => cli.waitForInitialBreak())
+ .then(() => {
+ assert.deepStrictEqual(
+ cli.breakInfo,
+ { filename: script, line: 1 },
+ );
+ })
+ .then(() => cli.command('kill'))
+ .then(() => cli.command('cont'))
+ .then(() => cli.waitFor(/start the app/))
+ .then(() => {
+ assert.match(cli.output, /Use `run` to start the app again/);
+ })
+ .then(() => cli.stepCommand('run'))
+ .then(() => cli.waitForInitialBreak())
+ .then(() => cli.waitForPrompt())
+ .then(() => {
+ assert.deepStrictEqual(
+ cli.breakInfo,
+ { filename: script, line: 1 },
+ );
+ })
+ .then(() => cli.quit())
+ .then(null, onFatal);
+}
diff --git a/test/inspector-cli/test-inspector-cli-sb-before-load.js b/test/inspector-cli/test-inspector-cli-sb-before-load.js
new file mode 100644
index 00000000000000..fe1923f884a1e0
--- /dev/null
+++ b/test/inspector-cli/test-inspector-cli-sb-before-load.js
@@ -0,0 +1,44 @@
+'use strict';
+const common = require('../common');
+
+common.skipIfInspectorDisabled();
+
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+const path = require('path');
+
+// Using sb before loading file.
+{
+ const scriptFullPath = fixtures.path('inspector-cli', 'cjs', 'index.js');
+ const script = path.relative(process.cwd(), scriptFullPath);
+
+ const otherScriptFullPath = fixtures.path('inspector-cli', 'cjs', 'other.js');
+ const otherScript = path.relative(process.cwd(), otherScriptFullPath);
+
+ const cli = startCLI([script]);
+
+ function onFatal(error) {
+ cli.quit();
+ throw error;
+ }
+
+ cli.waitForInitialBreak()
+ .then(() => cli.waitForPrompt())
+ .then(() => cli.command('sb("other.js", 2)'))
+ .then(() => {
+ assert.match(
+ cli.output,
+ /not loaded yet/,
+ 'warns that the script was not loaded yet');
+ })
+ .then(() => cli.stepCommand('cont'))
+ .then(() => {
+ assert.ok(
+ cli.output.includes(`break in ${otherScript}:2`),
+ 'found breakpoint in file that was not loaded yet');
+ })
+ .then(() => cli.quit())
+ .then(null, onFatal);
+}
diff --git a/deps/node-inspect/test/cli/scripts.test.js b/test/inspector-cli/test-inspector-cli-scripts.js
similarity index 51%
rename from deps/node-inspect/test/cli/scripts.test.js
rename to test/inspector-cli/test-inspector-cli-scripts.js
index f6e3f30dcafce0..3c634e4b80ac83 100644
--- a/deps/node-inspect/test/cli/scripts.test.js
+++ b/test/inspector-cli/test-inspector-cli-scripts.js
@@ -1,12 +1,16 @@
'use strict';
-const Path = require('path');
+const common = require('../common');
-const { test } = require('tap');
+common.skipIfInspectorDisabled();
-const startCLI = require('./start-cli');
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
-test('list scripts', (t) => {
- const script = Path.join('examples', 'three-lines.js');
+const assert = require('assert');
+
+// List scripts.
+{
+ const script = fixtures.path('inspector-cli', 'three-lines.js');
const cli = startCLI([script]);
function onFatal(error) {
@@ -18,26 +22,26 @@ test('list scripts', (t) => {
.then(() => cli.waitForPrompt())
.then(() => cli.command('scripts'))
.then(() => {
- t.match(
+ assert.match(
cli.output,
- /^\* \d+: examples(?:\/|\\)three-lines\.js/,
+ /^\* \d+: \S+inspector-cli(?:\/|\\)three-lines\.js/m,
'lists the user script');
- t.notMatch(
+ assert.doesNotMatch(
cli.output,
- /\d+: buffer\.js /,
+ /\d+: node:internal\/buffer/,
'omits node-internal scripts');
})
.then(() => cli.command('scripts(true)'))
.then(() => {
- t.match(
+ assert.match(
cli.output,
- /\* \d+: examples(?:\/|\\)three-lines\.js/,
+ /\* \d+: \S+inspector-cli(?:\/|\\)three-lines\.js/,
'lists the user script');
- t.match(
+ assert.match(
cli.output,
- /\d+: buffer\.js /,
+ /\d+: node:internal\/buffer/,
'includes node-internal scripts');
})
.then(() => cli.quit())
.then(null, onFatal);
-});
+}
diff --git a/deps/node-inspect/test/cli/use-strict.test.js b/test/inspector-cli/test-inspector-cli-use-strict.js
similarity index 54%
rename from deps/node-inspect/test/cli/use-strict.test.js
rename to test/inspector-cli/test-inspector-cli-use-strict.js
index c6dc8f31cd82b5..4fb33c9f3e58fa 100644
--- a/deps/node-inspect/test/cli/use-strict.test.js
+++ b/test/inspector-cli/test-inspector-cli-use-strict.js
@@ -1,12 +1,16 @@
'use strict';
-const Path = require('path');
+const common = require('../common');
-const { test } = require('tap');
+common.skipIfInspectorDisabled();
-const startCLI = require('./start-cli');
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
-test('for whiles that starts with strict directive', (t) => {
- const script = Path.join('examples', 'use-strict.js');
+const assert = require('assert');
+
+// Test for files that start with strict directive.
+{
+ const script = fixtures.path('inspector-cli', 'use-strict.js');
const cli = startCLI([script]);
function onFatal(error) {
@@ -18,11 +22,11 @@ test('for whiles that starts with strict directive', (t) => {
.then(() => cli.waitForPrompt())
.then(() => {
const brk = cli.breakInfo;
- t.match(
+ assert.match(
`${brk.line}`,
/^(1|2)$/,
'pauses either on strict directive or first "real" line');
})
.then(() => cli.quit())
.then(null, onFatal);
-});
+}
diff --git a/deps/node-inspect/test/cli/watchers.test.js b/test/inspector-cli/test-inspector-cli-watchers.js
similarity index 56%
rename from deps/node-inspect/test/cli/watchers.test.js
rename to test/inspector-cli/test-inspector-cli-watchers.js
index 46bcde19a2a4cf..ab39be6239ec26 100644
--- a/deps/node-inspect/test/cli/watchers.test.js
+++ b/test/inspector-cli/test-inspector-cli-watchers.js
@@ -1,10 +1,16 @@
'use strict';
-const { test } = require('tap');
+const common = require('../common');
-const startCLI = require('./start-cli');
+common.skipIfInspectorDisabled();
-test('stepping through breakpoints', (t) => {
- const cli = startCLI(['examples/break.js']);
+const fixtures = require('../common/fixtures');
+const startCLI = require('../common/inspector-cli');
+
+const assert = require('assert');
+
+// Stepping through breakpoints.
+{
+ const cli = startCLI([fixtures.path('inspector-cli/break.js')]);
function onFatal(error) {
cli.quit();
@@ -22,21 +28,21 @@ test('stepping through breakpoints', (t) => {
.then(() => cli.command('watch("process.env")'))
.then(() => cli.command('watchers'))
.then(() => {
- t.match(cli.output, 'x is not defined');
+ assert.match(cli.output, /x is not defined/);
})
.then(() => cli.command('unwatch("42")'))
.then(() => cli.stepCommand('n'))
.then(() => {
- t.match(cli.output, '0: x = 10');
- t.match(cli.output, '1: "Hello" = \'Hello\'');
- t.match(cli.output, '2: NaN = NaN');
- t.match(cli.output, '3: true = true');
- t.match(cli.output, '4: [1, 2] = [ 1, 2 ]');
- t.match(
+ assert.match(cli.output, /0: x = 10/);
+ assert.match(cli.output, /1: "Hello" = 'Hello'/);
+ assert.match(cli.output, /2: NaN = NaN/);
+ assert.match(cli.output, /3: true = true/);
+ assert.match(cli.output, /4: \[1, 2\] = \[ 1, 2 \]/);
+ assert.match(
cli.output,
/5: process\.env =\n\s+\{[\s\S]+,\n\s+\.\.\. \}/,
'shows "..." for process.env');
})
.then(() => cli.quit())
.then(null, onFatal);
-});
+}
diff --git a/test/inspector-cli/testcfg.py b/test/inspector-cli/testcfg.py
new file mode 100644
index 00000000000000..d45972ac3f1357
--- /dev/null
+++ b/test/inspector-cli/testcfg.py
@@ -0,0 +1,6 @@
+import sys, os
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+import testpy
+
+def GetConfiguration(context, root):
+ return testpy.SimpleTestConfiguration(context, root, 'inspector-cli')
diff --git a/test/parallel/test-crypto-dh.js b/test/parallel/test-crypto-dh.js
index e35585e8eb19d1..cae9301517c37c 100644
--- a/test/parallel/test-crypto-dh.js
+++ b/test/parallel/test-crypto-dh.js
@@ -495,3 +495,7 @@ assert.throws(
code: 'ERR_INVALID_ARG_TYPE'
}
);
+[true, Symbol(), {}, () => {}, []].forEach((generator) => assert.throws(
+ () => crypto.createDiffieHellman('', 'base64', generator),
+ { code: 'ERR_INVALID_ARG_TYPE' }
+));
diff --git a/test/parallel/test-crypto-key-objects.js b/test/parallel/test-crypto-key-objects.js
index d7b3f9af83acd9..aa57aaa41f4813 100644
--- a/test/parallel/test-crypto-key-objects.js
+++ b/test/parallel/test-crypto-key-objects.js
@@ -66,6 +66,16 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem',
});
}
+{
+ assert.throws(() => KeyObject.from('invalid_key'), {
+ name: 'TypeError',
+ code: 'ERR_INVALID_ARG_TYPE',
+ message:
+ 'The "key" argument must be an instance of CryptoKey. Received type ' +
+ "string ('invalid_key')"
+ });
+}
+
{
const keybuf = randomBytes(32);
const key = createSecretKey(keybuf);
diff --git a/test/parallel/test-crypto-keygen.js b/test/parallel/test-crypto-keygen.js
index cbf797c0ea2388..a120a3838e2048 100644
--- a/test/parallel/test-crypto-keygen.js
+++ b/test/parallel/test-crypto-keygen.js
@@ -958,7 +958,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
}
// Test invalid divisor lengths.
- for (const divisorLength of ['a', true, {}, [], 4096.1]) {
+ for (const divisorLength of ['a', true, {}, [], 4096.1, 2147483648, -1]) {
assert.throws(() => generateKeyPair('dsa', {
modulusLength: 2048,
divisorLength
@@ -1081,6 +1081,52 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
message: 'Unknown DH group'
});
+ assert.throws(() => {
+ generateKeyPair('dh', {
+ primeLength: 2147483648
+ }, common.mustNotCall());
+ }, {
+ name: 'TypeError',
+ code: 'ERR_INVALID_ARG_VALUE',
+ message: "The property 'options.primeLength' is invalid. " +
+ 'Received 2147483648',
+ });
+
+ assert.throws(() => {
+ generateKeyPair('dh', {
+ primeLength: -1
+ }, common.mustNotCall());
+ }, {
+ name: 'TypeError',
+ code: 'ERR_INVALID_ARG_VALUE',
+ message: "The property 'options.primeLength' is invalid. " +
+ 'Received -1',
+ });
+
+ assert.throws(() => {
+ generateKeyPair('dh', {
+ primeLength: 2,
+ generator: 2147483648,
+ }, common.mustNotCall());
+ }, {
+ name: 'TypeError',
+ code: 'ERR_INVALID_ARG_VALUE',
+ message: "The property 'options.generator' is invalid. " +
+ 'Received 2147483648',
+ });
+
+ assert.throws(() => {
+ generateKeyPair('dh', {
+ primeLength: 2,
+ generator: -1,
+ }, common.mustNotCall());
+ }, {
+ name: 'TypeError',
+ code: 'ERR_INVALID_ARG_VALUE',
+ message: "The property 'options.generator' is invalid. " +
+ 'Received -1',
+ });
+
// Test incompatible options.
const allOpts = {
group: 'modp5',
@@ -1142,6 +1188,35 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
});
}
+ // too long salt length
+ assert.throws(() => {
+ generateKeyPair('rsa-pss', {
+ modulusLength: 512,
+ saltLength: 2147483648,
+ hash: 'sha256',
+ mgf1Hash: 'sha256'
+ }, common.mustNotCall());
+ }, {
+ name: 'TypeError',
+ code: 'ERR_INVALID_ARG_VALUE',
+ message: "The property 'options.saltLength' is invalid. " +
+ 'Received 2147483648'
+ });
+
+ assert.throws(() => {
+ generateKeyPair('rsa-pss', {
+ modulusLength: 512,
+ saltLength: -1,
+ hash: 'sha256',
+ mgf1Hash: 'sha256'
+ }, common.mustNotCall());
+ }, {
+ name: 'TypeError',
+ code: 'ERR_INVALID_ARG_VALUE',
+ message: "The property 'options.saltLength' is invalid. " +
+ 'Received -1'
+ });
+
// Invalid private key type.
for (const type of ['foo', 'spki']) {
assert.throws(() => {
diff --git a/test/parallel/test-crypto-pbkdf2.js b/test/parallel/test-crypto-pbkdf2.js
index 260bdd394ce05e..c9ab6a9c48438e 100644
--- a/test/parallel/test-crypto-pbkdf2.js
+++ b/test/parallel/test-crypto-pbkdf2.js
@@ -231,3 +231,15 @@ if (!common.hasOpenSSL3) {
runPBKDF2(new Uint8Array(10), 'salt', 8, 8, hash);
});
}
+
+{
+ // This should not crash.
+ assert.throws(
+ () => crypto.pbkdf2Sync('1', '2', 1, 1, '%'),
+ {
+ code: 'ERR_CRYPTO_INVALID_DIGEST',
+ name: 'TypeError',
+ message: 'Invalid digest: %'
+ }
+ );
+}
diff --git a/test/parallel/test-crypto-scrypt.js b/test/parallel/test-crypto-scrypt.js
index 9db69646bbfb0a..7b695a36f2b5a4 100644
--- a/test/parallel/test-crypto-scrypt.js
+++ b/test/parallel/test-crypto-scrypt.js
@@ -143,6 +143,10 @@ const badargs = [
args: ['', '', -42],
expected: { code: 'ERR_OUT_OF_RANGE', message: /"keylen"/ },
},
+ {
+ args: ['', '', 2147485780],
+ expected: { code: 'ERR_OUT_OF_RANGE', message: /"keylen"/ },
+ },
];
for (const options of good) {
diff --git a/test/parallel/test-eslint-non-ascii-character.js b/test/parallel/test-eslint-non-ascii-character.js
new file mode 100644
index 00000000000000..0b4a09f813431b
--- /dev/null
+++ b/test/parallel/test-eslint-non-ascii-character.js
@@ -0,0 +1,26 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
+
+common.skipIfEslintMissing();
+
+const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
+const rule = require('../../tools/eslint-rules/non-ascii-character');
+
+new RuleTester().run('non-ascii-characters', rule, {
+ valid: [
+ {
+ code: 'console.log("fhqwhgads")',
+ options: []
+ },
+ ],
+ invalid: [
+ {
+ code: 'console.log("μ")',
+ options: [],
+ errors: [{ message: "Non-ASCII character 'μ' detected." }],
+ },
+ ]
+});
diff --git a/test/parallel/test-freeze-intrinsics.js b/test/parallel/test-freeze-intrinsics.js
index 2e9ff5f4fe2fdc..978a6861a517fc 100644
--- a/test/parallel/test-freeze-intrinsics.js
+++ b/test/parallel/test-freeze-intrinsics.js
@@ -30,3 +30,10 @@ assert.throws(
assert.strictEqual(Object.getOwnPropertyDescriptor(o, 'toString').enumerable,
true);
}
+
+// Ensure we can not override globalThis
+{
+ assert.throws(() => { globalThis.globalThis = null; },
+ { name: 'TypeError' });
+ assert.strictEqual(globalThis.globalThis, globalThis);
+}
diff --git a/test/parallel/test-fs-promises-file-handle-read.js b/test/parallel/test-fs-promises-file-handle-read.js
index cd2caab9f0273c..44ef2c6b815a3d 100644
--- a/test/parallel/test-fs-promises-file-handle-read.js
+++ b/test/parallel/test-fs-promises-file-handle-read.js
@@ -61,6 +61,13 @@ async function validateLargeRead(options) {
assert.strictEqual(readHandle.bytesRead, 0);
}
+async function validateReadNoParams() {
+ const filePath = fixtures.path('x.txt');
+ const fileHandle = await open(filePath, 'r');
+ // Should not throw
+ await fileHandle.read();
+}
+
(async function() {
tmpdir.refresh();
@@ -70,4 +77,5 @@ async function validateLargeRead(options) {
await validateRead('', 'read-empty-file-conf', { useConf: true });
await validateLargeRead({ useConf: false });
await validateLargeRead({ useConf: true });
+ await validateReadNoParams();
})().then(common.mustCall());
diff --git a/test/parallel/test-fs-read-stream-pos.js b/test/parallel/test-fs-read-stream-pos.js
new file mode 100644
index 00000000000000..c9470cb23ddeb6
--- /dev/null
+++ b/test/parallel/test-fs-read-stream-pos.js
@@ -0,0 +1,69 @@
+'use strict';
+
+// Refs: https://github.com/nodejs/node/issues/33940
+
+const common = require('../common');
+const tmpdir = require('../common/tmpdir');
+const fs = require('fs');
+const assert = require('assert');
+const path = require('path');
+
+tmpdir.refresh();
+
+const file = path.join(tmpdir.path, '/read_stream_pos_test.txt');
+
+fs.writeFileSync(file, '');
+
+let counter = 0;
+
+setInterval(() => {
+ counter = counter + 1;
+ const line = `hello at ${counter}\n`;
+ fs.writeFileSync(file, line, { flag: 'a' });
+}, 1);
+
+const hwm = 10;
+let bufs = [];
+let isLow = false;
+let cur = 0;
+let stream;
+
+setInterval(() => {
+ if (stream) return;
+
+ stream = fs.createReadStream(file, {
+ highWaterMark: hwm,
+ start: cur
+ });
+ stream.on('data', common.mustCallAtLeast((chunk) => {
+ cur += chunk.length;
+ bufs.push(chunk);
+ if (isLow) {
+ const brokenLines = Buffer.concat(bufs).toString()
+ .split('\n')
+ .filter((line) => {
+ const s = 'hello at'.slice(0, line.length);
+ if (line && !line.startsWith(s)) {
+ return true;
+ }
+ return false;
+ });
+ assert.strictEqual(brokenLines.length, 0);
+ process.exit();
+ return;
+ }
+ if (chunk.length !== hwm) {
+ isLow = true;
+ }
+ }));
+ stream.on('end', () => {
+ stream = null;
+ isLow = false;
+ bufs = [];
+ });
+}, 10);
+
+// Time longer than 90 seconds to exit safely
+setTimeout(() => {
+ process.exit();
+}, 90000);
diff --git a/test/parallel/test-fs-read-type.js b/test/parallel/test-fs-read-type.js
index 81440ab57eb802..2baab18dc9f483 100644
--- a/test/parallel/test-fs-read-type.js
+++ b/test/parallel/test-fs-read-type.js
@@ -44,8 +44,6 @@ assert.throws(() => {
}, {
code: 'ERR_OUT_OF_RANGE',
name: 'RangeError',
- message: 'The value of "offset" is out of range. It must be >= 0. ' +
- 'Received -1'
});
assert.throws(() => {
@@ -157,8 +155,6 @@ assert.throws(() => {
}, {
code: 'ERR_OUT_OF_RANGE',
name: 'RangeError',
- message: 'The value of "offset" is out of range. ' +
- 'It must be >= 0. Received -1'
});
assert.throws(() => {
diff --git a/test/parallel/test-fs-write-negativeoffset.js b/test/parallel/test-fs-write-negativeoffset.js
new file mode 100644
index 00000000000000..b1c6ed9039b7d7
--- /dev/null
+++ b/test/parallel/test-fs-write-negativeoffset.js
@@ -0,0 +1,55 @@
+'use strict';
+
+// Tests that passing a negative offset does not crash the process
+
+const common = require('../common');
+
+const {
+ join,
+} = require('path');
+
+const {
+ closeSync,
+ open,
+ write,
+ writeSync,
+} = require('fs');
+
+const assert = require('assert');
+
+const tmpdir = require('../common/tmpdir');
+tmpdir.refresh();
+
+const filename = join(tmpdir.path, 'test.txt');
+
+open(filename, 'w+', common.mustSucceed((fd) => {
+ assert.throws(() => {
+ write(fd, Buffer.alloc(0), -1, common.mustNotCall());
+ }, {
+ code: 'ERR_OUT_OF_RANGE',
+ });
+ assert.throws(() => {
+ writeSync(fd, Buffer.alloc(0), -1);
+ }, {
+ code: 'ERR_OUT_OF_RANGE',
+ });
+ closeSync(fd);
+}));
+
+const filename2 = join(tmpdir.path, 'test2.txt');
+
+// Make sure negative length's don't cause aborts either
+
+open(filename2, 'w+', common.mustSucceed((fd) => {
+ assert.throws(() => {
+ write(fd, Buffer.alloc(0), 0, -1, common.mustNotCall());
+ }, {
+ code: 'ERR_OUT_OF_RANGE',
+ });
+ assert.throws(() => {
+ writeSync(fd, Buffer.alloc(0), 0, -1);
+ }, {
+ code: 'ERR_OUT_OF_RANGE',
+ });
+ closeSync(fd);
+}));
diff --git a/test/parallel/test-http-methods.js b/test/parallel/test-http-methods.js
index d562f639503d0f..1142c175ecdb20 100644
--- a/test/parallel/test-http-methods.js
+++ b/test/parallel/test-http-methods.js
@@ -48,7 +48,6 @@ const methods = [
'OPTIONS',
'PATCH',
'POST',
- 'PRI',
'PROPFIND',
'PROPPATCH',
'PURGE',
diff --git a/test/parallel/test-https-selfsigned-no-keycertsign-no-crash.js b/test/parallel/test-https-selfsigned-no-keycertsign-no-crash.js
new file mode 100644
index 00000000000000..2dd46ac878c5b0
--- /dev/null
+++ b/test/parallel/test-https-selfsigned-no-keycertsign-no-crash.js
@@ -0,0 +1,63 @@
+'use strict';
+const common = require('../common');
+const fixtures = require('../common/fixtures');
+
+// This test starts an https server and tries
+// to connect to it using a self-signed certificate.
+// This certificate´s keyUsage does not include the keyCertSign
+// bit, which used to crash node. The test ensures node
+// will not crash. Key and certificate are from #37889.
+// Note: This test assumes that the connection will succeed.
+
+if (!common.hasCrypto)
+ common.skip('missing crypto');
+
+const crypto = require('crypto');
+
+// See #37990 for details on why this is problematic with FIPS.
+if (process.config.variables.openssl_is_fips)
+ common.skip('Skipping as test uses non-fips compliant EC curve');
+
+// This test will fail for OpenSSL < 1.1.1h
+const minOpenSSL = 269488271;
+
+if (crypto.constants.OPENSSL_VERSION_NUMBER < minOpenSSL)
+ common.skip('OpenSSL < 1.1.1h');
+
+const https = require('https');
+const path = require('path');
+
+const key =
+ fixtures.readKey(path.join('selfsigned-no-keycertsign', 'key.pem'));
+
+const cert =
+ fixtures.readKey(path.join('selfsigned-no-keycertsign', 'cert.pem'));
+
+const serverOptions = {
+ key: key,
+ cert: cert
+};
+
+// Start the server
+const httpsServer = https.createServer(serverOptions, (req, res) => {
+ res.writeHead(200);
+ res.end('hello world\n');
+});
+httpsServer.listen(0);
+
+httpsServer.on('listening', () => {
+ // Once the server started listening, built the client config
+ // with the server´s used port
+ const clientOptions = {
+ hostname: '127.0.0.1',
+ port: httpsServer.address().port,
+ ca: cert
+ };
+ // Try to connect
+ const req = https.request(clientOptions, common.mustCall((res) => {
+ httpsServer.close();
+ }));
+
+ req.on('error', common.mustNotCall());
+ req.end();
+});
diff --git a/test/parallel/test-icu-transcode.js b/test/parallel/test-icu-transcode.js
index 20ecab7213b292..e9aced128eec21 100644
--- a/test/parallel/test-icu-transcode.js
+++ b/test/parallel/test-icu-transcode.js
@@ -83,3 +83,8 @@ assert.deepStrictEqual(
const dest = buffer.transcode(new Uint8Array(), 'utf8', 'latin1');
assert.strictEqual(dest.length, 0);
}
+
+// Test that it doesn't crash
+{
+ buffer.transcode(new buffer.SlowBuffer(1), 'utf16le', 'ucs2');
+}
diff --git a/test/parallel/test-messaging-maketransferable.js b/test/parallel/test-messaging-maketransferable.js
new file mode 100644
index 00000000000000..07b1081045d99f
--- /dev/null
+++ b/test/parallel/test-messaging-maketransferable.js
@@ -0,0 +1,27 @@
+// Flags: --expose-internals
+'use strict';
+
+const common = require('../common');
+
+const assert = require('assert');
+const {
+ JSTransferable,
+} = require('internal/worker/js_transferable');
+const { E, F } = require('internal/test/transfer');
+
+// Tests that F is transferable even tho it does not directly,
+// observably extend the JSTransferable class.
+
+const mc = new MessageChannel();
+
+mc.port1.onmessageerror = common.mustNotCall();
+
+mc.port1.onmessage = common.mustCall(({ data }) => {
+ assert(!(data instanceof JSTransferable));
+ assert(data instanceof F);
+ assert(data instanceof E);
+ assert.strictEqual(data.b, 1);
+ mc.port1.close();
+});
+
+mc.port2.postMessage(new F(1));
diff --git a/test/parallel/test-performanceobserver-gc.js b/test/parallel/test-performanceobserver-gc.js
new file mode 100644
index 00000000000000..fe9397631c2d42
--- /dev/null
+++ b/test/parallel/test-performanceobserver-gc.js
@@ -0,0 +1,17 @@
+'use strict';
+
+require('../common');
+
+// Verifies that setting up two observers to listen
+// to gc performance does not crash.
+
+const {
+ PerformanceObserver,
+} = require('perf_hooks');
+
+// We don't actually care if the callback is ever invoked in this test
+const obs = new PerformanceObserver(() => {});
+const obs2 = new PerformanceObserver(() => {});
+
+obs.observe({ type: 'gc' });
+obs2.observe({ type: 'gc' });
diff --git a/test/parallel/test-process-versions.js b/test/parallel/test-process-versions.js
index 56e3dc67e6a81c..ab2f217e963261 100644
--- a/test/parallel/test-process-versions.js
+++ b/test/parallel/test-process-versions.js
@@ -54,7 +54,7 @@ if (common.hasCrypto) {
// The following also matches a development version of OpenSSL 3.x which
// can be in the format '3.0.0-alpha4-dev'. This can be handy when building
// and linking against the main development branch of OpenSSL.
- /^\d+\.\d+\.\d+(-[-a-z0-9]+)?$/ :
+ /^\d+\.\d+\.\d+(?:[-+][a-z0-9]+)*$/ :
/^\d+\.\d+\.\d+[a-z]?(\+quic)?(-fips)?$/;
assert(versionRegex.test(process.versions.openssl));
}
diff --git a/test/parallel/test-readline-interface.js b/test/parallel/test-readline-interface.js
index afa9fd33d22c4f..a3020181b3532e 100644
--- a/test/parallel/test-readline-interface.js
+++ b/test/parallel/test-readline-interface.js
@@ -277,7 +277,7 @@ function assertCursorRowsAndCols(rli, rows, cols) {
const expectedLines = ['foo', 'bar', 'baz', 'bar', 'bat', 'bat'];
// ['foo', 'baz', 'bar', bat'];
let callCount = 0;
- rli.on('line', function(line) {
+ rli.on('line', (line) => {
assert.strictEqual(line, expectedLines[callCount]);
callCount++;
});
@@ -353,7 +353,7 @@ function assertCursorRowsAndCols(rli, rows, cols) {
});
const expectedLines = ['foo', 'bar', 'baz', 'bar', 'bat', 'bat'];
let callCount = 0;
- rli.on('line', function(line) {
+ rli.on('line', (line) => {
assert.strictEqual(line, expectedLines[callCount]);
callCount++;
});
@@ -380,7 +380,7 @@ function assertCursorRowsAndCols(rli, rows, cols) {
const [rli, fi] = getInterface({ terminal: true });
const keys = [];
const err = new Error('bad thing happened');
- fi.on('keypress', function(key) {
+ fi.on('keypress', (key) => {
keys.push(key);
if (key === 'X') {
throw err;
@@ -795,7 +795,7 @@ for (let i = 0; i < 12; i++) {
assert.strictEqual(isWarned(process.stdout._events), false);
}
-[true, false].forEach(function(terminal) {
+[true, false].forEach((terminal) => {
// Disable history
{
const [rli, fi] = getInterface({ terminal, historySize: 0 });
@@ -890,7 +890,7 @@ for (let i = 0; i < 12; i++) {
const buf = Buffer.from('☮', 'utf8');
const [rli, fi] = getInterface({ terminal });
let callCount = 0;
- rli.on('line', function(line) {
+ rli.on('line', (line) => {
callCount++;
assert.strictEqual(line, buf.toString('utf8'));
});
@@ -1004,7 +1004,7 @@ for (let i = 0; i < 12; i++) {
rli.setPrompt('ddd> ');
rli.prompt();
rli.write("really shouldn't be seeing this");
- rli.question('What do you think of node.js? ', function(answer) {
+ rli.question('What do you think of node.js? ', (answer) => {
console.log('Thank you for your valuable feedback:', answer);
rli.close();
});
@@ -1056,7 +1056,7 @@ for (let i = 0; i < 12; i++) {
const crlfDelay = 200;
const [rli, fi] = getInterface({ terminal, crlfDelay });
let callCount = 0;
- rli.on('line', function(line) {
+ rli.on('line', () => {
callCount++;
});
fi.emit('data', '\r');
@@ -1078,7 +1078,7 @@ for (let i = 0; i < 12; i++) {
const delay = 200;
const [rli, fi] = getInterface({ terminal, crlfDelay });
let callCount = 0;
- rli.on('line', function(line) {
+ rli.on('line', () => {
callCount++;
});
fi.emit('data', '\r');
diff --git a/test/parallel/test-readline-tab-complete.js b/test/parallel/test-readline-tab-complete.js
index 7ccdef116492b7..c283d446f9af28 100644
--- a/test/parallel/test-readline-tab-complete.js
+++ b/test/parallel/test-readline-tab-complete.js
@@ -31,15 +31,15 @@ common.skipIfDumbTerminal();
const width = getStringWidth(char) - 1;
class FakeInput extends EventEmitter {
- columns = ((width + 1) * 10 + (lineBreak ? 0 : 10)) * 3
+ columns = ((width + 1) * 10 + (lineBreak ? 0 : 10)) * 3
- write = common.mustCall((data) => {
- output += data;
- }, 6)
+ write = common.mustCall((data) => {
+ output += data;
+ }, 6)
- resume() {}
- pause() {}
- end() {}
+ resume() {}
+ pause() {}
+ end() {}
}
const fi = new FakeInput();
@@ -47,7 +47,7 @@ common.skipIfDumbTerminal();
input: fi,
output: fi,
terminal: true,
- completer: completer
+ completer: common.mustCallAtLeast(completer),
});
const last = '\r\nFirst group\r\n\r\n' +
@@ -68,3 +68,35 @@ common.skipIfDumbTerminal();
rli.close();
});
});
+
+{
+ let output = '';
+ class FakeInput extends EventEmitter {
+ columns = 80
+
+ write = common.mustCall((data) => {
+ output += data;
+ }, 1)
+
+ resume() {}
+ pause() {}
+ end() {}
+ }
+
+ const fi = new FakeInput();
+ const rli = new readline.Interface({
+ input: fi,
+ output: fi,
+ terminal: true,
+ completer:
+ common.mustCallAtLeast((_, cb) => cb(new Error('message'))),
+ });
+
+ rli.on('line', common.mustNotCall());
+ fi.emit('data', '\t');
+ queueMicrotask(() => {
+ assert.match(output, /^Tab completion error: Error: message/);
+ output = '';
+ });
+ rli.close();
+}
diff --git a/test/parallel/test-repl-uncaught-exception-evalcallback.js b/test/parallel/test-repl-uncaught-exception-evalcallback.js
new file mode 100644
index 00000000000000..a6f6e341049d6c
--- /dev/null
+++ b/test/parallel/test-repl-uncaught-exception-evalcallback.js
@@ -0,0 +1,23 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const repl = require('repl');
+const { PassThrough } = require('stream');
+const input = new PassThrough();
+const output = new PassThrough();
+
+const r = repl.start({
+ input, output,
+ eval: common.mustCall((code, context, filename, cb) => {
+ r.setPrompt('prompt! ');
+ cb(new Error('err'));
+ })
+});
+
+input.end('foo\n');
+
+// The output includes exactly one post-error prompt.
+const out = output.read().toString();
+assert.match(out, /prompt!/);
+assert.doesNotMatch(out, /prompt![\S\s]*prompt!/);
+output.on('data', common.mustNotCall());
diff --git a/test/parallel/test-tls-max-send-fragment.js b/test/parallel/test-tls-max-send-fragment.js
index eca995d66483b5..bbb7849f005bf9 100644
--- a/test/parallel/test-tls-max-send-fragment.js
+++ b/test/parallel/test-tls-max-send-fragment.js
@@ -33,15 +33,38 @@ const buf = Buffer.allocUnsafe(10000);
let received = 0;
const maxChunk = 768;
+const invalidArgumentError = {
+ name: 'TypeError',
+ code: 'ERR_INVALID_ARG_TYPE'
+};
+
const server = tls.createServer({
key: fixtures.readKey('agent1-key.pem'),
cert: fixtures.readKey('agent1-cert.pem')
}, function(c) {
- // Lower and upper limits
+
+ // No size is passed.
+ assert.throws(() => c.setMaxSendFragment(), invalidArgumentError);
+
+ // Invalid arg is passed.
+ [null, undefined, '', {}, false, true, []].forEach((arg) => {
+ assert.throws(() => c.setMaxSendFragment(arg), invalidArgumentError);
+ });
+
+ [NaN, Infinity, 2 ** 31].forEach((arg) => {
+ assert.throws(() => c.setMaxSendFragment(arg), {
+ name: 'RangeError',
+ code: 'ERR_OUT_OF_RANGE'
+ });
+ });
+
+ assert.throws(() => c.setMaxSendFragment(Symbol()), { name: 'TypeError' });
+
+ // Lower and upper limits.
assert(!c.setMaxSendFragment(511));
assert(!c.setMaxSendFragment(16385));
- // Correct fragment size
+ // Correct fragment size.
assert(c.setMaxSendFragment(maxChunk));
c.end(buf);
diff --git a/test/parallel/test-tls-ticket-invalid-arg.js b/test/parallel/test-tls-ticket-invalid-arg.js
new file mode 100644
index 00000000000000..55143cdca31e77
--- /dev/null
+++ b/test/parallel/test-tls-ticket-invalid-arg.js
@@ -0,0 +1,24 @@
+'use strict';
+const common = require('../common');
+if (!common.hasCrypto) {
+ common.skip('missing crypto');
+}
+
+const assert = require('assert');
+const tls = require('tls');
+
+const server = new tls.Server();
+
+[null, undefined, 0, 1, 1n, Symbol(), {}, [], true, false, '', () => {}]
+ .forEach((arg) =>
+ assert.throws(
+ () => server.setTicketKeys(arg),
+ { code: 'ERR_INVALID_ARG_TYPE' }
+ ));
+
+[new Uint8Array(1), Buffer.from([1]), new DataView(new ArrayBuffer(2))].forEach(
+ (arg) =>
+ assert.throws(() => {
+ server.setTicketKeys(arg);
+ }, /Session ticket keys must be a 48-byte buffer/)
+);
diff --git a/test/parallel/test-tls-transport-destroy-after-own-gc.js b/test/parallel/test-tls-transport-destroy-after-own-gc.js
index 9b9c8353077dfe..819aa0a03d6cb4 100644
--- a/test/parallel/test-tls-transport-destroy-after-own-gc.js
+++ b/test/parallel/test-tls-transport-destroy-after-own-gc.js
@@ -15,12 +15,12 @@ const makeDuplexPair = require('../common/duplexpair');
let { clientSide } = makeDuplexPair();
let clientTLS = new TLSSocket(clientSide, { isServer: false });
-let clientTLSHandle = clientTLS._handle;
+let clientTLSHandle = clientTLS._handle; // eslint-disable-line no-unused-vars
setImmediate(() => {
clientTLS = null;
global.gc();
- clientTLSHandle = null; // eslint-disable-line no-unused-vars
+ clientTLSHandle = null;
global.gc();
setImmediate(() => {
clientSide = null;
diff --git a/test/parallel/test-tojson-perf_hooks.js b/test/parallel/test-tojson-perf_hooks.js
new file mode 100644
index 00000000000000..2a716fc4478c29
--- /dev/null
+++ b/test/parallel/test-tojson-perf_hooks.js
@@ -0,0 +1,14 @@
+'use strict';
+
+require('../common');
+const assert = require('assert');
+const { performance } = require('perf_hooks');
+
+// Test toJSON for performance object
+{
+ assert.strictEqual(typeof performance.toJSON, 'function');
+ const jsonObject = performance.toJSON();
+ assert.strictEqual(typeof jsonObject, 'object');
+ assert.strictEqual(jsonObject.timeOrigin, performance.timeOrigin);
+ assert.strictEqual(typeof jsonObject.nodeTiming, 'object');
+}
diff --git a/test/parallel/test-util-inspect-getters-accessing-this.js b/test/parallel/test-util-inspect-getters-accessing-this.js
index 3d185b134e852d..998cd82db8f4b3 100644
--- a/test/parallel/test-util-inspect-getters-accessing-this.js
+++ b/test/parallel/test-util-inspect-getters-accessing-this.js
@@ -7,24 +7,61 @@ require('../common');
const assert = require('assert');
-const util = require('util');
+const { inspect } = require('util');
-class X {
- constructor() {
- this._y = 123;
- }
+{
+ class X {
+ constructor() {
+ this._y = 123;
+ }
- get y() {
- return this._y;
+ get y() {
+ return this._y;
+ }
}
+
+ const result = inspect(new X(), {
+ getters: true,
+ showHidden: true
+ });
+
+ assert.strictEqual(
+ result,
+ 'X { _y: 123, [y]: [Getter: 123] }'
+ );
}
-const result = util.inspect(new X(), {
- getters: true,
- showHidden: true
-});
+// Regression test for https://github.com/nodejs/node/issues/37054
+{
+ class A {
+ constructor(B) {
+ this.B = B;
+ }
+ get b() {
+ return this.B;
+ }
+ }
+
+ class B {
+ constructor() {
+ this.A = new A(this);
+ }
+ get a() {
+ return this.A;
+ }
+ }
+
+ const result = inspect(new B(), {
+ depth: 1,
+ getters: true,
+ showHidden: true
+ });
-assert.strictEqual(
- result,
- 'X { _y: 123, [y]: [Getter: 123] }'
-);
+ assert.strictEqual(
+ result,
+ '[ B {\n' +
+ ' A: A { B: [Circular *1], [b]: [Getter] [Circular *1] },\n' +
+ ' [a]: [Getter] A { B: [Circular *1], [b]: [Getter] [Circular *1] }\n' +
+ '}',
+ );
+}
diff --git a/test/parallel/test-zlib-brotli.js b/test/parallel/test-zlib-brotli.js
index 772b655177aa18..ef31db3dd64ac4 100644
--- a/test/parallel/test-zlib-brotli.js
+++ b/test/parallel/test-zlib-brotli.js
@@ -71,3 +71,24 @@ const sampleBuffer = fixtures.readSync('/pss-vectors.json');
message: 'Initialization failed'
});
}
+
+{
+ // Test options.flush range
+ assert.throws(() => {
+ zlib.brotliCompressSync('', { flush: zlib.constants.Z_FINISH });
+ }, {
+ code: 'ERR_OUT_OF_RANGE',
+ name: 'RangeError',
+ message: 'The value of "options.flush" is out of range. It must be >= 0 ' +
+ 'and <= 3. Received 4',
+ });
+
+ assert.throws(() => {
+ zlib.brotliCompressSync('', { finishFlush: zlib.constants.Z_FINISH });
+ }, {
+ code: 'ERR_OUT_OF_RANGE',
+ name: 'RangeError',
+ message: 'The value of "options.finishFlush" is out of range. It must be ' +
+ '>= 0 and <= 3. Received 4',
+ });
+}
diff --git a/test/pummel/test-crypto-dh-hash-modp18.js b/test/pummel/test-crypto-dh-hash-modp18.js
index 288a647bdd321d..06121d1f6dc956 100644
--- a/test/pummel/test-crypto-dh-hash-modp18.js
+++ b/test/pummel/test-crypto-dh-hash-modp18.js
@@ -21,8 +21,15 @@
'use strict';
const common = require('../common');
-if (!common.hasCrypto)
+
+if (!common.hasCrypto) {
common.skip('node compiled without OpenSSL.');
+}
+
+if ((process.config.variables.arm_version === '6') ||
+ (process.config.variables.arm_version === '7')) {
+ common.skip('Too slow for armv6 and armv7 bots');
+}
const assert = require('assert');
const crypto = require('crypto');
diff --git a/test/pummel/test-crypto-dh-hash.js b/test/pummel/test-crypto-dh-hash.js
index 7188fbb32b9197..5b7002ce7fe16b 100644
--- a/test/pummel/test-crypto-dh-hash.js
+++ b/test/pummel/test-crypto-dh-hash.js
@@ -21,8 +21,15 @@
'use strict';
const common = require('../common');
-if (!common.hasCrypto)
+
+if (!common.hasCrypto) {
common.skip('node compiled without OpenSSL.');
+}
+
+if ((process.config.variables.arm_version === '6') ||
+ (process.config.variables.arm_version === '7')) {
+ common.skip('Too slow for armv6 and armv7 bots');
+}
const assert = require('assert');
const crypto = require('crypto');
diff --git a/test/pummel/test-crypto-dh-keys.js b/test/pummel/test-crypto-dh-keys.js
index 37095135f85174..33c2ed86073045 100644
--- a/test/pummel/test-crypto-dh-keys.js
+++ b/test/pummel/test-crypto-dh-keys.js
@@ -21,6 +21,7 @@
'use strict';
const common = require('../common');
+
if (!common.hasCrypto) {
common.skip('node compiled without OpenSSL.');
}
diff --git a/test/pummel/test-crypto-timing-safe-equal-benchmarks.js b/test/pummel/test-crypto-timing-safe-equal-benchmarks.js
index b649b071e1e49d..3c6e31e8294cc8 100644
--- a/test/pummel/test-crypto-timing-safe-equal-benchmarks.js
+++ b/test/pummel/test-crypto-timing-safe-equal-benchmarks.js
@@ -111,7 +111,7 @@ assert(
`timingSafeEqual should not leak information from its execution time (t=${t})`
);
-// As a sanity check to make sure the statistical tests are working, run the
+// As a coherence check to make sure the statistical tests are working, run the
// same benchmarks again, this time with an unsafe comparison function. In this
// case the t-value should be above the threshold.
const unsafeCompare = (bufA, bufB) => bufA.equals(bufB);
diff --git a/test/pummel/test-dh-regr.js b/test/pummel/test-dh-regr.js
index bb041e4c5d1033..fff20c3ed08816 100644
--- a/test/pummel/test-dh-regr.js
+++ b/test/pummel/test-dh-regr.js
@@ -21,8 +21,15 @@
'use strict';
const common = require('../common');
-if (!common.hasCrypto)
+
+if (!common.hasCrypto) {
common.skip('missing crypto');
+}
+
+if ((process.config.variables.arm_version === '6') ||
+ (process.config.variables.arm_version === '7')) {
+ common.skip('Too slow for armv6 and armv7 bots');
+}
const assert = require('assert');
const crypto = require('crypto');
diff --git a/test/pummel/test-fs-largefile.js b/test/pummel/test-fs-largefile.js
index 409d7a2112f027..9c2b26782d9c96 100644
--- a/test/pummel/test-fs-largefile.js
+++ b/test/pummel/test-fs-largefile.js
@@ -34,7 +34,7 @@ const fd = fs.openSync(filepath, 'w+');
const offset = 5 * 1024 * 1024 * 1024; // 5GB
const message = 'Large File';
-fs.truncateSync(fd, offset);
+fs.ftruncateSync(fd, offset);
assert.strictEqual(fs.statSync(filepath).size, offset);
const writeBuf = Buffer.from(message);
fs.writeSync(fd, writeBuf, 0, writeBuf.length, offset);
diff --git a/test/pummel/test-fs-watch-system-limit.js b/test/pummel/test-fs-watch-system-limit.js
index ce390dd3d0bb83..6662986a1a8ee0 100644
--- a/test/pummel/test-fs-watch-system-limit.js
+++ b/test/pummel/test-fs-watch-system-limit.js
@@ -5,10 +5,18 @@ const child_process = require('child_process');
const fs = require('fs');
const stream = require('stream');
-if (!common.isLinux)
+if (!common.isLinux) {
common.skip('The fs watch limit is OS-dependent');
-if (!common.enoughTestCpu)
+}
+
+if (!common.enoughTestCpu) {
common.skip('This test is resource-intensive');
+}
+
+if ((process.config.variables.arm_version === '6') ||
+ (process.config.variables.arm_version === '7')) {
+ common.skip('Too slow for armv6 and armv7 bots');
+}
try {
// Ensure inotify limit is low enough for the test to actually exercise the
diff --git a/test/parallel/test-heapsnapshot-near-heap-limit-bounded.js b/test/pummel/test-heapsnapshot-near-heap-limit-bounded.js
similarity index 82%
rename from test/parallel/test-heapsnapshot-near-heap-limit-bounded.js
rename to test/pummel/test-heapsnapshot-near-heap-limit-bounded.js
index a57b9a8fc4b5e5..0ad6a898d126eb 100644
--- a/test/parallel/test-heapsnapshot-near-heap-limit-bounded.js
+++ b/test/pummel/test-heapsnapshot-near-heap-limit-bounded.js
@@ -1,6 +1,12 @@
'use strict';
-require('../common');
+const common = require('../common');
+
+if ((process.config.variables.arm_version === '6') ||
+ (process.config.variables.arm_version === '7')) {
+ common.skip('Too slow for armv6 and armv7 bots');
+}
+
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const { spawnSync } = require('child_process');
diff --git a/test/parallel/test-heapsnapshot-near-heap-limit.js b/test/pummel/test-heapsnapshot-near-heap-limit.js
similarity index 94%
rename from test/parallel/test-heapsnapshot-near-heap-limit.js
rename to test/pummel/test-heapsnapshot-near-heap-limit.js
index 5743f71a3f568c..6651f2ae9f52d9 100644
--- a/test/parallel/test-heapsnapshot-near-heap-limit.js
+++ b/test/pummel/test-heapsnapshot-near-heap-limit.js
@@ -1,6 +1,12 @@
'use strict';
const common = require('../common');
+
+if ((process.config.variables.arm_version === '6') ||
+ (process.config.variables.arm_version === '7')) {
+ common.skip('Too slow for armv6 and armv7 bots');
+}
+
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const { spawnSync } = require('child_process');
diff --git a/test/sequential/test-net-bytes-per-incoming-chunk-overhead.js b/test/pummel/test-net-bytes-per-incoming-chunk-overhead.js
similarity index 85%
rename from test/sequential/test-net-bytes-per-incoming-chunk-overhead.js
rename to test/pummel/test-net-bytes-per-incoming-chunk-overhead.js
index 7bcdfaa9f6f6aa..fed903c2639d99 100644
--- a/test/sequential/test-net-bytes-per-incoming-chunk-overhead.js
+++ b/test/pummel/test-net-bytes-per-incoming-chunk-overhead.js
@@ -2,8 +2,15 @@
'use strict';
const common = require('../common');
-if (process.config.variables.asan)
+
+if (process.config.variables.asan) {
common.skip('ASAN messes with memory measurements');
+}
+
+if ((process.config.variables.arm_version === '6') ||
+ (process.config.variables.arm_version === '7')) {
+ common.skip('Too slow for armv6 and armv7 bots');
+}
const assert = require('assert');
const net = require('net');
diff --git a/test/pummel/test-next-tick-infinite-calls.js b/test/pummel/test-next-tick-infinite-calls.js
index 5ee44076dcc2f3..7ae3b2261358af 100644
--- a/test/pummel/test-next-tick-infinite-calls.js
+++ b/test/pummel/test-next-tick-infinite-calls.js
@@ -20,7 +20,12 @@
// USE OR OTHER DEALINGS IN THE SOFTWARE.
'use strict';
-require('../common');
+const common = require('../common');
+
+if ((process.config.variables.arm_version === '6') ||
+ (process.config.variables.arm_version === '7')) {
+ common.skip('Too slow for armv6 and armv7 bots');
+}
let complete = 0;
diff --git a/test/pummel/test-policy-integrity.js b/test/pummel/test-policy-integrity.js
index 15124aefd46904..9383f881fbe514 100644
--- a/test/pummel/test-policy-integrity.js
+++ b/test/pummel/test-policy-integrity.js
@@ -1,7 +1,16 @@
'use strict';
const common = require('../common');
-if (!common.hasCrypto) common.skip('missing crypto');
+
+if (!common.hasCrypto) {
+ common.skip('missing crypto');
+}
+
+if ((process.config.variables.arm_version === '6') ||
+ (process.config.variables.arm_version === '7')) {
+ common.skip('Too slow for armv6 and armv7 bots');
+}
+
common.requireNoPackageJSONAbove();
const { debuglog } = require('util');
@@ -76,6 +85,7 @@ function newTestId() {
return nextTestId++;
}
tmpdir.refresh();
+common.requireNoPackageJSONAbove(tmpdir.path);
let spawned = 0;
const toSpawn = [];
diff --git a/test/parallel/test-webcrypto-derivebits-pbkdf2.js b/test/pummel/test-webcrypto-derivebits-pbkdf2.js
similarity index 99%
rename from test/parallel/test-webcrypto-derivebits-pbkdf2.js
rename to test/pummel/test-webcrypto-derivebits-pbkdf2.js
index ed8279dae134dc..745071f3458aba 100644
--- a/test/parallel/test-webcrypto-derivebits-pbkdf2.js
+++ b/test/pummel/test-webcrypto-derivebits-pbkdf2.js
@@ -2,8 +2,14 @@
const common = require('../common');
-if (!common.hasCrypto)
+if (!common.hasCrypto) {
common.skip('missing crypto');
+}
+
+if ((process.config.variables.arm_version === '6') ||
+ (process.config.variables.arm_version === '7')) {
+ common.skip('Too slow for armv6 and armv7 bots');
+}
const assert = require('assert');
const { subtle } = require('crypto').webcrypto;
diff --git a/test/report/test-report-uncaught-exception-primitives.js b/test/report/test-report-uncaught-exception-primitives.js
new file mode 100644
index 00000000000000..75a05f335cf2e2
--- /dev/null
+++ b/test/report/test-report-uncaught-exception-primitives.js
@@ -0,0 +1,25 @@
+// Flags: --report-uncaught-exception
+'use strict';
+// Test producing a report on uncaught exception.
+const common = require('../common');
+const assert = require('assert');
+const helper = require('../common/report');
+const tmpdir = require('../common/tmpdir');
+
+const exception = 1;
+
+tmpdir.refresh();
+process.report.directory = tmpdir.path;
+
+process.on('uncaughtException', common.mustCall((err) => {
+ assert.strictEqual(err, exception);
+ const reports = helper.findReports(process.pid, tmpdir.path);
+ assert.strictEqual(reports.length, 1);
+ console.log(reports[0]);
+ helper.validate(reports[0], [
+ ['header.event', 'Exception'],
+ ['javascriptStack.message', `${exception}`],
+ ]);
+}));
+
+throw exception;
diff --git a/test/report/test-report-uncaught-exception-symbols.js b/test/report/test-report-uncaught-exception-symbols.js
new file mode 100644
index 00000000000000..5997d0e0898ac0
--- /dev/null
+++ b/test/report/test-report-uncaught-exception-symbols.js
@@ -0,0 +1,25 @@
+// Flags: --report-uncaught-exception
+'use strict';
+// Test producing a report on uncaught exception.
+const common = require('../common');
+const assert = require('assert');
+const helper = require('../common/report');
+const tmpdir = require('../common/tmpdir');
+
+const exception = Symbol('foobar');
+
+tmpdir.refresh();
+process.report.directory = tmpdir.path;
+
+process.on('uncaughtException', common.mustCall((err) => {
+ assert.strictEqual(err, exception);
+ const reports = helper.findReports(process.pid, tmpdir.path);
+ assert.strictEqual(reports.length, 1);
+ console.log(reports[0]);
+ helper.validate(reports[0], [
+ ['header.event', 'Exception'],
+ ['javascriptStack.message', 'Symbol(foobar)'],
+ ]);
+}));
+
+throw exception;
diff --git a/tools/doc/generate.js b/tools/doc/generate.js
index f49acb6207c9b4..d2f3aea27f25a4 100644
--- a/tools/doc/generate.js
+++ b/tools/doc/generate.js
@@ -43,7 +43,7 @@ let filename = null;
let nodeVersion = null;
let outputDir = null;
let apilinks = {};
-let versions = {};
+let versions = [];
async function main() {
for (const arg of args) {
diff --git a/tools/eslint-rules/non-ascii-character.js b/tools/eslint-rules/non-ascii-character.js
index 6588125d33d201..f9ee24273fdcb6 100644
--- a/tools/eslint-rules/non-ascii-character.js
+++ b/tools/eslint-rules/non-ascii-character.js
@@ -46,12 +46,6 @@ module.exports = (context) => {
node,
message,
loc: sourceCode.getLocFromIndex(offendingCharacterPosition),
- fix: (fixer) => {
- return fixer.replaceText(
- node,
- suggestion ? `${suggestion}` : ''
- );
- }
});
};
@@ -59,7 +53,3 @@ module.exports = (context) => {
Program: (node) => reportIfError(node, context.getSourceCode())
};
};
-
-module.exports.meta = {
- fixable: 'code'
-};
diff --git a/tools/license-builder.sh b/tools/license-builder.sh
index 05a15471c7e77f..80aaac11b1cade 100755
--- a/tools/license-builder.sh
+++ b/tools/license-builder.sh
@@ -89,9 +89,6 @@ addlicense "gtest" "test/cctest/gtest" "$(cat "${rootdir}"/test/cctest/gtest/LIC
# nghttp2
addlicense "nghttp2" "deps/nghttp2" "$(cat "${rootdir}"/deps/nghttp2/COPYING)"
-# node-inspect
-addlicense "node-inspect" "deps/node-inspect" "$(cat "${rootdir}"/deps/node-inspect/LICENSE)"
-
# large_pages
addlicense "large_pages" "src/large_pages" "$(sed -e '/SPDX-License-Identifier/,$d' -e 's/^\/\///' "${rootdir}"/src/large_pages/node_large_page.h)"
diff --git a/tools/lint-md.js b/tools/lint-md.js
index 5c2f40abc7b43a..57aeb202322736 100644
--- a/tools/lint-md.js
+++ b/tools/lint-md.js
@@ -49667,6 +49667,11 @@ function validateMeta(node, file, meta) {
function validateYAMLComments(tree, file) {
unistUtilVisit(tree, "html", function visitor(node) {
+ if (node.value.startsWith("".length));
diff --git a/tools/make-v8.sh b/tools/make-v8.sh
index 5a23432b589001..79ab02af275aa9 100755
--- a/tools/make-v8.sh
+++ b/tools/make-v8.sh
@@ -36,7 +36,8 @@ if [ "$ARCH" = "s390x" ] || [ "$ARCH" = "ppc64le" ]; then
gn gen -v "out.gn/$BUILD_ARCH_TYPE" --args="is_component_build=false is_debug=false use_goma=false goma_dir=\"None\" use_custom_libcxx=false v8_target_cpu=\"$TARGET_ARCH\" target_cpu=\"$TARGET_ARCH\" v8_enable_backtrace=true"
ninja -v -C "out.gn/$BUILD_ARCH_TYPE" d8 cctest inspector-test
else
+ DEPOT_TOOLS_DIR="$(cd _depot_tools && pwd)"
# shellcheck disable=SC2086
- PATH=~/_depot_tools:$PATH tools/dev/v8gen.py "$BUILD_ARCH_TYPE" --no-goma $V8_BUILD_OPTIONS
- PATH=~/_depot_tools:$PATH ninja -C "out.gn/$BUILD_ARCH_TYPE/" d8 cctest inspector-test
+ PATH="$DEPOT_TOOLS_DIR":$PATH tools/dev/v8gen.py "$BUILD_ARCH_TYPE" --no-goma $V8_BUILD_OPTIONS
+ PATH="$DEPOT_TOOLS_DIR":$PATH ninja -C "out.gn/$BUILD_ARCH_TYPE/" d8 cctest inspector-test
fi
diff --git a/tools/node-lint-md-cli-rollup/package-lock.json b/tools/node-lint-md-cli-rollup/package-lock.json
index f2e9be4fc61bb5..5fccba999a5ecf 100644
--- a/tools/node-lint-md-cli-rollup/package-lock.json
+++ b/tools/node-lint-md-cli-rollup/package-lock.json
@@ -2111,9 +2111,9 @@
}
},
"node_modules/remark-preset-lint-node": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/remark-preset-lint-node/-/remark-preset-lint-node-2.1.1.tgz",
- "integrity": "sha512-3Cv4kDVaC8V0XsiK/ntdpOEztOx0v8L9DczQ3KRIN7QwyPS3Gjaq2DJ7wNglXVK4z7PekcND0mXK78eLduhwwA==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/remark-preset-lint-node/-/remark-preset-lint-node-2.2.0.tgz",
+ "integrity": "sha512-85wnJs7HyQlY3Ae5HRxPjJx5cFBvAAOSfSpmyNVb6Fs9HYoR9ipimAxWfl2M1gYVT2rBrod8Jzu415dOMukzOw==",
"dependencies": {
"js-yaml": "^4.0.0",
"remark-lint": "^8.0.0",
@@ -4226,9 +4226,9 @@
}
},
"remark-preset-lint-node": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/remark-preset-lint-node/-/remark-preset-lint-node-2.1.1.tgz",
- "integrity": "sha512-3Cv4kDVaC8V0XsiK/ntdpOEztOx0v8L9DczQ3KRIN7QwyPS3Gjaq2DJ7wNglXVK4z7PekcND0mXK78eLduhwwA==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/remark-preset-lint-node/-/remark-preset-lint-node-2.2.0.tgz",
+ "integrity": "sha512-85wnJs7HyQlY3Ae5HRxPjJx5cFBvAAOSfSpmyNVb6Fs9HYoR9ipimAxWfl2M1gYVT2rBrod8Jzu415dOMukzOw==",
"requires": {
"js-yaml": "^4.0.0",
"remark-lint": "^8.0.0",
diff --git a/tools/node_modules/eslint/README.md b/tools/node_modules/eslint/README.md
index 14ba7e2cb32d9a..1aa25ee3d1d47b 100644
--- a/tools/node_modules/eslint/README.md
+++ b/tools/node_modules/eslint/README.md
@@ -283,7 +283,7 @@ The following companies, organizations, and individuals support ESLint's ongoing
]
Gold Sponsors
Silver Sponsors
Bronze Sponsors
-
+
## ",
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- },
- "license": "MIT",
- "bugs": {
- "url": "https://github.com/ljharb/call-bind/issues"
- },
- "homepage": "https://github.com/ljharb/call-bind#readme",
- "devDependencies": {
- "@ljharb/eslint-config": "^17.3.0",
- "aud": "^1.1.3",
- "auto-changelog": "^2.2.1",
- "eslint": "^7.17.0",
- "nyc": "^10.3.2",
- "safe-publish-latest": "^1.1.4",
- "tape": "^5.1.1"
- },
- "dependencies": {
- "function-bind": "^1.1.1",
- "get-intrinsic": "^1.0.2"
- },
- "auto-changelog": {
- "output": "CHANGELOG.md",
- "template": "keepachangelog",
- "unreleased": false,
- "commitLimit": false,
- "backfillLimit": false,
- "hideCredit": true
- }
-}
diff --git a/tools/node_modules/eslint/node_modules/chalk/package.json b/tools/node_modules/eslint/node_modules/chalk/package.json
index 0d99f0f28621f2..c2d63f67e5e955 100644
--- a/tools/node_modules/eslint/node_modules/chalk/package.json
+++ b/tools/node_modules/eslint/node_modules/chalk/package.json
@@ -1,6 +1,6 @@
{
"name": "chalk",
- "version": "4.1.0",
+ "version": "4.1.1",
"description": "Terminal string styling done right",
"license": "MIT",
"repository": "chalk/chalk",
diff --git a/tools/node_modules/eslint/node_modules/chalk/readme.md b/tools/node_modules/eslint/node_modules/chalk/readme.md
index 338f42cb8b525b..851259216bc193 100644
--- a/tools/node_modules/eslint/node_modules/chalk/readme.md
+++ b/tools/node_modules/eslint/node_modules/chalk/readme.md
@@ -13,6 +13,48 @@
",
- "repository": "git://github.com/Raynos/function-bind.git",
- "main": "index",
- "homepage": "https://github.com/Raynos/function-bind",
- "contributors": [
- {
- "name": "Raynos"
- },
- {
- "name": "Jordan Harband",
- "url": "https://github.com/ljharb"
- }
- ],
- "bugs": {
- "url": "https://github.com/Raynos/function-bind/issues",
- "email": "raynos2@gmail.com"
- },
- "dependencies": {},
- "devDependencies": {
- "@ljharb/eslint-config": "^12.2.1",
- "covert": "^1.1.0",
- "eslint": "^4.5.0",
- "jscs": "^3.0.7",
- "tape": "^4.8.0"
- },
- "license": "MIT",
- "scripts": {
- "pretest": "npm run lint",
- "test": "npm run tests-only",
- "posttest": "npm run coverage -- --quiet",
- "tests-only": "node test",
- "coverage": "covert test/*.js",
- "lint": "npm run jscs && npm run eslint",
- "jscs": "jscs *.js */*.js",
- "eslint": "eslint *.js */*.js"
- },
- "testling": {
- "files": "test/index.js",
- "browsers": [
- "ie/8..latest",
- "firefox/16..latest",
- "firefox/nightly",
- "chrome/22..latest",
- "chrome/canary",
- "opera/12..latest",
- "opera/next",
- "safari/5.1..latest",
- "ipad/6.0..latest",
- "iphone/6.0..latest",
- "android-browser/4.2..latest"
- ]
- }
-}
diff --git a/tools/node_modules/eslint/node_modules/get-intrinsic/LICENSE b/tools/node_modules/eslint/node_modules/get-intrinsic/LICENSE
deleted file mode 100644
index 48f05d01d0acae..00000000000000
--- a/tools/node_modules/eslint/node_modules/get-intrinsic/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Jordan Harband
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/tools/node_modules/eslint/node_modules/get-intrinsic/README.md b/tools/node_modules/eslint/node_modules/get-intrinsic/README.md
deleted file mode 100644
index 335a3b49b2ebe6..00000000000000
--- a/tools/node_modules/eslint/node_modules/get-intrinsic/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# get-intrinsic [![Version Badge][npm-version-svg]][package-url]
-
-[![dependency status][deps-svg]][deps-url]
-[![dev dependency status][dev-deps-svg]][dev-deps-url]
-[![License][license-image]][license-url]
-[![Downloads][downloads-image]][downloads-url]
-
-[![npm badge][npm-badge-png]][package-url]
-
-Get and robustly cache all JS language-level intrinsics at first require time.
-
-See the syntax described [in the JS spec](https://tc39.es/ecma262/#sec-well-known-intrinsic-objects) for reference.
-
-## Example
-
-```js
-var GetIntrinsic = require('get-intrinsic');
-var assert = require('assert');
-
-// static methods
-assert.equal(GetIntrinsic('%Math.pow%'), Math.pow);
-assert.equal(Math.pow(2, 3), 8);
-assert.equal(GetIntrinsic('%Math.pow%')(2, 3), 8);
-delete Math.pow;
-assert.equal(GetIntrinsic('%Math.pow%')(2, 3), 8);
-
-// instance methods
-var arr = [1];
-assert.equal(GetIntrinsic('%Array.prototype.push%'), Array.prototype.push);
-assert.deepEqual(arr, [1]);
-
-arr.push(2);
-assert.deepEqual(arr, [1, 2]);
-
-GetIntrinsic('%Array.prototype.push%').call(arr, 3);
-assert.deepEqual(arr, [1, 2, 3]);
-
-delete Array.prototype.push;
-GetIntrinsic('%Array.prototype.push%').call(arr, 4);
-assert.deepEqual(arr, [1, 2, 3, 4]);
-
-// missing features
-delete JSON.parse; // to simulate a real intrinsic that is missing in the environment
-assert.throws(() => GetIntrinsic('%JSON.parse%'));
-assert.equal(undefined, GetIntrinsic('%JSON.parse%', true));
-```
-
-## Tests
-Simply clone the repo, `npm install`, and run `npm test`
-
-## Security
-
-Please email [@ljharb](https://github.com/ljharb) or see https://tidelift.com/security if you have a potential security vulnerability to report.
-
-[package-url]: https://npmjs.org/package/get-intrinsic
-[npm-version-svg]: http://versionbadg.es/ljharb/get-intrinsic.svg
-[deps-svg]: https://david-dm.org/ljharb/get-intrinsic.svg
-[deps-url]: https://david-dm.org/ljharb/get-intrinsic
-[dev-deps-svg]: https://david-dm.org/ljharb/get-intrinsic/dev-status.svg
-[dev-deps-url]: https://david-dm.org/ljharb/get-intrinsic#info=devDependencies
-[npm-badge-png]: https://nodei.co/npm/get-intrinsic.png?downloads=true&stars=true
-[license-image]: https://img.shields.io/npm/l/get-intrinsic.svg
-[license-url]: LICENSE
-[downloads-image]: https://img.shields.io/npm/dm/get-intrinsic.svg
-[downloads-url]: https://npm-stat.com/charts.html?package=get-intrinsic
diff --git a/tools/node_modules/eslint/node_modules/get-intrinsic/index.js b/tools/node_modules/eslint/node_modules/get-intrinsic/index.js
deleted file mode 100644
index d6c06c281c0ac7..00000000000000
--- a/tools/node_modules/eslint/node_modules/get-intrinsic/index.js
+++ /dev/null
@@ -1,330 +0,0 @@
-'use strict';
-
-var undefined;
-
-var $SyntaxError = SyntaxError;
-var $Function = Function;
-var $TypeError = TypeError;
-
-// eslint-disable-next-line consistent-return
-var getEvalledConstructor = function (expressionSyntax) {
- try {
- return $Function('"use strict"; return (' + expressionSyntax + ').constructor;')();
- } catch (e) {}
-};
-
-var $gOPD = Object.getOwnPropertyDescriptor;
-if ($gOPD) {
- try {
- $gOPD({}, '');
- } catch (e) {
- $gOPD = null; // this is IE 8, which has a broken gOPD
- }
-}
-
-var throwTypeError = function () {
- throw new $TypeError();
-};
-var ThrowTypeError = $gOPD
- ? (function () {
- try {
- // eslint-disable-next-line no-unused-expressions, no-caller, no-restricted-properties
- arguments.callee; // IE 8 does not throw here
- return throwTypeError;
- } catch (calleeThrows) {
- try {
- // IE 8 throws on Object.getOwnPropertyDescriptor(arguments, '')
- return $gOPD(arguments, 'callee').get;
- } catch (gOPDthrows) {
- return throwTypeError;
- }
- }
- }())
- : throwTypeError;
-
-var hasSymbols = require('has-symbols')();
-
-var getProto = Object.getPrototypeOf || function (x) { return x.__proto__; }; // eslint-disable-line no-proto
-
-var needsEval = {};
-
-var TypedArray = typeof Uint8Array === 'undefined' ? undefined : getProto(Uint8Array);
-
-var INTRINSICS = {
- '%AggregateError%': typeof AggregateError === 'undefined' ? undefined : AggregateError,
- '%Array%': Array,
- '%ArrayBuffer%': typeof ArrayBuffer === 'undefined' ? undefined : ArrayBuffer,
- '%ArrayIteratorPrototype%': hasSymbols ? getProto([][Symbol.iterator]()) : undefined,
- '%AsyncFromSyncIteratorPrototype%': undefined,
- '%AsyncFunction%': needsEval,
- '%AsyncGenerator%': needsEval,
- '%AsyncGeneratorFunction%': needsEval,
- '%AsyncIteratorPrototype%': needsEval,
- '%Atomics%': typeof Atomics === 'undefined' ? undefined : Atomics,
- '%BigInt%': typeof BigInt === 'undefined' ? undefined : BigInt,
- '%Boolean%': Boolean,
- '%DataView%': typeof DataView === 'undefined' ? undefined : DataView,
- '%Date%': Date,
- '%decodeURI%': decodeURI,
- '%decodeURIComponent%': decodeURIComponent,
- '%encodeURI%': encodeURI,
- '%encodeURIComponent%': encodeURIComponent,
- '%Error%': Error,
- '%eval%': eval, // eslint-disable-line no-eval
- '%EvalError%': EvalError,
- '%Float32Array%': typeof Float32Array === 'undefined' ? undefined : Float32Array,
- '%Float64Array%': typeof Float64Array === 'undefined' ? undefined : Float64Array,
- '%FinalizationRegistry%': typeof FinalizationRegistry === 'undefined' ? undefined : FinalizationRegistry,
- '%Function%': $Function,
- '%GeneratorFunction%': needsEval,
- '%Int8Array%': typeof Int8Array === 'undefined' ? undefined : Int8Array,
- '%Int16Array%': typeof Int16Array === 'undefined' ? undefined : Int16Array,
- '%Int32Array%': typeof Int32Array === 'undefined' ? undefined : Int32Array,
- '%isFinite%': isFinite,
- '%isNaN%': isNaN,
- '%IteratorPrototype%': hasSymbols ? getProto(getProto([][Symbol.iterator]())) : undefined,
- '%JSON%': typeof JSON === 'object' ? JSON : undefined,
- '%Map%': typeof Map === 'undefined' ? undefined : Map,
- '%MapIteratorPrototype%': typeof Map === 'undefined' || !hasSymbols ? undefined : getProto(new Map()[Symbol.iterator]()),
- '%Math%': Math,
- '%Number%': Number,
- '%Object%': Object,
- '%parseFloat%': parseFloat,
- '%parseInt%': parseInt,
- '%Promise%': typeof Promise === 'undefined' ? undefined : Promise,
- '%Proxy%': typeof Proxy === 'undefined' ? undefined : Proxy,
- '%RangeError%': RangeError,
- '%ReferenceError%': ReferenceError,
- '%Reflect%': typeof Reflect === 'undefined' ? undefined : Reflect,
- '%RegExp%': RegExp,
- '%Set%': typeof Set === 'undefined' ? undefined : Set,
- '%SetIteratorPrototype%': typeof Set === 'undefined' || !hasSymbols ? undefined : getProto(new Set()[Symbol.iterator]()),
- '%SharedArrayBuffer%': typeof SharedArrayBuffer === 'undefined' ? undefined : SharedArrayBuffer,
- '%String%': String,
- '%StringIteratorPrototype%': hasSymbols ? getProto(''[Symbol.iterator]()) : undefined,
- '%Symbol%': hasSymbols ? Symbol : undefined,
- '%SyntaxError%': $SyntaxError,
- '%ThrowTypeError%': ThrowTypeError,
- '%TypedArray%': TypedArray,
- '%TypeError%': $TypeError,
- '%Uint8Array%': typeof Uint8Array === 'undefined' ? undefined : Uint8Array,
- '%Uint8ClampedArray%': typeof Uint8ClampedArray === 'undefined' ? undefined : Uint8ClampedArray,
- '%Uint16Array%': typeof Uint16Array === 'undefined' ? undefined : Uint16Array,
- '%Uint32Array%': typeof Uint32Array === 'undefined' ? undefined : Uint32Array,
- '%URIError%': URIError,
- '%WeakMap%': typeof WeakMap === 'undefined' ? undefined : WeakMap,
- '%WeakRef%': typeof WeakRef === 'undefined' ? undefined : WeakRef,
- '%WeakSet%': typeof WeakSet === 'undefined' ? undefined : WeakSet
-};
-
-var doEval = function doEval(name) {
- var value;
- if (name === '%AsyncFunction%') {
- value = getEvalledConstructor('async function () {}');
- } else if (name === '%GeneratorFunction%') {
- value = getEvalledConstructor('function* () {}');
- } else if (name === '%AsyncGeneratorFunction%') {
- value = getEvalledConstructor('async function* () {}');
- } else if (name === '%AsyncGenerator%') {
- var fn = doEval('%AsyncGeneratorFunction%');
- if (fn) {
- value = fn.prototype;
- }
- } else if (name === '%AsyncIteratorPrototype%') {
- var gen = doEval('%AsyncGenerator%');
- if (gen) {
- value = getProto(gen.prototype);
- }
- }
-
- INTRINSICS[name] = value;
-
- return value;
-};
-
-var LEGACY_ALIASES = {
- '%ArrayBufferPrototype%': ['ArrayBuffer', 'prototype'],
- '%ArrayPrototype%': ['Array', 'prototype'],
- '%ArrayProto_entries%': ['Array', 'prototype', 'entries'],
- '%ArrayProto_forEach%': ['Array', 'prototype', 'forEach'],
- '%ArrayProto_keys%': ['Array', 'prototype', 'keys'],
- '%ArrayProto_values%': ['Array', 'prototype', 'values'],
- '%AsyncFunctionPrototype%': ['AsyncFunction', 'prototype'],
- '%AsyncGenerator%': ['AsyncGeneratorFunction', 'prototype'],
- '%AsyncGeneratorPrototype%': ['AsyncGeneratorFunction', 'prototype', 'prototype'],
- '%BooleanPrototype%': ['Boolean', 'prototype'],
- '%DataViewPrototype%': ['DataView', 'prototype'],
- '%DatePrototype%': ['Date', 'prototype'],
- '%ErrorPrototype%': ['Error', 'prototype'],
- '%EvalErrorPrototype%': ['EvalError', 'prototype'],
- '%Float32ArrayPrototype%': ['Float32Array', 'prototype'],
- '%Float64ArrayPrototype%': ['Float64Array', 'prototype'],
- '%FunctionPrototype%': ['Function', 'prototype'],
- '%Generator%': ['GeneratorFunction', 'prototype'],
- '%GeneratorPrototype%': ['GeneratorFunction', 'prototype', 'prototype'],
- '%Int8ArrayPrototype%': ['Int8Array', 'prototype'],
- '%Int16ArrayPrototype%': ['Int16Array', 'prototype'],
- '%Int32ArrayPrototype%': ['Int32Array', 'prototype'],
- '%JSONParse%': ['JSON', 'parse'],
- '%JSONStringify%': ['JSON', 'stringify'],
- '%MapPrototype%': ['Map', 'prototype'],
- '%NumberPrototype%': ['Number', 'prototype'],
- '%ObjectPrototype%': ['Object', 'prototype'],
- '%ObjProto_toString%': ['Object', 'prototype', 'toString'],
- '%ObjProto_valueOf%': ['Object', 'prototype', 'valueOf'],
- '%PromisePrototype%': ['Promise', 'prototype'],
- '%PromiseProto_then%': ['Promise', 'prototype', 'then'],
- '%Promise_all%': ['Promise', 'all'],
- '%Promise_reject%': ['Promise', 'reject'],
- '%Promise_resolve%': ['Promise', 'resolve'],
- '%RangeErrorPrototype%': ['RangeError', 'prototype'],
- '%ReferenceErrorPrototype%': ['ReferenceError', 'prototype'],
- '%RegExpPrototype%': ['RegExp', 'prototype'],
- '%SetPrototype%': ['Set', 'prototype'],
- '%SharedArrayBufferPrototype%': ['SharedArrayBuffer', 'prototype'],
- '%StringPrototype%': ['String', 'prototype'],
- '%SymbolPrototype%': ['Symbol', 'prototype'],
- '%SyntaxErrorPrototype%': ['SyntaxError', 'prototype'],
- '%TypedArrayPrototype%': ['TypedArray', 'prototype'],
- '%TypeErrorPrototype%': ['TypeError', 'prototype'],
- '%Uint8ArrayPrototype%': ['Uint8Array', 'prototype'],
- '%Uint8ClampedArrayPrototype%': ['Uint8ClampedArray', 'prototype'],
- '%Uint16ArrayPrototype%': ['Uint16Array', 'prototype'],
- '%Uint32ArrayPrototype%': ['Uint32Array', 'prototype'],
- '%URIErrorPrototype%': ['URIError', 'prototype'],
- '%WeakMapPrototype%': ['WeakMap', 'prototype'],
- '%WeakSetPrototype%': ['WeakSet', 'prototype']
-};
-
-var bind = require('function-bind');
-var hasOwn = require('has');
-var $concat = bind.call(Function.call, Array.prototype.concat);
-var $spliceApply = bind.call(Function.apply, Array.prototype.splice);
-var $replace = bind.call(Function.call, String.prototype.replace);
-var $strSlice = bind.call(Function.call, String.prototype.slice);
-
-/* adapted from https://github.com/lodash/lodash/blob/4.17.15/dist/lodash.js#L6735-L6744 */
-var rePropName = /[^%.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|%$))/g;
-var reEscapeChar = /\\(\\)?/g; /** Used to match backslashes in property paths. */
-var stringToPath = function stringToPath(string) {
- var first = $strSlice(string, 0, 1);
- var last = $strSlice(string, -1);
- if (first === '%' && last !== '%') {
- throw new $SyntaxError('invalid intrinsic syntax, expected closing `%`');
- } else if (last === '%' && first !== '%') {
- throw new $SyntaxError('invalid intrinsic syntax, expected opening `%`');
- }
- var result = [];
- $replace(string, rePropName, function (match, number, quote, subString) {
- result[result.length] = quote ? $replace(subString, reEscapeChar, '$1') : number || match;
- });
- return result;
-};
-/* end adaptation */
-
-var getBaseIntrinsic = function getBaseIntrinsic(name, allowMissing) {
- var intrinsicName = name;
- var alias;
- if (hasOwn(LEGACY_ALIASES, intrinsicName)) {
- alias = LEGACY_ALIASES[intrinsicName];
- intrinsicName = '%' + alias[0] + '%';
- }
-
- if (hasOwn(INTRINSICS, intrinsicName)) {
- var value = INTRINSICS[intrinsicName];
- if (value === needsEval) {
- value = doEval(intrinsicName);
- }
- if (typeof value === 'undefined' && !allowMissing) {
- throw new $TypeError('intrinsic ' + name + ' exists, but is not available. Please file an issue!');
- }
-
- return {
- alias: alias,
- name: intrinsicName,
- value: value
- };
- }
-
- throw new $SyntaxError('intrinsic ' + name + ' does not exist!');
-};
-
-module.exports = function GetIntrinsic(name, allowMissing) {
- if (typeof name !== 'string' || name.length === 0) {
- throw new $TypeError('intrinsic name must be a non-empty string');
- }
- if (arguments.length > 1 && typeof allowMissing !== 'boolean') {
- throw new $TypeError('"allowMissing" argument must be a boolean');
- }
-
- var parts = stringToPath(name);
- var intrinsicBaseName = parts.length > 0 ? parts[0] : '';
-
- var intrinsic = getBaseIntrinsic('%' + intrinsicBaseName + '%', allowMissing);
- var intrinsicRealName = intrinsic.name;
- var value = intrinsic.value;
- var skipFurtherCaching = false;
-
- var alias = intrinsic.alias;
- if (alias) {
- intrinsicBaseName = alias[0];
- $spliceApply(parts, $concat([0, 1], alias));
- }
-
- for (var i = 1, isOwn = true; i < parts.length; i += 1) {
- var part = parts[i];
- var first = $strSlice(part, 0, 1);
- var last = $strSlice(part, -1);
- if (
- (
- (first === '"' || first === "'" || first === '`')
- || (last === '"' || last === "'" || last === '`')
- )
- && first !== last
- ) {
- throw new $SyntaxError('property names with quotes must have matching quotes');
- }
- if (part === 'constructor' || !isOwn) {
- skipFurtherCaching = true;
- }
-
- intrinsicBaseName += '.' + part;
- intrinsicRealName = '%' + intrinsicBaseName + '%';
-
- if (hasOwn(INTRINSICS, intrinsicRealName)) {
- value = INTRINSICS[intrinsicRealName];
- } else if (value != null) {
- if (!(part in value)) {
- if (!allowMissing) {
- throw new $TypeError('base intrinsic for ' + name + ' exists, but the property is not available.');
- }
- return void undefined;
- }
- if ($gOPD && (i + 1) >= parts.length) {
- var desc = $gOPD(value, part);
- isOwn = !!desc;
-
- // By convention, when a data property is converted to an accessor
- // property to emulate a data property that does not suffer from
- // the override mistake, that accessor's getter is marked with
- // an `originalValue` property. Here, when we detect this, we
- // uphold the illusion by pretending to see that original data
- // property, i.e., returning the value rather than the getter
- // itself.
- if (isOwn && 'get' in desc && !('originalValue' in desc.get)) {
- value = desc.get;
- } else {
- value = value[part];
- }
- } else {
- isOwn = hasOwn(value, part);
- value = value[part];
- }
-
- if (isOwn && !skipFurtherCaching) {
- INTRINSICS[intrinsicRealName] = value;
- }
- }
- }
- return value;
-};
diff --git a/tools/node_modules/eslint/node_modules/get-intrinsic/package.json b/tools/node_modules/eslint/node_modules/get-intrinsic/package.json
deleted file mode 100644
index d34894a0681d27..00000000000000
--- a/tools/node_modules/eslint/node_modules/get-intrinsic/package.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
- "name": "get-intrinsic",
- "version": "1.1.1",
- "description": "Get and robustly cache all JS language-level intrinsics at first require time",
- "main": "index.js",
- "exports": {
- ".": [
- {
- "default": "./index.js"
- },
- "./index.js"
- ],
- "./package.json": "./package.json"
- },
- "scripts": {
- "prelint": "evalmd README.md",
- "lint": "eslint --ext=.js,.mjs .",
- "pretest": "npm run lint",
- "tests-only": "nyc tape 'test/**/*.js'",
- "test": "npm run tests-only",
- "posttest": "aud --production",
- "version": "auto-changelog && git add CHANGELOG.md",
- "postversion": "auto-changelog && git add CHANGELOG.md && git commit --no-edit --amend && git tag -f \"v$(node -e \"console.log(require('./package.json').version)\")\""
- },
- "repository": {
- "type": "git",
- "url": "git+https://github.com/ljharb/get-intrinsic.git"
- },
- "keywords": [
- "javascript",
- "ecmascript",
- "es",
- "js",
- "intrinsic",
- "getintrinsic",
- "es-abstract"
- ],
- "author": "Jordan Harband ",
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- },
- "license": "MIT",
- "bugs": {
- "url": "https://github.com/ljharb/get-intrinsic/issues"
- },
- "homepage": "https://github.com/ljharb/get-intrinsic#readme",
- "devDependencies": {
- "@ljharb/eslint-config": "^17.5.0",
- "aud": "^1.1.3",
- "auto-changelog": "^2.2.1",
- "call-bind": "^1.0.2",
- "es-abstract": "^1.18.0-next.2",
- "es-value-fixtures": "^1.0.0",
- "eslint": "^7.19.0",
- "evalmd": "^0.0.19",
- "foreach": "^2.0.5",
- "has-bigints": "^1.0.1",
- "make-async-function": "^1.0.0",
- "make-async-generator-function": "^1.0.0",
- "make-generator-function": "^2.0.0",
- "nyc": "^10.3.2",
- "object-inspect": "^1.9.0",
- "tape": "^5.1.1"
- },
- "auto-changelog": {
- "output": "CHANGELOG.md",
- "template": "keepachangelog",
- "unreleased": false,
- "commitLimit": false,
- "backfillLimit": false,
- "hideCredit": true
- },
- "dependencies": {
- "function-bind": "^1.1.1",
- "has": "^1.0.3",
- "has-symbols": "^1.0.1"
- }
-}
diff --git a/tools/node_modules/eslint/node_modules/has-symbols/LICENSE b/tools/node_modules/eslint/node_modules/has-symbols/LICENSE
deleted file mode 100644
index df31cbf3c064d0..00000000000000
--- a/tools/node_modules/eslint/node_modules/has-symbols/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2016 Jordan Harband
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/tools/node_modules/eslint/node_modules/has-symbols/README.md b/tools/node_modules/eslint/node_modules/has-symbols/README.md
deleted file mode 100644
index 3875d7e58d7ea9..00000000000000
--- a/tools/node_modules/eslint/node_modules/has-symbols/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# has-symbols [![Version Badge][2]][1]
-
-[![dependency status][5]][6]
-[![dev dependency status][7]][8]
-[![License][license-image]][license-url]
-[![Downloads][downloads-image]][downloads-url]
-
-[![npm badge][11]][1]
-
-Determine if the JS environment has Symbol support. Supports spec, or shams.
-
-## Example
-
-```js
-var hasSymbols = require('has-symbols');
-
-hasSymbols() === true; // if the environment has native Symbol support. Not polyfillable, not forgeable.
-
-var hasSymbolsKinda = require('has-symbols/shams');
-hasSymbolsKinda() === true; // if the environment has a Symbol sham that mostly follows the spec.
-```
-
-## Supported Symbol shams
- - get-own-property-symbols [npm](https://www.npmjs.com/package/get-own-property-symbols) | [github](https://github.com/WebReflection/get-own-property-symbols)
- - core-js [npm](https://www.npmjs.com/package/core-js) | [github](https://github.com/zloirock/core-js)
-
-## Tests
-Simply clone the repo, `npm install`, and run `npm test`
-
-[1]: https://npmjs.org/package/has-symbols
-[2]: https://versionbadg.es/inspect-js/has-symbols.svg
-[5]: https://david-dm.org/inspect-js/has-symbols.svg
-[6]: https://david-dm.org/inspect-js/has-symbols
-[7]: https://david-dm.org/inspect-js/has-symbols/dev-status.svg
-[8]: https://david-dm.org/inspect-js/has-symbols#info=devDependencies
-[11]: https://nodei.co/npm/has-symbols.png?downloads=true&stars=true
-[license-image]: https://img.shields.io/npm/l/has-symbols.svg
-[license-url]: LICENSE
-[downloads-image]: https://img.shields.io/npm/dm/has-symbols.svg
-[downloads-url]: https://npm-stat.com/charts.html?package=has-symbols
diff --git a/tools/node_modules/eslint/node_modules/has-symbols/index.js b/tools/node_modules/eslint/node_modules/has-symbols/index.js
deleted file mode 100644
index 17044fa21daa70..00000000000000
--- a/tools/node_modules/eslint/node_modules/has-symbols/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use strict';
-
-var origSymbol = typeof Symbol !== 'undefined' && Symbol;
-var hasSymbolSham = require('./shams');
-
-module.exports = function hasNativeSymbols() {
- if (typeof origSymbol !== 'function') { return false; }
- if (typeof Symbol !== 'function') { return false; }
- if (typeof origSymbol('foo') !== 'symbol') { return false; }
- if (typeof Symbol('bar') !== 'symbol') { return false; }
-
- return hasSymbolSham();
-};
diff --git a/tools/node_modules/eslint/node_modules/has-symbols/package.json b/tools/node_modules/eslint/node_modules/has-symbols/package.json
deleted file mode 100644
index 2c2f57278b1747..00000000000000
--- a/tools/node_modules/eslint/node_modules/has-symbols/package.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
- "name": "has-symbols",
- "version": "1.0.2",
- "author": {
- "name": "Jordan Harband",
- "email": "ljharb@gmail.com",
- "url": "http://ljharb.codes"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- },
- "contributors": [
- {
- "name": "Jordan Harband",
- "email": "ljharb@gmail.com",
- "url": "http://ljharb.codes"
- }
- ],
- "description": "Determine if the JS environment has Symbol support. Supports spec, or shams.",
- "license": "MIT",
- "main": "index.js",
- "scripts": {
- "prepublish": "safe-publish-latest",
- "pretest": "npm run --silent lint",
- "test": "npm run tests-only",
- "posttest": "aud --production",
- "tests-only": "npm run test:stock && npm run test:staging && npm run test:shams",
- "test:stock": "nyc node test",
- "test:staging": "nyc node --harmony --es-staging test",
- "test:shams": "npm run --silent test:shams:getownpropertysymbols && npm run --silent test:shams:corejs",
- "test:shams:corejs": "nyc node test/shams/core-js.js",
- "test:shams:getownpropertysymbols": "nyc node test/shams/get-own-property-symbols.js",
- "lint": "eslint --ext=js,mjs .",
- "version": "auto-changelog && git add CHANGELOG.md",
- "postversion": "auto-changelog && git add CHANGELOG.md && git commit --no-edit --amend && git tag -f \"v$(node -e \"console.log(require('./package.json').version)\")\""
- },
- "repository": {
- "type": "git",
- "url": "git://github.com/inspect-js/has-symbols.git"
- },
- "keywords": [
- "Symbol",
- "symbols",
- "typeof",
- "sham",
- "polyfill",
- "native",
- "core-js",
- "ES6"
- ],
- "devDependencies": {
- "@ljharb/eslint-config": "^17.5.1",
- "aud": "^1.1.4",
- "auto-changelog": "^2.2.1",
- "core-js": "^2.6.12",
- "eslint": "^7.20.0",
- "get-own-property-symbols": "^0.9.5",
- "nyc": "^10.3.2",
- "safe-publish-latest": "^1.1.4",
- "tape": "^5.2.0"
- },
- "testling": {
- "files": "test/index.js",
- "browsers": [
- "iexplore/6.0..latest",
- "firefox/3.0..6.0",
- "firefox/15.0..latest",
- "firefox/nightly",
- "chrome/4.0..10.0",
- "chrome/20.0..latest",
- "chrome/canary",
- "opera/10.0..latest",
- "opera/next",
- "safari/4.0..latest",
- "ipad/6.0..latest",
- "iphone/6.0..latest",
- "android-browser/4.2"
- ]
- },
- "engines": {
- "node": ">= 0.4"
- },
- "auto-changelog": {
- "output": "CHANGELOG.md",
- "template": "keepachangelog",
- "unreleased": false,
- "commitLimit": false,
- "backfillLimit": false,
- "hideCredit": true
- },
- "greenkeeper": {
- "ignore": [
- "core-js"
- ]
- }
-}
diff --git a/tools/node_modules/eslint/node_modules/has-symbols/shams.js b/tools/node_modules/eslint/node_modules/has-symbols/shams.js
deleted file mode 100644
index 1285210ef7ccef..00000000000000
--- a/tools/node_modules/eslint/node_modules/has-symbols/shams.js
+++ /dev/null
@@ -1,42 +0,0 @@
-'use strict';
-
-/* eslint complexity: [2, 18], max-statements: [2, 33] */
-module.exports = function hasSymbols() {
- if (typeof Symbol !== 'function' || typeof Object.getOwnPropertySymbols !== 'function') { return false; }
- if (typeof Symbol.iterator === 'symbol') { return true; }
-
- var obj = {};
- var sym = Symbol('test');
- var symObj = Object(sym);
- if (typeof sym === 'string') { return false; }
-
- if (Object.prototype.toString.call(sym) !== '[object Symbol]') { return false; }
- if (Object.prototype.toString.call(symObj) !== '[object Symbol]') { return false; }
-
- // temp disabled per https://github.com/ljharb/object.assign/issues/17
- // if (sym instanceof Symbol) { return false; }
- // temp disabled per https://github.com/WebReflection/get-own-property-symbols/issues/4
- // if (!(symObj instanceof Symbol)) { return false; }
-
- // if (typeof Symbol.prototype.toString !== 'function') { return false; }
- // if (String(sym) !== Symbol.prototype.toString.call(sym)) { return false; }
-
- var symVal = 42;
- obj[sym] = symVal;
- for (sym in obj) { return false; } // eslint-disable-line no-restricted-syntax, no-unreachable-loop
- if (typeof Object.keys === 'function' && Object.keys(obj).length !== 0) { return false; }
-
- if (typeof Object.getOwnPropertyNames === 'function' && Object.getOwnPropertyNames(obj).length !== 0) { return false; }
-
- var syms = Object.getOwnPropertySymbols(obj);
- if (syms.length !== 1 || syms[0] !== sym) { return false; }
-
- if (!Object.prototype.propertyIsEnumerable.call(obj, sym)) { return false; }
-
- if (typeof Object.getOwnPropertyDescriptor === 'function') {
- var descriptor = Object.getOwnPropertyDescriptor(obj, sym);
- if (descriptor.value !== symVal || descriptor.enumerable !== true) { return false; }
- }
-
- return true;
-};
diff --git a/tools/node_modules/eslint/node_modules/has/LICENSE-MIT b/tools/node_modules/eslint/node_modules/has/LICENSE-MIT
deleted file mode 100644
index ae7014d385df3d..00000000000000
--- a/tools/node_modules/eslint/node_modules/has/LICENSE-MIT
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2013 Thiago de Arruda
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/tools/node_modules/eslint/node_modules/has/README.md b/tools/node_modules/eslint/node_modules/has/README.md
deleted file mode 100644
index 635e3a4baab00b..00000000000000
--- a/tools/node_modules/eslint/node_modules/has/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# has
-
-> Object.prototype.hasOwnProperty.call shortcut
-
-## Installation
-
-```sh
-npm install --save has
-```
-
-## Usage
-
-```js
-var has = require('has');
-
-has({}, 'hasOwnProperty'); // false
-has(Object.prototype, 'hasOwnProperty'); // true
-```
diff --git a/tools/node_modules/eslint/node_modules/has/package.json b/tools/node_modules/eslint/node_modules/has/package.json
deleted file mode 100644
index 7c4592f16de071..00000000000000
--- a/tools/node_modules/eslint/node_modules/has/package.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "name": "has",
- "description": "Object.prototype.hasOwnProperty.call shortcut",
- "version": "1.0.3",
- "homepage": "https://github.com/tarruda/has",
- "author": {
- "name": "Thiago de Arruda",
- "email": "tpadilha84@gmail.com"
- },
- "contributors": [
- {
- "name": "Jordan Harband",
- "email": "ljharb@gmail.com",
- "url": "http://ljharb.codes"
- }
- ],
- "repository": {
- "type": "git",
- "url": "git://github.com/tarruda/has.git"
- },
- "bugs": {
- "url": "https://github.com/tarruda/has/issues"
- },
- "license": "MIT",
- "licenses": [
- {
- "type": "MIT",
- "url": "https://github.com/tarruda/has/blob/master/LICENSE-MIT"
- }
- ],
- "main": "./src",
- "dependencies": {
- "function-bind": "^1.1.1"
- },
- "devDependencies": {
- "@ljharb/eslint-config": "^12.2.1",
- "eslint": "^4.19.1",
- "tape": "^4.9.0"
- },
- "engines": {
- "node": ">= 0.4.0"
- },
- "scripts": {
- "lint": "eslint .",
- "pretest": "npm run lint",
- "test": "tape test"
- }
-}
diff --git a/tools/node_modules/eslint/node_modules/has/src/index.js b/tools/node_modules/eslint/node_modules/has/src/index.js
deleted file mode 100644
index dd92dd9094edb0..00000000000000
--- a/tools/node_modules/eslint/node_modules/has/src/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-var bind = require('function-bind');
-
-module.exports = bind.call(Function.call, Object.prototype.hasOwnProperty);
diff --git a/tools/node_modules/eslint/node_modules/is-boolean-object/LICENSE b/tools/node_modules/eslint/node_modules/is-boolean-object/LICENSE
deleted file mode 100644
index b43df444e51828..00000000000000
--- a/tools/node_modules/eslint/node_modules/is-boolean-object/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Jordan Harband
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/tools/node_modules/eslint/node_modules/is-boolean-object/README.md b/tools/node_modules/eslint/node_modules/is-boolean-object/README.md
deleted file mode 100644
index aeadb7c816c545..00000000000000
--- a/tools/node_modules/eslint/node_modules/is-boolean-object/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# is-boolean-object [![Version Badge][2]][1]
-
-[![Build Status][3]][4]
-[![dependency status][5]][6]
-[![dev dependency status][7]][8]
-[![License][license-image]][license-url]
-[![Downloads][downloads-image]][downloads-url]
-
-[![npm badge][11]][1]
-
-[![browser support][9]][10]
-
-Is this value a JS Boolean? This module works cross-realm/iframe, and despite ES6 @@toStringTag.
-
-## Example
-
-```js
-var isBoolean = require('is-boolean-object');
-var assert = require('assert');
-
-assert.notOk(isBoolean(undefined));
-assert.notOk(isBoolean(null));
-assert.notOk(isBoolean('foo'));
-assert.notOk(isBoolean(function () {}));
-assert.notOk(isBoolean([]));
-assert.notOk(isBoolean({}));
-assert.notOk(isBoolean(/a/g));
-assert.notOk(isBoolean(new RegExp('a', 'g')));
-assert.notOk(isBoolean(new Date()));
-assert.notOk(isBoolean(42));
-assert.notOk(isBoolean(NaN));
-assert.notOk(isBoolean(Infinity));
-
-assert.ok(isBoolean(new Boolean(42)));
-assert.ok(isBoolean(false));
-assert.ok(isBoolean(Object(false)));
-assert.ok(isBoolean(true));
-assert.ok(isBoolean(Object(true)));
-```
-
-## Tests
-Simply clone the repo, `npm install`, and run `npm test`
-
-[1]: https://npmjs.org/package/is-boolean-object
-[2]: http://versionbadg.es/ljharb/is-boolean-object.svg
-[3]: https://travis-ci.org/ljharb/is-boolean-object.svg
-[4]: https://travis-ci.org/ljharb/is-boolean-object
-[5]: https://david-dm.org/ljharb/is-boolean-object.svg
-[6]: https://david-dm.org/ljharb/is-boolean-object
-[7]: https://david-dm.org/ljharb/is-boolean-object/dev-status.svg
-[8]: https://david-dm.org/ljharb/is-boolean-object#info=devDependencies
-[9]: https://ci.testling.com/ljharb/is-boolean-object.png
-[10]: https://ci.testling.com/ljharb/is-boolean-object
-[11]: https://nodei.co/npm/is-boolean-object.png?downloads=true&stars=true
-[license-image]: http://img.shields.io/npm/l/is-boolean-object.svg
-[license-url]: LICENSE
-[downloads-image]: http://img.shields.io/npm/dm/is-boolean-object.svg
-[downloads-url]: http://npm-stat.com/charts.html?package=is-boolean-object
diff --git a/tools/node_modules/eslint/node_modules/is-boolean-object/index.js b/tools/node_modules/eslint/node_modules/is-boolean-object/index.js
deleted file mode 100644
index 69864eb56013af..00000000000000
--- a/tools/node_modules/eslint/node_modules/is-boolean-object/index.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-
-var callBound = require('call-bind/callBound');
-var $boolToStr = callBound('Boolean.prototype.toString');
-var $toString = callBound('Object.prototype.toString');
-
-var tryBooleanObject = function booleanBrandCheck(value) {
- try {
- $boolToStr(value);
- return true;
- } catch (e) {
- return false;
- }
-};
-var boolClass = '[object Boolean]';
-var hasToStringTag = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol';
-
-module.exports = function isBoolean(value) {
- if (typeof value === 'boolean') {
- return true;
- }
- if (value === null || typeof value !== 'object') {
- return false;
- }
- return hasToStringTag && Symbol.toStringTag in value ? tryBooleanObject(value) : $toString(value) === boolClass;
-};
diff --git a/tools/node_modules/eslint/node_modules/is-boolean-object/package.json b/tools/node_modules/eslint/node_modules/is-boolean-object/package.json
deleted file mode 100644
index a2af900f00905b..00000000000000
--- a/tools/node_modules/eslint/node_modules/is-boolean-object/package.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
- "name": "is-boolean-object",
- "version": "1.1.0",
- "author": "Jordan Harband ",
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- },
- "description": "Is this value a JS Boolean? This module works cross-realm/iframe, and despite ES6 @@toStringTag.",
- "license": "MIT",
- "main": "index.js",
- "scripts": {
- "prepublish": "safe-publish-latest",
- "pretest": "npm run lint",
- "test": "npm run tests-only && npm run test:harmony",
- "tests-only": "nyc tape 'test/**/*.js'",
- "test:harmony": "node --harmony --es-staging test",
- "posttest": "aud --production",
- "prelint": "npm run eccheck",
- "lint": "eslint --ext=js,mjs .",
- "eccheck": "eclint check $(git ls-files)",
- "version": "auto-changelog && git add CHANGELOG.md",
- "postversion": "auto-changelog && git add CHANGELOG.md && git commit --no-edit --amend && git tag -f \"v$(node -e \"console.log(require('./package.json').version)\")\""
- },
- "repository": {
- "type": "git",
- "url": "git://github.com/ljharb/is-boolean-object.git"
- },
- "keywords": [
- "Boolean",
- "ES6",
- "toStringTag",
- "@@toStringTag",
- "Boolean object",
- "true",
- "false",
- "is-boolean"
- ],
- "dependencies": {
- "call-bind": "^1.0.0"
- },
- "devDependencies": {
- "@ljharb/eslint-config": "^17.3.0",
- "aud": "^1.1.3",
- "auto-changelog": "^2.2.1",
- "eclint": "^2.8.1",
- "eslint": "^7.15.0",
- "foreach": "^2.0.5",
- "indexof": "^0.0.1",
- "is": "^3.3.0",
- "nyc": "^10.3.2",
- "safe-publish-latest": "^1.1.4",
- "tape": "^5.0.1"
- },
- "testling": {
- "files": "test.js",
- "browsers": [
- "iexplore/6.0..latest",
- "firefox/3.0..6.0",
- "firefox/15.0..latest",
- "firefox/nightly",
- "chrome/4.0..10.0",
- "chrome/20.0..latest",
- "chrome/canary",
- "opera/10.0..latest",
- "opera/next",
- "safari/4.0..latest",
- "ipad/6.0..latest",
- "iphone/6.0..latest",
- "android-browser/4.2"
- ]
- },
- "engines": {
- "node": ">= 0.4"
- },
- "auto-changelog": {
- "output": "CHANGELOG.md",
- "template": "keepachangelog",
- "unreleased": false,
- "commitLimit": false,
- "backfillLimit": false,
- "hideCredit": true
- }
-}
diff --git a/tools/node_modules/eslint/node_modules/is-number-object/LICENSE b/tools/node_modules/eslint/node_modules/is-number-object/LICENSE
deleted file mode 100644
index b43df444e51828..00000000000000
--- a/tools/node_modules/eslint/node_modules/is-number-object/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Jordan Harband
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/tools/node_modules/eslint/node_modules/is-number-object/README.md b/tools/node_modules/eslint/node_modules/is-number-object/README.md
deleted file mode 100644
index 5617d7ec6bf981..00000000000000
--- a/tools/node_modules/eslint/node_modules/is-number-object/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# is-number-object [![Version Badge][2]][1]
-
-[![Build Status][3]][4]
-[![dependency status][5]][6]
-[![dev dependency status][7]][8]
-[![License][license-image]][license-url]
-[![Downloads][downloads-image]][downloads-url]
-
-[![npm badge][11]][1]
-
-Is this value a JS Number object? This module works cross-realm/iframe, and despite ES6 @@toStringTag.
-
-## Example
-
-```js
-var isNumber = require('is-number-object');
-var assert = require('assert');
-
-assert.notOk(isNumber(undefined));
-assert.notOk(isNumber(null));
-assert.notOk(isNumber(false));
-assert.notOk(isNumber(true));
-assert.notOk(isNumber('foo'));
-assert.notOk(isNumber(function () {}));
-assert.notOk(isNumber([]));
-assert.notOk(isNumber({}));
-assert.notOk(isNumber(/a/g));
-assert.notOk(isNumber(new RegExp('a', 'g')));
-assert.notOk(isNumber(new Date()));
-
-assert.ok(isNumber(42));
-assert.ok(isNumber(NaN));
-assert.ok(isNumber(Infinity));
-assert.ok(isNumber(new Number(42)));
-```
-
-## Tests
-Simply clone the repo, `npm install`, and run `npm test`
-
-[1]: https://npmjs.org/package/is-number-object
-[2]: http://versionbadg.es/inspect-js/is-number-object.svg
-[3]: https://travis-ci.org/inspect-js/is-number-object.svg
-[4]: https://travis-ci.org/inspect-js/is-number-object
-[5]: https://david-dm.org/inspect-js/is-number-object.svg
-[6]: https://david-dm.org/inspect-js/is-number-object
-[7]: https://david-dm.org/inspect-js/is-number-object/dev-status.svg
-[8]: https://david-dm.org/inspect-js/is-number-object#info=devDependencies
-[11]: https://nodei.co/npm/is-number-object.png?downloads=true&stars=true
-[license-image]: http://img.shields.io/npm/l/is-number-object.svg
-[license-url]: LICENSE
-[downloads-image]: http://img.shields.io/npm/dm/is-number-object.svg
-[downloads-url]: http://npm-stat.com/charts.html?package=is-number-object
diff --git a/tools/node_modules/eslint/node_modules/is-number-object/index.js b/tools/node_modules/eslint/node_modules/is-number-object/index.js
deleted file mode 100644
index de303abe1aae6c..00000000000000
--- a/tools/node_modules/eslint/node_modules/is-number-object/index.js
+++ /dev/null
@@ -1,24 +0,0 @@
-'use strict';
-
-var numToStr = Number.prototype.toString;
-var tryNumberObject = function tryNumberObject(value) {
- try {
- numToStr.call(value);
- return true;
- } catch (e) {
- return false;
- }
-};
-var toStr = Object.prototype.toString;
-var numClass = '[object Number]';
-var hasToStringTag = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol';
-
-module.exports = function isNumberObject(value) {
- if (typeof value === 'number') {
- return true;
- }
- if (typeof value !== 'object') {
- return false;
- }
- return hasToStringTag ? tryNumberObject(value) : toStr.call(value) === numClass;
-};
diff --git a/tools/node_modules/eslint/node_modules/is-number-object/package.json b/tools/node_modules/eslint/node_modules/is-number-object/package.json
deleted file mode 100644
index f6ab725f69a7b5..00000000000000
--- a/tools/node_modules/eslint/node_modules/is-number-object/package.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "name": "is-number-object",
- "version": "1.0.4",
- "author": "Jordan Harband ",
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- },
- "description": "Is this value a JS Number object? This module works cross-realm/iframe, and despite ES6 @@toStringTag.",
- "license": "MIT",
- "main": "index.js",
- "scripts": {
- "prepublish": "safe-publish-latest",
- "pretest": "npm run lint",
- "tests-only": "node --harmony --es-staging test",
- "test": "npm run tests-only",
- "posttest": "npx aud",
- "coverage": "covert test/index.js",
- "lint": "eslint .",
- "eccheck": "eclint check *.js **/*.js > /dev/null",
- "version": "auto-changelog && git add CHANGELOG.md",
- "postversion": "auto-changelog && git add CHANGELOG.md && git commit --no-edit --amend && git tag -f \"v$(node -e \"console.log(require('./package.json').version)\")\""
- },
- "repository": {
- "type": "git",
- "url": "git://github.com/inspect-js/is-number-object.git"
- },
- "keywords": [
- "Number",
- "ES6",
- "toStringTag",
- "@@toStringTag",
- "Number object"
- ],
- "dependencies": {},
- "devDependencies": {
- "@ljharb/eslint-config": "^15.0.2",
- "auto-changelog": "^1.16.2",
- "covert": "^1.1.1",
- "eclint": "^2.8.1",
- "eslint": "^6.7.2",
- "foreach": "^2.0.5",
- "has-symbols": "^1.0.1",
- "indexof": "^0.0.1",
- "is": "^3.3.0",
- "safe-publish-latest": "^1.1.4",
- "tape": "^4.12.0"
- },
- "testling": {
- "files": "test/index.js",
- "browsers": [
- "iexplore/6.0..latest",
- "firefox/3.0..6.0",
- "firefox/15.0..latest",
- "firefox/nightly",
- "chrome/4.0..10.0",
- "chrome/20.0..latest",
- "chrome/canary",
- "opera/10.0..latest",
- "opera/next",
- "safari/4.0..latest",
- "ipad/6.0..latest",
- "iphone/6.0..latest",
- "android-browser/4.2"
- ]
- },
- "engines": {
- "node": ">= 0.4"
- },
- "auto-changelog": {
- "output": "CHANGELOG.md",
- "template": "keepachangelog",
- "unreleased": false,
- "commitLimit": false,
- "backfillLimit": false
- }
-}
diff --git a/tools/node_modules/eslint/node_modules/is-string/LICENSE b/tools/node_modules/eslint/node_modules/is-string/LICENSE
deleted file mode 100644
index b43df444e51828..00000000000000
--- a/tools/node_modules/eslint/node_modules/is-string/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Jordan Harband
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/tools/node_modules/eslint/node_modules/is-string/README.md b/tools/node_modules/eslint/node_modules/is-string/README.md
deleted file mode 100644
index 13895e5f490076..00000000000000
--- a/tools/node_modules/eslint/node_modules/is-string/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# is-string [![Version Badge][2]][1]
-
-[![Build Status][3]][4]
-[![dependency status][5]][6]
-[![dev dependency status][7]][8]
-[![License][license-image]][license-url]
-[![Downloads][downloads-image]][downloads-url]
-
-[![npm badge][11]][1]
-
-[![browser support][9]][10]
-
-Is this value a JS String object or primitive? This module works cross-realm/iframe, and despite ES6 @@toStringTag.
-
-## Example
-
-```js
-var isString = require('is-string');
-var assert = require('assert');
-
-assert.notOk(isString(undefined));
-assert.notOk(isString(null));
-assert.notOk(isString(false));
-assert.notOk(isString(true));
-assert.notOk(isString(function () {}));
-assert.notOk(isString([]));
-assert.notOk(isString({}));
-assert.notOk(isString(/a/g));
-assert.notOk(isString(new RegExp('a', 'g')));
-assert.notOk(isString(new Date()));
-assert.notOk(isString(42));
-assert.notOk(isString(NaN));
-assert.notOk(isString(Infinity));
-assert.notOk(isString(new Number(42)));
-
-assert.ok(isString('foo'));
-assert.ok(isString(Object('foo')));
-```
-
-## Tests
-Simply clone the repo, `npm install`, and run `npm test`
-
-[1]: https://npmjs.org/package/is-string
-[2]: http://versionbadg.es/ljharb/is-string.svg
-[3]: https://travis-ci.org/ljharb/is-string.svg
-[4]: https://travis-ci.org/ljharb/is-string
-[5]: https://david-dm.org/ljharb/is-string.svg
-[6]: https://david-dm.org/ljharb/is-string
-[7]: https://david-dm.org/ljharb/is-string/dev-status.svg
-[8]: https://david-dm.org/ljharb/is-string#info=devDependencies
-[9]: https://ci.testling.com/ljharb/is-string.png
-[10]: https://ci.testling.com/ljharb/is-string
-[11]: https://nodei.co/npm/is-string.png?downloads=true&stars=true
-[license-image]: http://img.shields.io/npm/l/is-string.svg
-[license-url]: LICENSE
-[downloads-image]: http://img.shields.io/npm/dm/is-string.svg
-[downloads-url]: http://npm-stat.com/charts.html?package=is-string
diff --git a/tools/node_modules/eslint/node_modules/is-string/index.js b/tools/node_modules/eslint/node_modules/is-string/index.js
deleted file mode 100644
index 95b7050cc68b55..00000000000000
--- a/tools/node_modules/eslint/node_modules/is-string/index.js
+++ /dev/null
@@ -1,24 +0,0 @@
-'use strict';
-
-var strValue = String.prototype.valueOf;
-var tryStringObject = function tryStringObject(value) {
- try {
- strValue.call(value);
- return true;
- } catch (e) {
- return false;
- }
-};
-var toStr = Object.prototype.toString;
-var strClass = '[object String]';
-var hasToStringTag = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol';
-
-module.exports = function isString(value) {
- if (typeof value === 'string') {
- return true;
- }
- if (typeof value !== 'object') {
- return false;
- }
- return hasToStringTag ? tryStringObject(value) : toStr.call(value) === strClass;
-};
diff --git a/tools/node_modules/eslint/node_modules/is-string/package.json b/tools/node_modules/eslint/node_modules/is-string/package.json
deleted file mode 100644
index a0870540424604..00000000000000
--- a/tools/node_modules/eslint/node_modules/is-string/package.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "name": "is-string",
- "version": "1.0.5",
- "author": "Jordan Harband ",
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- },
- "description": "Is this value a JS String object or primitive? This module works cross-realm/iframe, and despite ES6 @@toStringTag.",
- "license": "MIT",
- "main": "index.js",
- "scripts": {
- "prepublish": "safe-publish-latest",
- "pretest": "npm run lint",
- "tests-only": "node --harmony --es-staging test",
- "test": "npm run tests-only",
- "posttest": "npx aud",
- "coverage": "covert test/index.js",
- "lint": "eslint .",
- "eccheck": "eclint check *.js **/*.js > /dev/null",
- "version": "auto-changelog && git add CHANGELOG.md",
- "postversion": "auto-changelog && git add CHANGELOG.md && git commit --no-edit --amend && git tag -f \"v$(node -e \"console.log(require('./package.json').version)\")\""
- },
- "repository": {
- "type": "git",
- "url": "git://github.com/ljharb/is-string.git"
- },
- "keywords": [
- "String",
- "string",
- "ES6",
- "toStringTag",
- "@@toStringTag",
- "String object"
- ],
- "dependencies": {},
- "devDependencies": {
- "@ljharb/eslint-config": "^15.0.2",
- "auto-changelog": "^1.16.2",
- "covert": "^1.1.1",
- "eclint": "^2.8.1",
- "eslint": "^6.7.2",
- "foreach": "^2.0.5",
- "indexof": "^0.0.1",
- "is": "^3.3.0",
- "safe-publish-latest": "^1.1.4",
- "tape": "^4.12.0"
- },
- "testling": {
- "files": "test/index.js",
- "browsers": [
- "iexplore/6.0..latest",
- "firefox/3.0..6.0",
- "firefox/15.0..latest",
- "firefox/nightly",
- "chrome/4.0..10.0",
- "chrome/20.0..latest",
- "chrome/canary",
- "opera/10.0..latest",
- "opera/next",
- "safari/4.0..latest",
- "ipad/6.0..latest",
- "iphone/6.0..latest",
- "android-browser/4.2"
- ]
- },
- "engines": {
- "node": ">= 0.4"
- },
- "auto-changelog": {
- "output": "CHANGELOG.md",
- "template": "keepachangelog",
- "unreleased": false,
- "commitLimit": false,
- "backfillLimit": false
- }
-}
diff --git a/tools/node_modules/eslint/node_modules/table/README.md b/tools/node_modules/eslint/node_modules/table/README.md
index 22a79962a1a2ee..f34656c5021aa7 100644
--- a/tools/node_modules/eslint/node_modules/table/README.md
+++ b/tools/node_modules/eslint/node_modules/table/README.md
@@ -14,6 +14,7 @@
* [Cell Content Alignment](#table-usage-cell-content-alignment)
* [Column Width](#table-usage-column-width)
* [Custom Border](#table-usage-custom-border)
+ * [Draw Vertical Line](#table-usage-draw-vertical-line)
* [Draw Horizontal Line](#table-usage-draw-horizontal-line)
* [Single Line Mode](#table-usage-single-line-mode)
* [Padding Cell Content](#table-usage-padding-cell-content)
@@ -292,6 +293,57 @@ console.log(output);
└────┴────┴────┘
```
+",
"description": "An AST-based pattern checker for JavaScript.",
"bin": {
@@ -27,10 +27,7 @@
"pre-commit": "lint-staged"
},
"lint-staged": {
- "*.js": [
- "eslint --fix",
- "git add"
- ],
+ "*.js": "eslint --fix",
"*.md": "markdownlint"
},
"files": [
@@ -103,7 +100,7 @@
"eslint-plugin-jsdoc": "^25.4.3",
"eslint-plugin-node": "^11.1.0",
"eslint-release": "^2.0.0",
- "eslump": "^2.0.0",
+ "eslump": "^3.0.0",
"esprima": "^4.0.1",
"fs-teardown": "^0.1.0",
"glob": "^7.1.6",
diff --git a/tools/test.py b/tools/test.py
index cdeb40d59cda78..c3a7ff07e23b5d 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -375,7 +375,10 @@ def HasRun(self, output):
if output.diagnostic:
self.severity = 'ok'
- self.traceback = output.diagnostic
+ if isinstance(output.diagnostic, list):
+ self.traceback = '\n'.join(output.diagnostic)
+ else:
+ self.traceback = output.diagnostic
duration = output.test.duration
diff --git a/tools/update-npm.sh b/tools/update-npm.sh
index c106570d0b33dd..d58b325b77f713 100755
--- a/tools/update-npm.sh
+++ b/tools/update-npm.sh
@@ -11,25 +11,25 @@ if [ "$#" -le 0 ]; then
exit 1
fi
-WORKSPACE="$TMPDIR"update-npm-$NPM_VERSION/
+echo "Making temporary workspace"
-if [ -d "$WORKSPACE" ]; then
- echo "Cleaning up old workspace"
- rm -rf "$WORKSPACE"
-fi
+WORKSPACE=$(mktemp -d 2> /dev/null || mktemp -d -t 'tmp')
-echo "Making temporary workspace"
+cleanup () {
+ EXIT_CODE=$?
+ [ -d "$WORKSPACE" ] && rm -rf "$WORKSPACE"
+ exit $EXIT_CODE
+}
-mkdir -p "$WORKSPACE"
+trap cleanup INT TERM EXIT
cd "$WORKSPACE"
-git clone git@github.com:npm/cli.git
+git clone --depth=1 --branch="v$NPM_VERSION" git@github.com:npm/cli.git
cd cli
echo "Preparing npm release"
-git checkout v"$NPM_VERSION"
make
make release
@@ -40,11 +40,7 @@ rm -rf npm/
echo "Copying new npm"
-tar zxf "$WORKSPACE"cli/release/npm-"$NPM_VERSION".tgz
-
-echo "Deleting temporary workspace"
-
-rm -rf "$WORKSPACE"
+tar zxf "$WORKSPACE"/cli/release/npm-"$NPM_VERSION".tgz
echo ""
echo "All done!"
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index ccb5984f47d0d8..377e12d1fdcfbd 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -1378,6 +1378,9 @@
'<(V8_ROOT)/src/heap/base/worklist.h',
],
'conditions': [
+ ['enable_lto=="true"', {
+ 'cflags_cc': [ '-fno-lto' ],
+ }],
['clang or OS!="win"', {
'conditions': [
['_toolset == "host" and host_arch == "x64" or _toolset == "target" and target_arch=="x64"', {