Merge pull request #2115 from github/backport-v2.24.0-e8893c57a

Merge releases/v3 into releases/v2

.github/actions/check-sarif/action.yml

@@ -16,5 +16,5 @@ inputs:
       Comma separated list of query ids that should NOT be included in this SARIF file.
 
 runs:
-  using: node20
+  using: node16
   main: index.js

.github/actions/setup-swift/action.yml

@@ -33,7 +33,7 @@ runs:
         fi
         echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
 
-    - uses: swift-actions/setup-swift@f51889efb55dccf13be0ee727e3d6c89a096fb4c # Please update the corresponding SHA in the CLI's CodeQL Action Integration Test.
+    - uses: swift-actions/setup-swift@cdbe0f7f4c77929b6580e71983e8606e55ffe7e4 # Please update the corresponding SHA in the CLI's CodeQL Action Integration Test.
       if: runner.os == 'Linux' && steps.get_swift_version.outputs.version != 'null'
       with:
         swift-version: "${{ steps.get_swift_version.outputs.version }}"

.github/dependabot.yml

@@ -2,6 +2,8 @@ version: 2
 updates:
   - package-ecosystem: npm
     directory: "/"
+    reviewers:
+      - "github/codeql-production-shield"
     schedule:
       interval: weekly
     labels:
@@ -20,6 +22,8 @@ updates:
           - "*"
   - package-ecosystem: github-actions
     directory: "/"
+    reviewers:
+      - "github/codeql-production-shield"
     schedule:
       interval: weekly
     groups:
@@ -28,6 +32,8 @@ updates:
           - "*"
   - package-ecosystem: github-actions
     directory: "/.github/actions/setup-swift/" # All subdirectories outside of "/.github/workflows" must be explicitly included.
+    reviewers:
+      - "github/codeql-production-shield"
     schedule:
       interval: weekly
     groups:

.github/workflows/__build-mode-none.yml

@@ -0,0 +1,85 @@
+# Warning: This file is generated automatically, and should not be modified.
+# Instead, please modify the template in the pr-checks directory and run:
+#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
+# to regenerate this file.
+
+name: PR Check - Build mode none
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
+on:
+  push:
+    branches:
+    - main
+    - releases/v*
+  pull_request:
+    types:
+    - opened
+    - synchronize
+    - reopened
+    - ready_for_review
+  workflow_dispatch: {}
+jobs:
+  build-mode-none:
+    strategy:
+      matrix:
+        include:
+        - os: ubuntu-latest
+          version: latest
+        - os: ubuntu-latest
+          version: nightly-latest
+    name: Build mode none
+    permissions:
+      contents: read
+      security-events: write
+    timeout-minutes: 45
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Setup Python on MacOS
+      uses: actions/setup-python@v5
+      if: >-
+        matrix.os == 'macos-latest' && (
+
+        matrix.version == 'stable-20221211' ||
+
+        matrix.version == 'stable-20230418' ||
+
+        matrix.version == 'stable-v2.13.5' ||
+
+        matrix.version == 'stable-v2.14.6')
+      with:
+        python-version: '3.11'
+    - name: Check out repository
+      uses: actions/checkout@v4
+    - name: Prepare test
+      id: prepare-test
+      uses: ./.github/actions/prepare-test
+      with:
+        version: ${{ matrix.version }}
+        use-all-platform-bundle: 'false'
+    - name: Set environment variable for Swift enablement
+      if: runner.os != 'Windows' && matrix.version == '20221211'
+      shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
+    - uses: ./../action/init
+      id: init
+      with:
+        build-mode: none
+        db-location: ${{ runner.temp }}/customDbLocation
+        languages: java
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+
+    - name: Validate database build mode
+      run: |
+        metadata_path="$RUNNER_TEMP/customDbLocation/java/codeql-database.yml"
+        build_mode=$(yq eval '.buildMode' "$metadata_path")
+        if [[ "$build_mode" != "none" ]]; then
+          echo "Expected build mode to be 'none' but was $build_mode"
+          exit 1
+        fi
+
+    - uses: ./../action/autobuild
+    - uses: ./../action/analyze
+    env:
+      CODEQL_ACTION_TEST_MODE: true

.github/workflows/pr-checks.yml

@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        node-types-version: [16.11, current] # run tests on 16.11 while CodeQL Action v2 is still supported
+        node-types-version: [16.11, current] # we backport this matrix job in order to maintain the same check names
 
     steps:
       - name: Checkout
@@ -49,6 +49,7 @@ jobs:
           fi
 
       - name: Check generated JS
+        if: matrix.node-types-version != 'current' # we do not need to test the newer node on the v2 branch
         run: .github/workflows/script/check-js.sh
 
   check-node-modules:

CHANGELOG.md

@@ -4,22 +4,36 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
 
 Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. For example `3.22.11` was the first `v3` release and is functionally identical to `2.22.11`. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers.
 
-## [UNRELEASED]
+## 2.22.12 - 22 Dec 2023
 
 No user facing changes.
 
-## 3.23.0 - 08 Jan 2024
+## 2.24.0 - 02 Feb 2024
+
+- CodeQL Python analysis will no longer install dependencies on GitHub Enterprise Server, as is already the case for GitHub.com. See [release notes for 3.23.0](#3230---08-jan-2024) for more details. [#2106](https://github.com/github/codeql-action/pull/2106)
+
+## 2.23.2 - 26 Jan 2024
+
+- On Linux, the maximum possible value for the `--threads` option now respects the CPU count as specified in `cgroup` files to more accurately reflect the number of available cores when running in containers. [#2083](https://github.com/github/codeql-action/pull/2083)
+- Update default CodeQL bundle version to 2.16.1. [#2096](https://github.com/github/codeql-action/pull/2096)
+
+## 2.23.1 - 17 Jan 2024
+
+- Update default CodeQL bundle version to 2.16.0. [#2073](https://github.com/github/codeql-action/pull/2073)
+- Change the retention period for uploaded debug artifacts to 7 days. Previously, this was whatever the repository default was. [#2079](https://github.com/github/codeql-action/pull/2079)
+
+## 2.23.0 - 08 Jan 2024
 
 - We are rolling out a feature in January 2024 that will disable Python dependency installation by default for all users. This improves the speed of analysis while having only a very minor impact on results. You can override this behavior by setting `CODEQL_ACTION_DISABLE_PYTHON_DEPENDENCY_INSTALLATION=false` in your workflow, however we plan to remove this ability in future versions of the CodeQL Action. [#2031](https://github.com/github/codeql-action/pull/2031)
 - The CodeQL Action now requires CodeQL version 2.11.6 or later. For more information, see [the corresponding changelog entry for CodeQL Action version 2.22.7](#2227---16-nov-2023). [#2009](https://github.com/github/codeql-action/pull/2009)
 
-## 3.22.12 - 22 Dec 2023
+## 2.22.12 - 22 Dec 2023
 
 - Update default CodeQL bundle version to 2.15.5. [#2047](https://github.com/github/codeql-action/pull/2047)
 
-## 3.22.11 - 13 Dec 2023
+## 2.22.11 - 13 Dec 2023
 
-- [v3+ only] The CodeQL Action now runs on Node.js v20. [#2006](https://github.com/github/codeql-action/pull/2006)
+No user facing changes.
 
 ## 2.22.10 - 12 Dec 2023
 

README.md

@@ -4,15 +4,6 @@ This action runs GitHub's industry-leading semantic code analysis engine, [CodeQ
 
 For a list of recent changes, see the CodeQL Action's [changelog](CHANGELOG.md).
 
-## :loudspeaker: Node 16 deprecation, upcoming CodeQL Action v3 :loudspeaker:
-Announcement for users of this Action and code scanning workflows on GitHub.com:
-
-- You will begin to see these warnings about Node.js 16 deprecation in your Actions logs on code scanning runs starting October 23, 2023.
-- All code scanning workflows should continue to succeed regardless of the warning.
-- The team at GitHub maintaining the CodeQL Action is aware of the deprecation timeline and actively working on creating another version of the CodeQL Action, v3, that will bump us to Node 20.
-
-For more information, and to communicate with the maintaining team, please use [this issue](https://github.com/github/codeql-action/issues/1959). 
-
 ## License
 
 This project is released under the [MIT License](LICENSE).
@@ -25,6 +16,19 @@ We recommend using default setup to configure CodeQL analysis for your repositor
 
 You can also configure advanced setup for a repository to find security vulnerabilities in your code using a highly customizable code scanning configuration. For more information, see "[Configuring advanced setup for code scanning](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/configuring-advanced-setup-for-code-scanning)" and "[Customizing your advanced setup for code scanning](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning)."
 
+## Supported versions of the CodeQL Action
+
+The following versions of the CodeQL Action are currently supported:
+
+- v3 (latest)
+- v2 (deprecated, support will end on December 5th, 2024)
+
+The only difference between CodeQL Action v2 and v3 is the version of Node.js on which they run. CodeQL Action v3 runs on Node 20, while CodeQL Action v2 runs on Node 16.
+
+To provide the best experience to customers using older versions of GitHub Enterprise Server, we will continue to release CodeQL Action v2 so that these customers can continue to run the latest version of CodeQL as long as their version of GitHub Enterprise Server is supported. For example CodeQL Action v3.22.11 was the first release of CodeQL Action v3 and is functionally identical to v2.22.11. This approach provides an easy way to track exactly which features are included in different versions by looking at the minor and patch version numbers.
+
+For more information, see ["Code scanning: deprecation of CodeQL Action v2."](https://github.blog/changelog/2024-01-12-code-scanning-deprecation-of-codeql-action-v2/).
+
 ## Troubleshooting
 
 Read about [troubleshooting code scanning](https://docs.github.com/en/code-security/code-scanning/troubleshooting-code-scanning).

analyze/action.yml

@@ -52,10 +52,10 @@ inputs:
     # If changing this, make sure to update workflow.ts accordingly.
     default: ${{ github.workspace }}
   ref:
-    description: "The ref where results will be uploaded. If not provided, the Action will use the GITHUB_REF environment variable. If provided, the sha input must be provided as well. This input is not available in pull requests from forks."
+    description: "The ref where results will be uploaded. If not provided, the Action will use the GITHUB_REF environment variable. If provided, the sha input must be provided as well. This input is ignored for pull requests from forks."
     required: false
   sha:
-    description: "The sha of the HEAD of the ref where results will be uploaded. If not provided, the Action will use the GITHUB_SHA environment variable. If provided, the ref input must be provided as well. This input is not available in pull requests from forks."
+    description: "The sha of the HEAD of the ref where results will be uploaded. If not provided, the Action will use the GITHUB_SHA environment variable. If provided, the ref input must be provided as well. This input is ignored for pull requests from forks."
     required: false
   category:
     description: String used by Code Scanning for matching the analyses
@@ -84,6 +84,6 @@ outputs:
   sarif-id:
     description: The ID of the uploaded SARIF file.
 runs:
-  using: node20
+  using: node16
   main: "../lib/analyze-action.js"
   post: "../lib/analyze-action-post.js"

autobuild/action.yml

@@ -13,5 +13,5 @@ inputs:
       $GITHUB_WORKSPACE as its working directory.
     required: false
 runs:
-  using: node20
+  using: node16
   main: '../lib/autobuild-action.js'

init/action.yml

@@ -10,6 +10,23 @@ inputs:
     description: |
       A comma-separated value of the languages to be analysed e.g. python,javascript
     required: false
+  build-mode:
+    description: >-
+      [Experimental, for internal testing only] The build mode that will be used to analyze the language.
+      This input is only available in single-language analyses.
+
+      Available build modes will differ based on the language being analyzed. One of: 
+
+      - none:      The database will be created without building the source code.
+                   Available for all interpreted languages and some compiled languages.
+      - autobuild: The database will be created by attempting to automatically build the source code.
+                   To use this build mode, ensure that your workflow calls the `autobuild` action
+                   between the `init` and `analyze` steps.
+                   Available for all compiled languages.
+      - manual:    The database will be created by building the source code using a manually specified
+                   build command. To use this build mode, specify manual build steps in your workflow
+                   between the `init` and `analyze` steps. Available for all compiled languages.
+    required: false
   token:
     description: GitHub token to use for authenticating with this instance of GitHub. To download custom packs from multiple registries, use the registries input.
     default: ${{ github.token }}
@@ -109,6 +126,6 @@ outputs:
   codeql-path:
     description: The path of the CodeQL binary used for analysis
 runs:
-  using: node20
+  using: node16
   main: '../lib/init-action.js'
   post: '../lib/init-action-post.js'

lib/analyze-action.js

@@ -50,7 +50,6 @@ const status_report_1 = require("./status-report");
 const trap_caching_1 = require("./trap-caching");
 const uploadLib = __importStar(require("./upload-lib"));
 const util = __importStar(require("./util"));
-const util_1 = require("./util");
 async function sendStatusReport(startedAt, config, stats, error, trapCacheUploadTime, dbCreationTimings, didUploadTrapCaches, logger) {
     const status = (0, status_report_1.getActionsStatus)(error, stats?.analyze_failure_language);
     const statusReportBase = await (0, status_report_1.createStatusReportBase)("finish", status, startedAt, await util.checkDiskUsage(), error?.message, error?.stack);
@@ -159,6 +158,7 @@ async function run() {
         const threads = util.getThreadsFlag(actionsUtil.getOptionalInput("threads") || process.env["CODEQL_THREADS"], logger);
         const repositoryNwo = (0, repository_1.parseRepositoryNwo)(util.getRequiredEnvParam("GITHUB_REPOSITORY"));
         const gitHubVersion = await (0, api_client_1.getGitHubVersion)();
+        util.checkActionVersion(actionsUtil.getActionVersion(), gitHubVersion);
         const features = new feature_flags_1.Features(gitHubVersion, repositoryNwo, actionsUtil.getTemporaryDirectory(), logger);
         const memory = util.getMemoryFlag(actionsUtil.getOptionalInput("ram") || process.env["CODEQL_RAM"], logger);
         // Check that `which go` still points at the same path it did when the `init` Action ran to ensure that no steps
@@ -228,7 +228,7 @@ async function run() {
         core.exportVariable(environment_1.EnvVar.ANALYZE_DID_COMPLETE_SUCCESSFULLY, "true");
     }
     catch (unwrappedError) {
-        const error = (0, util_1.wrapError)(unwrappedError);
+        const error = util.wrapError(unwrappedError);
         if (actionsUtil.getOptionalInput("expect-error") !== "true" ||
             hasBadExpectErrorInput()) {
             core.setFailed(error.message);
@@ -261,9 +261,9 @@ async function runWrapper() {
         await exports.runPromise;
     }
     catch (error) {
-        core.setFailed(`analyze action failed: ${(0, util_1.wrapError)(error).message}`);
+        core.setFailed(`analyze action failed: ${util.wrapError(error).message}`);
     }
-    await (0, util_1.checkForTimeout)();
+    await util.checkForTimeout();
 }
 void runWrapper();
 //# sourceMappingURL=analyze-action.js.map

lib/analyze.test.js

@@ -95,25 +95,11 @@ const util = __importStar(require("./util"));
                 },
                 databasePrintBaseline: async () => "",
             });
-            const config = {
+            const config = (0, testing_utils_1.createTestConfig)({
                 languages: [language],
-                originalUserInput: {},
                 tempDir: tmpDir,
-                codeQLCmd: "",
-                gitHubVersion: {
-                    type: util.GitHubVariant.DOTCOM,
-                },
                 dbLocation: path.resolve(tmpDir, "codeql_databases"),
-                debugMode: false,
-                debugArtifactName: util.DEFAULT_DEBUG_ARTIFACT_NAME,
-                debugDatabaseName: util.DEFAULT_DEBUG_DATABASE_NAME,
-                augmentationProperties: {
-                    packsInputCombines: false,
-                    queriesInputCombines: false,
-                },
-                trapCaches: {},
-                trapCacheDownloadTime: 0,
-            };
+            });
             fs.mkdirSync(util.getCodeQLDatabasePath(config, language), {
                 recursive: true,
             });

lib/analyze.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze.test.js","sourceRoot":"","sources":["../src/analyze.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAE7B,8CAAuB;AACvB,6CAA+B;AAE/B,uCAAuC;AACvC,qCAAqC;AAErC,mDAA0C;AAC1C,2CAAuC;AACvC,uCAA4C;AAC5C,mDAA+E;AAC/E,wDAA0C;AAC1C,6CAA+B;AAE/B,IAAA,0BAAU,EAAC,aAAI,CAAC,CAAC;AAEjB;;;;;GAKG;AACH,IAAA,aAAI,EAAC,sBAAsB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACvC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC5C,IAAA,gCAAgB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEjC,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,MAAM,eAAe,GAAG,EAAE,CAAC;QAC3B,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;QAEjD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,oBAAQ,CAAC,EAAE,CAAC;YAC/C,IAAA,kBAAS,EAAC;gBACR,kBAAkB,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;gBAClC,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;gBACzC,wBAAwB,EAAE,KAAK,EAC7B,GAAW,EACX,WAAqB,EACrB,SAAiB,EACjB,EAAE;oBACF,EAAE,CAAC,aAAa,CACd,SAAS,EACT,IAAI,CAAC,SAAS,CAAC;wBACb,IAAI,EAAE;4BACJ,+EAA+E;4BAC/E;gCACE,IAAI,EAAE;oCACJ,UAAU,EAAE;wCACV;4CACE,KAAK,EAAE;gDACL;oDACE,UAAU,EAAE;wDACV,IAAI,EAAE,CAAC,eAAe,CAAC;qDACxB;iDACF;6CACF;yCACF;qCACF;iCACF;gCACD,UAAU,EAAE;oCACV,aAAa,EAAE;wCACb;4CACE,IAAI,EAAE;gDACJ,KAAK,EAAE,CAAC;gDACR,aAAa,EAAE;oDACb,KAAK,EAAE,CAAC;iDACT;6CACF;4CACD,KAAK,EAAE,GAAG;yCACX;qCACF;iCACF;6BACF;4BACD,EAAE;yBACH;qBACF,CAAC,CACH,CAAC;oBACF,OAAO,EAAE,CAAC;gBACZ,CAAC;gBACD,qBAAqB,EAAE,KAAK,IAAI,EAAE,CAAC,EAAE;aACtC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAW;gBACrB,SAAS,EAAE,CAAC,QAAQ,CAAC;gBACrB,iBAAiB,EAAE,EAAE;gBACrB,OAAO,EAAE,MAAM;gBACf,SAAS,EAAE,EAAE;gBACb,aAAa,EAAE;oBACb,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM;iBACV;gBACvB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,kBAAkB,CAAC;gBACpD,SAAS,EAAE,KAAK;gBAChB,iBAAiB,EAAE,IAAI,CAAC,2BAA2B;gBACnD,iBAAiB,EAAE,IAAI,CAAC,2BAA2B;gBACnD,sBAAsB,EAAE;oBACtB,kBAAkB,EAAE,KAAK;oBACzB,oBAAoB,EAAE,KAAK;iBAC5B;gBACD,UAAU,EAAE,EAAE;gBACd,qBAAqB,EAAE,CAAC;aACzB,CAAC;YACF,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE;gBACzD,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;YAEH,MAAM,YAAY,GAAG,MAAM,IAAA,oBAAU,EACnC,MAAM,EACN,UAAU,EACV,eAAe,EACf,WAAW,EACX,SAAS,EACT,MAAM,EACN,IAAA,yBAAe,EAAC,IAAI,CAAC,EACrB,IAAA,8BAAc,EAAC,CAAC,uBAAO,CAAC,kBAAkB,CAAC,CAAC,CAC7C,CAAC;YACF,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC5C,2BAA2B,QAAQ,cAAc;gBACjD,eAAe;gBACf,qBAAqB,QAAQ,cAAc;aAC5C,CAAC,CAAC;YACH,KAAK,MAAM,WAAW,IAAI,YAAY,CAAC,aAAc,EAAE,CAAC;gBACtD,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,mCAAmC,CAAC,CAAC;gBACpE,CAAC,CAAC,IAAI,CAAC,YAAY,IAAI,WAAW,CAAC,CAAC;gBACpC,CAAC,CAAC,IAAI,CAAC,aAAa,IAAI,WAAW,CAAC,UAAW,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"analyze.test.js","sourceRoot":"","sources":["../src/analyze.test.ts"],"names":[],"mappings":"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"}

lib/autobuild-action.js

@@ -53,6 +53,7 @@ async function run() {
         }
         const gitHubVersion = await (0, api_client_1.getGitHubVersion)();
         (0, util_1.checkGitHubVersionInRange)(gitHubVersion, logger);
+        (0, util_1.checkActionVersion)((0, actions_util_1.getActionVersion)(), gitHubVersion);
         const config = await configUtils.getConfig((0, actions_util_1.getTemporaryDirectory)(), logger);
         if (config === undefined) {
             throw new Error("Config file could not be found at expected location. Has the 'init' action been called?");

lib/autobuild-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"autobuild-action.js","sourceRoot":"","sources":["../src/autobuild-action.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"autobuild-action.js","sourceRoot":"","sources":["../src/autobuild-action.ts"],"names":[],"mappings":"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"}

lib/codeql.js

@@ -35,6 +35,7 @@ const environment_1 = require("./environment");
 const feature_flags_1 = require("./feature-flags");
 const languages_1 = require("./languages");
 const setupCodeql = __importStar(require("./setup-codeql"));
+const tools_features_1 = require("./tools-features");
 const util = __importStar(require("./util"));
 const util_1 = require("./util");
 class CommandInvocationError extends Error {
@@ -201,10 +202,12 @@ function resolveFunction(partialCodeql, methodName, defaultImplementation) {
 function setCodeQL(partialCodeql) {
     cachedCodeQL = {
         getPath: resolveFunction(partialCodeql, "getPath", () => "/tmp/dummy-path"),
-        getVersion: resolveFunction(partialCodeql, "getVersion", () => new Promise((resolve) => resolve({
+        getVersion: resolveFunction(partialCodeql, "getVersion", async () => ({
             version: "1.0.0",
-        }))),
+        })),
         printVersion: resolveFunction(partialCodeql, "printVersion"),
+        supportsFeature: resolveFunction(partialCodeql, "supportsFeature", async (feature) => !!partialCodeql.getVersion &&
+            (0, tools_features_1.isSupportedToolsFeature)(await partialCodeql.getVersion(), feature)),
         databaseInitCluster: resolveFunction(partialCodeql, "databaseInitCluster"),
         runAutobuild: resolveFunction(partialCodeql, "runAutobuild"),
         extractScannedLanguage: resolveFunction(partialCodeql, "extractScannedLanguage"),
@@ -279,6 +282,9 @@ async function getCodeQLForCmd(cmd, checkVersion) {
         async printVersion() {
             await runTool(cmd, ["version", "--format=json"]);
         },
+        async supportsFeature(feature) {
+            return (0, tools_features_1.isSupportedToolsFeature)(await this.getVersion(), feature);
+        },
         async databaseInitCluster(config, sourceRoot, processName, qlconfigFile, logger) {
             const extraArgs = config.languages.map((language) => `--language=${language}`);
             if (config.languages.filter((l) => (0, languages_1.isTracedLanguage)(l)).length > 0) {
@@ -292,6 +298,10 @@ async function getCodeQLForCmd(cmd, checkVersion) {
             if (externalRepositoryToken) {
                 extraArgs.push("--external-repository-token-stdin");
             }
+            if (config.buildMode !== undefined &&
+                (await this.supportsFeature(tools_features_1.ToolsFeature.BuildModeOption))) {
+                extraArgs.push(`--build-mode=${config.buildMode}`);
+            }
             if (qlconfigFile !== undefined &&
                 (await util.codeQlVersionAbove(this, exports.CODEQL_VERSION_INIT_WITH_QLCONFIG))) {
                 extraArgs.push(`--qlconfig-file=${qlconfigFile}`);
@@ -693,7 +703,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
             "version of the CLI using the 'tools' input to the 'init' Action, you can remove this " +
             "input to use the default version.\n\n" +
             "Alternatively, if you want to continue using CodeQL CLI version " +
-            `${result.version}, you can replace 'github/codeql-action/*@v3' by ` +
+            `${result.version}, you can replace 'github/codeql-action/*@v2' by ` +
             `'github/codeql-action/*@v${(0, actions_util_1.getActionVersion)()}' in your code scanning workflow to ` +
             "continue using this version of the CodeQL Action.");
         core.exportVariable(environment_1.EnvVar.SUPPRESS_DEPRECATED_SOON_WARNING, "true");

lib/codeql.test.js

@@ -49,25 +49,9 @@ const util_1 = require("./util");
 let stubConfig;
 ava_1.default.beforeEach(() => {
     (0, util_1.initializeEnvironment)("1.2.3");
-    stubConfig = {
+    stubConfig = (0, testing_utils_1.createTestConfig)({
         languages: [languages_1.Language.cpp],
-        originalUserInput: {},
-        tempDir: "",
-        codeQLCmd: "",
-        gitHubVersion: {
-            type: util.GitHubVariant.DOTCOM,
-        },
-        dbLocation: "",
-        debugMode: false,
-        debugArtifactName: util.DEFAULT_DEBUG_ARTIFACT_NAME,
-        debugDatabaseName: util.DEFAULT_DEBUG_DATABASE_NAME,
-        augmentationProperties: {
-            packsInputCombines: false,
-            queriesInputCombines: false,
-        },
-        trapCaches: {},
-        trapCacheDownloadTime: 0,
-    };
+    });
 });
 async function installIntoToolcache({ apiDetails = testing_utils_1.SAMPLE_DOTCOM_API_DETAILS, cliVersion, isPinned, tagName, tmpDir, }) {
     const url = (0, testing_utils_1.mockBundleDownloadApi)({ apiDetails, isPinned, tagName });

lib/config-utils.js

@@ -212,16 +212,17 @@ exports.getRawLanguages = getRawLanguages;
 /**
  * Get the default config for when the user has not supplied one.
  */
-async function getDefaultConfig(languagesInput, rawQueriesInput, rawPacksInput, dbLocation, trapCachingEnabled, debugMode, debugArtifactName, debugDatabaseName, repository, tempDir, codeQL, gitHubVersion, logger) {
-    const languages = await getLanguages(codeQL, languagesInput, repository, logger);
-    const augmentationProperties = calculateAugmentation(rawPacksInput, rawQueriesInput, languages);
-    const { trapCaches, trapCacheDownloadTime } = await downloadCacheWithTime(trapCachingEnabled, codeQL, languages, logger);
+async function getDefaultConfig({ languagesInput, queriesInput, packsInput, buildModeInput, dbLocation, trapCachingEnabled, debugMode, debugArtifactName, debugDatabaseName, repository, tempDir, codeql, githubVersion, logger, }) {
+    const languages = await getLanguages(codeql, languagesInput, repository, logger);
+    const augmentationProperties = calculateAugmentation(packsInput, queriesInput, languages);
+    const { trapCaches, trapCacheDownloadTime } = await downloadCacheWithTime(trapCachingEnabled, codeql, languages, logger);
     return {
         languages,
+        buildMode: buildModeInput,
         originalUserInput: {},
         tempDir,
-        codeQLCmd: codeQL.getPath(),
-        gitHubVersion,
+        codeQLCmd: codeql.getPath(),
+        gitHubVersion: githubVersion,
         dbLocation: dbLocationOrDefault(dbLocation, tempDir),
         debugMode,
         debugArtifactName,
@@ -245,7 +246,7 @@ async function downloadCacheWithTime(trapCachingEnabled, codeQL, languages, logg
 /**
  * Load the config from the given file.
  */
-async function loadConfig(languagesInput, rawQueriesInput, rawPacksInput, configFile, dbLocation, trapCachingEnabled, debugMode, debugArtifactName, debugDatabaseName, repository, tempDir, codeQL, workspacePath, gitHubVersion, apiDetails, logger) {
+async function loadConfig({ languagesInput, queriesInput, packsInput, buildModeInput, configFile, dbLocation, trapCachingEnabled, debugMode, debugArtifactName, debugDatabaseName, repository, tempDir, codeql, workspacePath, githubVersion, apiDetails, logger, }) {
     let parsedYAML;
     if (isLocal(configFile)) {
         // Treat the config file as relative to the workspace
@@ -255,15 +256,16 @@ async function loadConfig(languagesInput, rawQueriesInput, rawPacksInput, config
     else {
         parsedYAML = await getRemoteConfig(configFile, apiDetails);
     }
-    const languages = await getLanguages(codeQL, languagesInput, repository, logger);
-    const augmentationProperties = calculateAugmentation(rawPacksInput, rawQueriesInput, languages);
-    const { trapCaches, trapCacheDownloadTime } = await downloadCacheWithTime(trapCachingEnabled, codeQL, languages, logger);
+    const languages = await getLanguages(codeql, languagesInput, repository, logger);
+    const augmentationProperties = calculateAugmentation(packsInput, queriesInput, languages);
+    const { trapCaches, trapCacheDownloadTime } = await downloadCacheWithTime(trapCachingEnabled, codeql, languages, logger);
     return {
         languages,
+        buildMode: buildModeInput,
         originalUserInput: parsedYAML,
         tempDir,
-        codeQLCmd: codeQL.getPath(),
-        gitHubVersion,
+        codeQLCmd: codeql.getPath(),
+        gitHubVersion: githubVersion,
         dbLocation: dbLocationOrDefault(dbLocation, tempDir),
         debugMode,
         debugArtifactName,
@@ -452,24 +454,26 @@ function dbLocationOrDefault(dbLocation, tempDir) {
  * This will parse the config from the user input if present, or generate
  * a default config. The parsed config is then stored to a known location.
  */
-async function initConfig(languagesInput, queriesInput, packsInput, configFile, dbLocation, configInput, trapCachingEnabled, debugMode, debugArtifactName, debugDatabaseName, repository, tempDir, codeQL, workspacePath, gitHubVersion, apiDetails, logger) {
+async function initConfig(inputs) {
     let config;
+    const { logger, workspacePath } = inputs;
     // if configInput is set, it takes precedence over configFile
-    if (configInput) {
-        if (configFile) {
+    if (inputs.configInput) {
+        if (inputs.configFile) {
             logger.warning(`Both a config file and config input were provided. Ignoring config file.`);
         }
-        configFile = path.resolve(workspacePath, "user-config-from-action.yml");
-        fs.writeFileSync(configFile, configInput);
-        logger.debug(`Using config from action input: ${configFile}`);
+        inputs.configFile = path.resolve(workspacePath, "user-config-from-action.yml");
+        fs.writeFileSync(inputs.configFile, inputs.configInput);
+        logger.debug(`Using config from action input: ${inputs.configFile}`);
     }
     // If no config file was provided create an empty one
-    if (!configFile) {
+    if (!inputs.configFile) {
         logger.debug("No configuration file was provided");
-        config = await getDefaultConfig(languagesInput, queriesInput, packsInput, dbLocation, trapCachingEnabled, debugMode, debugArtifactName, debugDatabaseName, repository, tempDir, codeQL, gitHubVersion, logger);
+        config = await getDefaultConfig(inputs);
     }
     else {
-        config = await loadConfig(languagesInput, queriesInput, packsInput, configFile, dbLocation, trapCachingEnabled, debugMode, debugArtifactName, debugDatabaseName, repository, tempDir, codeQL, workspacePath, gitHubVersion, apiDetails, logger);
+        // Convince the type checker that inputs.configFile is defined.
+        config = await loadConfig({ ...inputs, configFile: inputs.configFile });
     }
     // Save the config so we can easily access it again in the future
     await saveConfig(config, logger);

lib/config-utils.test.js

@@ -41,14 +41,35 @@ const repository_1 = require("./repository");
 const testing_utils_1 = require("./testing-utils");
 const util_1 = require("./util");
 (0, testing_utils_1.setupTests)(ava_1.default);
-const sampleApiDetails = {
-    auth: "token",
-    externalRepoAuth: "token",
-    url: "https://github.example.com",
-    apiURL: undefined,
-    registriesAuthTokens: undefined,
-};
-const gitHubVersion = { type: util_1.GitHubVariant.DOTCOM };
+const githubVersion = { type: util_1.GitHubVariant.DOTCOM };
+function createTestInitConfigInputs(overrides) {
+    return Object.assign({}, {
+        languagesInput: undefined,
+        queriesInput: undefined,
+        packsInput: undefined,
+        configFile: undefined,
+        dbLocation: undefined,
+        configInput: undefined,
+        buildModeInput: undefined,
+        trapCachingEnabled: false,
+        debugMode: false,
+        debugArtifactName: "",
+        debugDatabaseName: "",
+        repository: { owner: "github", repo: "example" },
+        tempDir: "",
+        codeql: {},
+        workspacePath: "",
+        githubVersion,
+        apiDetails: {
+            auth: "token",
+            externalRepoAuth: "token",
+            url: "https://github.example.com",
+            apiURL: undefined,
+            registriesAuthTokens: undefined,
+        },
+        logger: (0, logging_1.getRunnerLogger)(true),
+    }, overrides);
+}
 // Returns the filepath of the newly-created file
 function createConfigFile(inputFileContents, tmpDir) {
     const configFilePath = path.join(tmpDir, "input");
@@ -83,10 +104,10 @@ function mockListLanguages(languages) {
     sinon.stub(api, "getApiClient").value(() => client);
 }
 (0, ava_1.default)("load empty config", async (t) => {
-    return await (0, util_1.withTmpDir)(async (tmpDir) => {
+    return await (0, util_1.withTmpDir)(async (tempDir) => {
         const logger = (0, logging_1.getRunnerLogger)(true);
         const languages = "javascript,python";
-        const codeQL = (0, codeql_1.setCodeQL)({
+        const codeql = (0, codeql_1.setCodeQL)({
             async resolveQueries() {
                 return {
                     byLanguage: {
@@ -101,14 +122,25 @@ function mockListLanguages(languages) {
                 return { packs: [] };
             },
         });
-        const config = await configUtils.initConfig(languages, undefined, undefined, undefined, undefined, undefined, false, false, "", "", { owner: "github", repo: "example" }, tmpDir, codeQL, tmpDir, gitHubVersion, sampleApiDetails, logger);
-        t.deepEqual(config, await configUtils.getDefaultConfig(languages, undefined, undefined, undefined, false, false, "", "", { owner: "github", repo: "example" }, tmpDir, codeQL, gitHubVersion, logger));
+        const config = await configUtils.initConfig(createTestInitConfigInputs({
+            languagesInput: languages,
+            repository: { owner: "github", repo: "example" },
+            tempDir,
+            codeql,
+            logger,
+        }));
+        t.deepEqual(config, await configUtils.getDefaultConfig(createTestInitConfigInputs({
+            languagesInput: languages,
+            tempDir,
+            codeql,
+            logger,
+        })));
     });
 });
 (0, ava_1.default)("loading config saves config", async (t) => {
-    return await (0, util_1.withTmpDir)(async (tmpDir) => {
+    return await (0, util_1.withTmpDir)(async (tempDir) => {
         const logger = (0, logging_1.getRunnerLogger)(true);
-        const codeQL = (0, codeql_1.setCodeQL)({
+        const codeql = (0, codeql_1.setCodeQL)({
             async resolveQueries() {
                 return {
                     byLanguage: {
@@ -124,14 +156,20 @@ function mockListLanguages(languages) {
             },
         });
         // Sanity check the saved config file does not already exist
-        t.false(fs.existsSync(configUtils.getPathToParsedConfigFile(tmpDir)));
+        t.false(fs.existsSync(configUtils.getPathToParsedConfigFile(tempDir)));
         // Sanity check that getConfig returns undefined before we have called initConfig
-        t.deepEqual(await configUtils.getConfig(tmpDir, logger), undefined);
-        const config1 = await configUtils.initConfig("javascript,python", undefined, undefined, undefined, undefined, undefined, false, false, "", "", { owner: "github", repo: "example" }, tmpDir, codeQL, tmpDir, gitHubVersion, sampleApiDetails, logger);
+        t.deepEqual(await configUtils.getConfig(tempDir, logger), undefined);
+        const config1 = await configUtils.initConfig(createTestInitConfigInputs({
+            languagesInput: "javascript,python",
+            tempDir,
+            codeql,
+            workspacePath: tempDir,
+            logger,
+        }));
         // The saved config file should now exist
-        t.true(fs.existsSync(configUtils.getPathToParsedConfigFile(tmpDir)));
+        t.true(fs.existsSync(configUtils.getPathToParsedConfigFile(tempDir)));
         // And that same newly-initialised config should now be returned by getConfig
-        const config2 = await configUtils.getConfig(tmpDir, logger);
+        const config2 = await configUtils.getConfig(tempDir, logger);
         t.not(config2, undefined);
         if (config2 !== undefined) {
             // removes properties assigned to undefined.
@@ -141,22 +179,32 @@ function mockListLanguages(languages) {
     });
 });
 (0, ava_1.default)("load input outside of workspace", async (t) => {
-    return await (0, util_1.withTmpDir)(async (tmpDir) => {
+    return await (0, util_1.withTmpDir)(async (tempDir) => {
         try {
-            await configUtils.initConfig(undefined, undefined, undefined, "../input", undefined, undefined, false, false, "", "", { owner: "github", repo: "example" }, tmpDir, (0, codeql_1.getCachedCodeQL)(), tmpDir, gitHubVersion, sampleApiDetails, (0, logging_1.getRunnerLogger)(true));
+            await configUtils.initConfig(createTestInitConfigInputs({
+                configFile: "../input",
+                tempDir,
+                codeql: (0, codeql_1.getCachedCodeQL)(),
+                workspacePath: tempDir,
+            }));
             throw new Error("initConfig did not throw error");
         }
         catch (err) {
-            t.deepEqual(err, new util_1.UserError(configUtils.getConfigFileOutsideWorkspaceErrorMessage(path.join(tmpDir, "../input"))));
+            t.deepEqual(err, new util_1.UserError(configUtils.getConfigFileOutsideWorkspaceErrorMessage(path.join(tempDir, "../input"))));
         }
     });
 });
 (0, ava_1.default)("load non-local input with invalid repo syntax", async (t) => {
-    return await (0, util_1.withTmpDir)(async (tmpDir) => {
+    return await (0, util_1.withTmpDir)(async (tempDir) => {
         // no filename given, just a repo
         const configFile = "octo-org/codeql-config@main";
         try {
-            await configUtils.initConfig(undefined, undefined, undefined, configFile, undefined, undefined, false, false, "", "", { owner: "github", repo: "example" }, tmpDir, (0, codeql_1.getCachedCodeQL)(), tmpDir, gitHubVersion, sampleApiDetails, (0, logging_1.getRunnerLogger)(true));
+            await configUtils.initConfig(createTestInitConfigInputs({
+                configFile,
+                tempDir,
+                codeql: (0, codeql_1.getCachedCodeQL)(),
+                workspacePath: tempDir,
+            }));
             throw new Error("initConfig did not throw error");
         }
         catch (err) {
@@ -165,22 +213,28 @@ function mockListLanguages(languages) {
     });
 });
 (0, ava_1.default)("load non-existent input", async (t) => {
-    return await (0, util_1.withTmpDir)(async (tmpDir) => {
-        const languages = "javascript";
+    return await (0, util_1.withTmpDir)(async (tempDir) => {
+        const languagesInput = "javascript";
         const configFile = "input";
-        t.false(fs.existsSync(path.join(tmpDir, configFile)));
+        t.false(fs.existsSync(path.join(tempDir, configFile)));
         try {
-            await configUtils.initConfig(languages, undefined, undefined, configFile, undefined, undefined, false, false, "", "", { owner: "github", repo: "example" }, tmpDir, (0, codeql_1.getCachedCodeQL)(), tmpDir, gitHubVersion, sampleApiDetails, (0, logging_1.getRunnerLogger)(true));
+            await configUtils.initConfig(createTestInitConfigInputs({
+                languagesInput,
+                configFile,
+                tempDir,
+                codeql: (0, codeql_1.getCachedCodeQL)(),
+                workspacePath: tempDir,
+            }));
             throw new Error("initConfig did not throw error");
         }
         catch (err) {
-            t.deepEqual(err, new util_1.UserError(configUtils.getConfigFileDoesNotExistErrorMessage(path.join(tmpDir, "input"))));
+            t.deepEqual(err, new util_1.UserError(configUtils.getConfigFileDoesNotExistErrorMessage(path.join(tempDir, "input"))));
         }
     });
 });
 (0, ava_1.default)("load non-empty input", async (t) => {
-    return await (0, util_1.withTmpDir)(async (tmpDir) => {
-        const codeQL = (0, codeql_1.setCodeQL)({
+    return await (0, util_1.withTmpDir)(async (tempDir) => {
+        const codeql = (0, codeql_1.setCodeQL)({
             async resolveQueries() {
                 return {
                     byLanguage: {
@@ -208,10 +262,11 @@ function mockListLanguages(languages) {
         - b
       paths:
         - c/d`;
-        fs.mkdirSync(path.join(tmpDir, "foo"));
+        fs.mkdirSync(path.join(tempDir, "foo"));
         // And the config we expect it to parse to
         const expectedConfig = {
             languages: [languages_1.Language.javascript],
+            buildMode: "none",
             originalUserInput: {
                 name: "my config",
                 "disable-default-queries": true,
@@ -219,10 +274,10 @@ function mockListLanguages(languages) {
                 "paths-ignore": ["a", "b"],
                 paths: ["c/d"],
             },
-            tempDir: tmpDir,
-            codeQLCmd: codeQL.getPath(),
-            gitHubVersion,
-            dbLocation: path.resolve(tmpDir, "codeql_databases"),
+            tempDir,
+            codeQLCmd: codeql.getPath(),
+            gitHubVersion: githubVersion,
+            dbLocation: path.resolve(tempDir, "codeql_databases"),
             debugMode: false,
             debugArtifactName: "my-artifact",
             debugDatabaseName: "my-db",
@@ -230,9 +285,18 @@ function mockListLanguages(languages) {
             trapCaches: {},
             trapCacheDownloadTime: 0,
         };
-        const languages = "javascript";
-        const configFilePath = createConfigFile(inputFileContents, tmpDir);
-        const actualConfig = await configUtils.initConfig(languages, undefined, undefined, configFilePath, undefined, undefined, false, false, "my-artifact", "my-db", { owner: "github", repo: "example" }, tmpDir, codeQL, tmpDir, gitHubVersion, sampleApiDetails, (0, logging_1.getRunnerLogger)(true));
+        const languagesInput = "javascript";
+        const configFilePath = createConfigFile(inputFileContents, tempDir);
+        const actualConfig = await configUtils.initConfig(createTestInitConfigInputs({
+            languagesInput,
+            buildModeInput: "none",
+            configFile: configFilePath,
+            debugArtifactName: "my-artifact",
+            debugDatabaseName: "my-db",
+            tempDir,
+            codeql,
+            workspacePath: tempDir,
+        }));
         // Should exactly equal the object we constructed earlier
         t.deepEqual(actualConfig, expectedConfig);
     });
@@ -256,14 +320,14 @@ function queriesToResolvedQueryForm(queries) {
     };
 }
 (0, ava_1.default)("Using config input and file together, config input should be used.", async (t) => {
-    return await (0, util_1.withTmpDir)(async (tmpDir) => {
-        process.env["RUNNER_TEMP"] = tmpDir;
-        process.env["GITHUB_WORKSPACE"] = tmpDir;
+    return await (0, util_1.withTmpDir)(async (tempDir) => {
+        process.env["RUNNER_TEMP"] = tempDir;
+        process.env["GITHUB_WORKSPACE"] = tempDir;
         const inputFileContents = `
       name: my config
       queries:
         - uses: ./foo_file`;
-        const configFilePath = createConfigFile(inputFileContents, tmpDir);
+        const configFilePath = createConfigFile(inputFileContents, tempDir);
         const configInput = `
       name: my config
       queries:
@@ -274,9 +338,9 @@ function queriesToResolvedQueryForm(queries) {
         python:
           - c/d@1.2.3
     `;
-        fs.mkdirSync(path.join(tmpDir, "foo"));
+        fs.mkdirSync(path.join(tempDir, "foo"));
         const resolveQueriesArgs = [];
-        const codeQL = (0, codeql_1.setCodeQL)({
+        const codeql = (0, codeql_1.setCodeQL)({
             async resolveQueries(queries, extraSearchPath) {
                 resolveQueriesArgs.push({ queries, extraSearchPath });
                 return queriesToResolvedQueryForm(queries);
@@ -286,14 +350,21 @@ function queriesToResolvedQueryForm(queries) {
             },
         });
         // Only JS, python packs will be ignored
-        const languages = "javascript";
-        const config = await configUtils.initConfig(languages, undefined, undefined, undefined, configFilePath, configInput, false, false, "", "", { owner: "github", repo: "example" }, tmpDir, codeQL, tmpDir, gitHubVersion, sampleApiDetails, (0, logging_1.getRunnerLogger)(true));
+        const languagesInput = "javascript";
+        const config = await configUtils.initConfig(createTestInitConfigInputs({
+            languagesInput,
+            configFile: configFilePath,
+            configInput,
+            tempDir,
+            codeql,
+            workspacePath: tempDir,
+        }));
         t.deepEqual(config.originalUserInput, yaml.load(configInput));
     });
 });
 (0, ava_1.default)("API client used when reading remote config", async (t) => {
-    return await (0, util_1.withTmpDir)(async (tmpDir) => {
-        const codeQL = (0, codeql_1.setCodeQL)({
+    return await (0, util_1.withTmpDir)(async (tempDir) => {
+        const codeql = (0, codeql_1.setCodeQL)({
             async resolveQueries() {
                 return {
                     byLanguage: {
@@ -326,20 +397,31 @@ function queriesToResolvedQueryForm(queries) {
         };
         const spyGetContents = mockGetContents(dummyResponse);
         // Create checkout directory for remote queries repository
-        fs.mkdirSync(path.join(tmpDir, "foo/bar/dev"), { recursive: true });
+        fs.mkdirSync(path.join(tempDir, "foo/bar/dev"), { recursive: true });
         const configFile = "octo-org/codeql-config/config.yaml@main";
-        const languages = "javascript";
-        await configUtils.initConfig(languages, undefined, undefined, configFile, undefined, undefined, false, false, "", "", { owner: "github", repo: "example" }, tmpDir, codeQL, tmpDir, gitHubVersion, sampleApiDetails, (0, logging_1.getRunnerLogger)(true));
+        const languagesInput = "javascript";
+        await configUtils.initConfig(createTestInitConfigInputs({
+            languagesInput,
+            configFile,
+            tempDir,
+            codeql,
+            workspacePath: tempDir,
+        }));
         t.assert(spyGetContents.called);
     });
 });
 (0, ava_1.default)("Remote config handles the case where a directory is provided", async (t) => {
-    return await (0, util_1.withTmpDir)(async (tmpDir) => {
+    return await (0, util_1.withTmpDir)(async (tempDir) => {
         const dummyResponse = []; // directories are returned as arrays
         mockGetContents(dummyResponse);
         const repoReference = "octo-org/codeql-config/config.yaml@main";
         try {
-            await configUtils.initConfig(undefined, undefined, undefined, repoReference, undefined, undefined, false, false, "", "", { owner: "github", repo: "example" }, tmpDir, (0, codeql_1.getCachedCodeQL)(), tmpDir, gitHubVersion, sampleApiDetails, (0, logging_1.getRunnerLogger)(true));
+            await configUtils.initConfig(createTestInitConfigInputs({
+                configFile: repoReference,
+                tempDir,
+                codeql: (0, codeql_1.getCachedCodeQL)(),
+                workspacePath: tempDir,
+            }));
             throw new Error("initConfig did not throw error");
         }
         catch (err) {
@@ -348,14 +430,19 @@ function queriesToResolvedQueryForm(queries) {
     });
 });
 (0, ava_1.default)("Invalid format of remote config handled correctly", async (t) => {
-    return await (0, util_1.withTmpDir)(async (tmpDir) => {
+    return await (0, util_1.withTmpDir)(async (tempDir) => {
         const dummyResponse = {
         // note no "content" property here
         };
         mockGetContents(dummyResponse);
         const repoReference = "octo-org/codeql-config/config.yaml@main";
         try {
-            await configUtils.initConfig(undefined, undefined, undefined, repoReference, undefined, undefined, false, false, "", "", { owner: "github", repo: "example" }, tmpDir, (0, codeql_1.getCachedCodeQL)(), tmpDir, gitHubVersion, sampleApiDetails, (0, logging_1.getRunnerLogger)(true));
+            await configUtils.initConfig(createTestInitConfigInputs({
+                configFile: repoReference,
+                tempDir,
+                codeql: (0, codeql_1.getCachedCodeQL)(),
+                workspacePath: tempDir,
+            }));
             throw new Error("initConfig did not throw error");
         }
         catch (err) {
@@ -364,9 +451,9 @@ function queriesToResolvedQueryForm(queries) {
     });
 });
 (0, ava_1.default)("No detected languages", async (t) => {
-    return await (0, util_1.withTmpDir)(async (tmpDir) => {
+    return await (0, util_1.withTmpDir)(async (tempDir) => {
         mockListLanguages([]);
-        const codeQL = (0, codeql_1.setCodeQL)({
+        const codeql = (0, codeql_1.setCodeQL)({
             async resolveLanguages() {
                 return {};
             },
@@ -375,7 +462,11 @@ function queriesToResolvedQueryForm(queries) {
             },
         });
         try {
-            await configUtils.initConfig(undefined, undefined, undefined, undefined, undefined, undefined, false, false, "", "", { owner: "github", repo: "example" }, tmpDir, codeQL, tmpDir, gitHubVersion, sampleApiDetails, (0, logging_1.getRunnerLogger)(true));
+            await configUtils.initConfig(createTestInitConfigInputs({
+                tempDir,
+                codeql,
+                workspacePath: tempDir,
+            }));
             throw new Error("initConfig did not throw error");
         }
         catch (err) {
@@ -384,10 +475,15 @@ function queriesToResolvedQueryForm(queries) {
     });
 });
 (0, ava_1.default)("Unknown languages", async (t) => {
-    return await (0, util_1.withTmpDir)(async (tmpDir) => {
-        const languages = "rubbish,english";
+    return await (0, util_1.withTmpDir)(async (tempDir) => {
+        const languagesInput = "rubbish,english";
         try {
-            await configUtils.initConfig(languages, undefined, undefined, undefined, undefined, undefined, false, false, "", "", { owner: "github", repo: "example" }, tmpDir, (0, codeql_1.getCachedCodeQL)(), tmpDir, gitHubVersion, sampleApiDetails, (0, logging_1.getRunnerLogger)(true));
+            await configUtils.initConfig(createTestInitConfigInputs({
+                languagesInput,
+                tempDir,
+                codeql: (0, codeql_1.getCachedCodeQL)(),
+                workspacePath: tempDir,
+            }));
             throw new Error("initConfig did not throw error");
         }
         catch (err) {

lib/database-upload.test.js

@@ -33,7 +33,6 @@ const sinon = __importStar(require("sinon"));
 const actionsUtil = __importStar(require("./actions-util"));
 const apiClient = __importStar(require("./api-client"));
 const codeql_1 = require("./codeql");
-const config_utils_1 = require("./config-utils");
 const database_upload_1 = require("./database-upload");
 const languages_1 = require("./languages");
 const testing_utils_1 = require("./testing-utils");
@@ -49,20 +48,10 @@ const testApiDetails = {
     apiURL: undefined,
 };
 function getTestConfig(tmpDir) {
-    return {
+    return (0, testing_utils_1.createTestConfig)({
         languages: [languages_1.Language.javascript],
-        originalUserInput: {},
-        tempDir: tmpDir,
-        codeQLCmd: "foo",
-        gitHubVersion: { type: util_1.GitHubVariant.DOTCOM },
         dbLocation: tmpDir,
-        debugMode: false,
-        debugArtifactName: util_1.DEFAULT_DEBUG_ARTIFACT_NAME,
-        debugDatabaseName: util_1.DEFAULT_DEBUG_DATABASE_NAME,
-        augmentationProperties: config_utils_1.defaultAugmentationProperties,
-        trapCaches: {},
-        trapCacheDownloadTime: 0,
-    };
+    });
 }
 async function mockHttpRequests(databaseUploadStatusCode) {
     // Passing an auth token is required, so we just use a dummy value

lib/debug-artifacts.js

@@ -56,7 +56,11 @@ async function uploadDebugArtifacts(toUpload, rootDir, artifactName) {
             core.info("Could not parse user-specified `matrix` input into JSON. The debug artifact will not be named with the user's `matrix` input.");
         }
     }
-    await artifact.create().uploadArtifact(sanitizeArifactName(`${artifactName}${suffix}`), toUpload.map((file) => path.normalize(file)), path.normalize(rootDir), { continueOnError: true });
+    await artifact.create().uploadArtifact(sanitizeArifactName(`${artifactName}${suffix}`), toUpload.map((file) => path.normalize(file)), path.normalize(rootDir), {
+        continueOnError: true,
+        // ensure we don't keep the debug artifacts around for too long since they can be large.
+        retentionDays: 7,
+    });
 }
 exports.uploadDebugArtifacts = uploadDebugArtifacts;
 async function uploadSarifDebugArtifact(config, outputDir) {

lib/debug-artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug-artifacts.js","sourceRoot":"","sources":["../src/debug-artifacts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"debug-artifacts.js","sourceRoot":"","sources":["../src/debug-artifacts.ts"],"names":[],"mappings":"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"}

lib/defaults.json

@@ -1,6 +1,6 @@
 {
-    "bundleVersion": "codeql-bundle-v2.15.5",
-    "cliVersion": "2.15.5",
-    "priorBundleVersion": "codeql-bundle-v2.15.4",
-    "priorCliVersion": "2.15.4"
+    "bundleVersion": "codeql-bundle-v2.16.1",
+    "cliVersion": "2.16.1",
+    "priorBundleVersion": "codeql-bundle-v2.16.0",
+    "priorCliVersion": "2.16.0"
 }

lib/environment.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnvVar = void 0;
+/**
+ * Environment variables used by the CodeQL Action.
+ *
+ * We recommend prefixing environment variables with `CODEQL_ACTION_`
+ * to reduce the risk that they are overwritten by other steps.
+ */
 var EnvVar;
 (function (EnvVar) {
     /** Whether the `analyze` Action completes successfully. */
@@ -30,6 +36,8 @@ var EnvVar;
     EnvVar["HAS_WARNED_ABOUT_DISK_SPACE"] = "CODEQL_ACTION_HAS_WARNED_ABOUT_DISK_SPACE";
     /** UUID representing the current job run. */
     EnvVar["JOB_RUN_UUID"] = "JOB_RUN_UUID";
+    /** Status for the entire job, submitted to the status report in `init-post` */
+    EnvVar["JOB_STATUS"] = "CODEQL_ACTION_JOB_STATUS";
     EnvVar["ODASA_TRACER_CONFIGURATION"] = "ODASA_TRACER_CONFIGURATION";
     /**
      * What percentage of the total amount of RAM over 8 GB that the Action should reserve for the

lib/environment.js.map

@@ -1 +1 @@
-{"version":3,"file":"environment.js","sourceRoot":"","sources":["../src/environment.ts"],"names":[],"mappings":";;;AAAA,IAAY,MAsEX;AAtED,WAAY,MAAM;IAChB,2DAA2D;IAC3D,+FAAqF,CAAA;IAErF,gEAAgE;IAChE,qEAA2D,CAAA;IAE3D;;;OAGG;IACH,yFAA+E,CAAA;IAE/E;;;OAGG;IACH,yEAA+D,CAAA;IAE/D,gFAAgF;IAChF,6DAAmD,CAAA;IAEnD;;;OAGG;IACH,uEAA6D,CAAA;IAE7D,gEAAgE;IAChE,mEAAyD,CAAA;IAEzD,kFAAkF;IAClF,mFAAyE,CAAA;IAEzE,6CAA6C;IAC7C,uCAA6B,CAAA;IAE7B,mEAAyD,CAAA;IAEzD;;;OAGG;IACH,2FAAiF,CAAA;IAEjF,mFAAmF;IACnF,6FAAmF,CAAA;IAEnF,qFAAqF;IACrF,+CAAqC,CAAA;IAErC,mEAAyD,CAAA;IAEzD,kEAAkE;IAClE,2CAAiC,CAAA;IAEjC;;;;;;OAMG;IACH,4DAAkD,CAAA;IAElD;;;OAGG;IACH,wDAA8C,CAAA;AAChD,CAAC,EAtEW,MAAM,sBAAN,MAAM,QAsEjB"}
+{"version":3,"file":"environment.js","sourceRoot":"","sources":["../src/environment.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,IAAY,MAyEX;AAzED,WAAY,MAAM;IAChB,2DAA2D;IAC3D,+FAAqF,CAAA;IAErF,gEAAgE;IAChE,qEAA2D,CAAA;IAE3D;;;OAGG;IACH,yFAA+E,CAAA;IAE/E;;;OAGG;IACH,yEAA+D,CAAA;IAE/D,gFAAgF;IAChF,6DAAmD,CAAA;IAEnD;;;OAGG;IACH,uEAA6D,CAAA;IAE7D,gEAAgE;IAChE,mEAAyD,CAAA;IAEzD,kFAAkF;IAClF,mFAAyE,CAAA;IAEzE,6CAA6C;IAC7C,uCAA6B,CAAA;IAE7B,+EAA+E;IAC/E,iDAAuC,CAAA;IAEvC,mEAAyD,CAAA;IAEzD;;;OAGG;IACH,2FAAiF,CAAA;IAEjF,mFAAmF;IACnF,6FAAmF,CAAA;IAEnF,qFAAqF;IACrF,+CAAqC,CAAA;IAErC,mEAAyD,CAAA;IAEzD,kEAAkE;IAClE,2CAAiC,CAAA;IAEjC;;;;;;OAMG;IACH,4DAAkD,CAAA;IAElD;;;OAGG;IACH,wDAA8C,CAAA;AAChD,CAAC,EAzEW,MAAM,sBAAN,MAAM,QAyEjB"}

lib/feature-flags.js

@@ -48,8 +48,8 @@ exports.CODEQL_VERSION_FINE_GRAINED_PARALLELISM = "2.15.1";
  */
 var Feature;
 (function (Feature) {
-    Feature["CodeqlJavaLombokEnabled"] = "codeql_java_lombok_enabled";
     Feature["CppDependencyInstallation"] = "cpp_dependency_installation_enabled";
+    Feature["CppTrapCachingEnabled"] = "cpp_trap_caching_enabled";
     Feature["DisableKotlinAnalysisEnabled"] = "disable_kotlin_analysis_enabled";
     Feature["DisablePythonDependencyInstallationEnabled"] = "disable_python_dependency_installation_enabled";
     Feature["PythonDefaultIsToSkipDependencyInstallationEnabled"] = "python_default_is_to_skip_dependency_installation_enabled";
@@ -58,16 +58,16 @@ var Feature;
     Feature["QaTelemetryEnabled"] = "qa_telemetry_enabled";
 })(Feature || (exports.Feature = Feature = {}));
 exports.featureConfig = {
-    [Feature.CodeqlJavaLombokEnabled]: {
-        envVar: "CODEQL_JAVA_LOMBOK",
-        minimumVersion: "2.14.0",
-        defaultValue: false,
-    },
     [Feature.CppDependencyInstallation]: {
         envVar: "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES",
         minimumVersion: "2.15.0",
         defaultValue: false,
     },
+    [Feature.CppTrapCachingEnabled]: {
+        envVar: "CODEQL_CPP_TRAP_CACHING",
+        minimumVersion: "2.16.1",
+        defaultValue: false,
+    },
     [Feature.DisableKotlinAnalysisEnabled]: {
         envVar: "CODEQL_DISABLE_KOTLIN_ANALYSIS",
         minimumVersion: undefined,
@@ -105,7 +105,7 @@ exports.featureConfig = {
         // here!
         envVar: "CODEQL_ACTION_DISABLE_PYTHON_DEPENDENCY_INSTALLATION",
         minimumVersion: "2.16.0",
-        defaultValue: false,
+        defaultValue: true,
     },
 };
 exports.FEATURE_FLAGS_FILE_NAME = "cached-feature-flags.json";

lib/init-action-post-helper.js

@@ -23,7 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = exports.tryUploadSarifIfRunFailed = void 0;
+exports.getFinalJobStatus = exports.run = exports.tryUploadSarifIfRunFailed = void 0;
+const core = __importStar(require("@actions/core"));
+const github = __importStar(require("@actions/github"));
 const actionsUtil = __importStar(require("./actions-util"));
 const api_client_1 = require("./api-client");
 const codeql_1 = require("./codeql");
@@ -31,6 +33,7 @@ const config_utils_1 = require("./config-utils");
 const environment_1 = require("./environment");
 const feature_flags_1 = require("./feature-flags");
 const repository_1 = require("./repository");
+const status_report_1 = require("./status-report");
 const uploadLib = __importStar(require("./upload-lib"));
 const util_1 = require("./util");
 const workflow_1 = require("./workflow");
@@ -80,6 +83,12 @@ async function maybeUploadFailedSarif(config, repositoryNwo, features, logger) {
 }
 async function tryUploadSarifIfRunFailed(config, repositoryNwo, features, logger) {
     if (process.env[environment_1.EnvVar.ANALYZE_DID_COMPLETE_SUCCESSFULLY] !== "true") {
+        // If analyze didn't complete successfully and the job status hasn't
+        // already been set to Failure/ConfigurationError previously, this
+        // means that something along the way failed in a step that is not
+        // owned by the Action, for example a manual build step. We
+        // consider this a configuration error.
+        core.exportVariable(environment_1.EnvVar.JOB_STATUS, process.env[environment_1.EnvVar.JOB_STATUS] ?? status_report_1.JobStatus.ConfigurationError);
         try {
             return await maybeUploadFailedSarif(config, repositoryNwo, features, logger);
         }
@@ -89,6 +98,7 @@ async function tryUploadSarifIfRunFailed(config, repositoryNwo, features, logger
         }
     }
     else {
+        core.exportVariable(environment_1.EnvVar.JOB_STATUS, process.env[environment_1.EnvVar.JOB_STATUS] ?? status_report_1.JobStatus.Success);
         return {
             upload_failed_run_skipped_because: "Analyze Action completed successfully",
         };
@@ -115,7 +125,13 @@ async function run(uploadDatabaseBundleDebugArtifact, uploadLogsDebugArtifact, p
             `but the result was instead ${error}.`);
     }
     if (process.env["CODEQL_ACTION_EXPECT_UPLOAD_FAILED_SARIF"] === "true") {
-        await removeUploadedSarif(uploadFailedSarifResult, logger);
+        if (!github.context.payload.pull_request?.head.repo.fork) {
+            await removeUploadedSarif(uploadFailedSarifResult, logger);
+        }
+        else {
+            logger.info("Skipping deletion of failed SARIF because the workflow was triggered from a fork of " +
+                "codeql-action and doesn't have the appropriate permissions for deletion.");
+        }
     }
     // Upload appropriate Actions artifacts for debugging
     if (config.debugMode) {
@@ -178,4 +194,19 @@ async function removeUploadedSarif(uploadFailedSarifResult, logger) {
         logger.warning("Could not delete the uploaded SARIF analysis because a SARIF ID wasn't provided by the API when uploading the SARIF file.");
     }
 }
+/**
+ * Returns the final job status sent in the `init-post` Action, based on the
+ * current value of the JOB_STATUS environment variable. If the variable is
+ * unset, or if its value is not one of the JobStatus enum values, returns
+ * Unknown. Otherwise it returns the status set in the environment variable.
+ */
+function getFinalJobStatus() {
+    const jobStatusFromEnvironment = process.env[environment_1.EnvVar.JOB_STATUS];
+    if (!jobStatusFromEnvironment ||
+        !Object.values(status_report_1.JobStatus).includes(jobStatusFromEnvironment)) {
+        return status_report_1.JobStatus.Unknown;
+    }
+    return jobStatusFromEnvironment;
+}
+exports.getFinalJobStatus = getFinalJobStatus;
 //# sourceMappingURL=init-action-post-helper.js.map

lib/init-action-post.js

@@ -59,6 +59,7 @@ async function runWrapper() {
     const statusReport = {
         ...statusReportBase,
         ...uploadFailedSarifResult,
+        job_status: initActionPostHelper.getFinalJobStatus(),
     };
     await (0, status_report_1.sendStatusReport)(statusReport);
 }

lib/init-action-post.js.map

@@ -1 +1 @@
-{"version":3,"file":"init-action-post.js","sourceRoot":"","sources":["../src/init-action-post.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,oDAAsC;AAEtC,iDAAuE;AACvE,6CAAgD;AAChD,kEAAoD;AACpD,mDAA2C;AAC3C,gFAAkE;AAClE,uCAA6C;AAC7C,6CAAkD;AAClD,mDAKyB;AACzB,iCAKgB;AAMhB,KAAK,UAAU,UAAU;IACvB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC7B,IAAI,uBAES,CAAC;IACd,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,0BAAgB,GAAE,CAAC;QAClC,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAgB,GAAE,CAAC;QAC/C,IAAA,gCAAyB,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QAEjD,MAAM,aAAa,GAAG,IAAA,+BAAkB,EACtC,IAAA,0BAAmB,EAAC,mBAAmB,CAAC,CACzC,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,wBAAQ,CAC3B,aAAa,EACb,aAAa,EACb,IAAA,oCAAqB,GAAE,EACvB,MAAM,CACP,CAAC;QAEF,uBAAuB,GAAG,MAAM,oBAAoB,CAAC,GAAG,CACtD,cAAc,CAAC,iCAAiC,EAChD,cAAc,CAAC,uBAAuB,EACtC,6BAAc,EACd,aAAa,EACb,QAAQ,EACR,MAAM,CACP,CAAC;IACJ,CAAC;IAAC,OAAO,cAAc,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,IAAA,gBAAS,EAAC,cAAc,CAAC,CAAC;QACxC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAE9B,MAAM,IAAA,gCAAgB,EACpB,MAAM,IAAA,sCAAsB,EAC1B,WAAW,EACX,IAAA,gCAAgB,EAAC,KAAK,CAAC,EACvB,SAAS,EACT,MAAM,IAAA,qBAAc,GAAE,EACtB,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,KAAK,CACZ,CACF,CAAC;QACF,OAAO;IACT,CAAC;IACD,MAAM,gBAAgB,GAAG,MAAM,IAAA,sCAAsB,EACnD,WAAW,EACX,SAAS,EACT,SAAS,EACT,MAAM,IAAA,qBAAc,GAAE,CACvB,CAAC;IACF,MAAM,YAAY,GAAyB;QACzC,GAAG,gBAAgB;QACnB,GAAG,uBAAuB;KAC3B,CAAC;IACF,MAAM,IAAA,gCAAgB,EAAC,YAAY,CAAC,CAAC;AACvC,CAAC;AAED,KAAK,UAAU,EAAE,CAAC"}
+{"version":3,"file":"init-action-post.js","sourceRoot":"","sources":["../src/init-action-post.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,oDAAsC;AAEtC,iDAAuE;AACvE,6CAAgD;AAChD,kEAAoD;AACpD,mDAA2C;AAC3C,gFAAkE;AAClE,uCAA6C;AAC7C,6CAAkD;AAClD,mDAKyB;AACzB,iCAKgB;AAOhB,KAAK,UAAU,UAAU;IACvB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC7B,IAAI,uBAES,CAAC;IACd,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,0BAAgB,GAAE,CAAC;QAClC,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAgB,GAAE,CAAC;QAC/C,IAAA,gCAAyB,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QAEjD,MAAM,aAAa,GAAG,IAAA,+BAAkB,EACtC,IAAA,0BAAmB,EAAC,mBAAmB,CAAC,CACzC,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,wBAAQ,CAC3B,aAAa,EACb,aAAa,EACb,IAAA,oCAAqB,GAAE,EACvB,MAAM,CACP,CAAC;QAEF,uBAAuB,GAAG,MAAM,oBAAoB,CAAC,GAAG,CACtD,cAAc,CAAC,iCAAiC,EAChD,cAAc,CAAC,uBAAuB,EACtC,6BAAc,EACd,aAAa,EACb,QAAQ,EACR,MAAM,CACP,CAAC;IACJ,CAAC;IAAC,OAAO,cAAc,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,IAAA,gBAAS,EAAC,cAAc,CAAC,CAAC;QACxC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAE9B,MAAM,IAAA,gCAAgB,EACpB,MAAM,IAAA,sCAAsB,EAC1B,WAAW,EACX,IAAA,gCAAgB,EAAC,KAAK,CAAC,EACvB,SAAS,EACT,MAAM,IAAA,qBAAc,GAAE,EACtB,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,KAAK,CACZ,CACF,CAAC;QACF,OAAO;IACT,CAAC;IACD,MAAM,gBAAgB,GAAG,MAAM,IAAA,sCAAsB,EACnD,WAAW,EACX,SAAS,EACT,SAAS,EACT,MAAM,IAAA,qBAAc,GAAE,CACvB,CAAC;IACF,MAAM,YAAY,GAAyB;QACzC,GAAG,gBAAgB;QACnB,GAAG,uBAAuB;QAC1B,UAAU,EAAE,oBAAoB,CAAC,iBAAiB,EAAE;KACrD,CAAC;IACF,MAAM,IAAA,gCAAgB,EAAC,YAAY,CAAC,CAAC;AACvC,CAAC;AAED,KAAK,UAAU,EAAE,CAAC"}

lib/init-action.js

@@ -117,6 +117,7 @@ async function run() {
     };
     const gitHubVersion = await (0, api_client_1.getGitHubVersion)();
     (0, util_1.checkGitHubVersionInRange)(gitHubVersion, logger);
+    (0, util_1.checkActionVersion)((0, actions_util_1.getActionVersion)(), gitHubVersion);
     const repositoryNwo = (0, repository_1.parseRepositoryNwo)((0, util_1.getRequiredEnvParam)("GITHUB_REPOSITORY"));
     const features = new feature_flags_1.Features(gitHubVersion, repositoryNwo, (0, actions_util_1.getTemporaryDirectory)(), logger);
     core.exportVariable(environment_1.EnvVar.JOB_RUN_UUID, (0, uuid_1.v4)());
@@ -136,12 +137,30 @@ async function run() {
             logger.info("Detected no issues with the code scanning workflow.");
         }
         core.endGroup();
-        config = await (0, init_1.initConfig)((0, actions_util_1.getOptionalInput)("languages"), (0, actions_util_1.getOptionalInput)("queries"), (0, actions_util_1.getOptionalInput)("packs"), (0, actions_util_1.getOptionalInput)("config-file"), (0, actions_util_1.getOptionalInput)("db-location"), (0, actions_util_1.getOptionalInput)("config"), getTrapCachingEnabled(), 
-        // Debug mode is enabled if:
-        // - The `init` Action is passed `debug: true`.
-        // - Actions step debugging is enabled (e.g. by [enabling debug logging for a rerun](https://docs.github.com/en/actions/managing-workflow-runs/re-running-workflows-and-jobs#re-running-all-the-jobs-in-a-workflow),
-        //   or by setting the `ACTIONS_STEP_DEBUG` secret to `true`).
-        (0, actions_util_1.getOptionalInput)("debug") === "true" || core.isDebug(), (0, actions_util_1.getOptionalInput)("debug-artifact-name") || util_1.DEFAULT_DEBUG_ARTIFACT_NAME, (0, actions_util_1.getOptionalInput)("debug-database-name") || util_1.DEFAULT_DEBUG_DATABASE_NAME, repositoryNwo, (0, actions_util_1.getTemporaryDirectory)(), codeql, (0, util_1.getRequiredEnvParam)("GITHUB_WORKSPACE"), gitHubVersion, apiDetails, logger);
+        config = await (0, init_1.initConfig)({
+            languagesInput: (0, actions_util_1.getOptionalInput)("languages"),
+            queriesInput: (0, actions_util_1.getOptionalInput)("queries"),
+            packsInput: (0, actions_util_1.getOptionalInput)("packs"),
+            buildModeInput: (0, actions_util_1.getOptionalInput)("build-mode"),
+            configFile: (0, actions_util_1.getOptionalInput)("config-file"),
+            dbLocation: (0, actions_util_1.getOptionalInput)("db-location"),
+            configInput: (0, actions_util_1.getOptionalInput)("config"),
+            trapCachingEnabled: getTrapCachingEnabled(),
+            // Debug mode is enabled if:
+            // - The `init` Action is passed `debug: true`.
+            // - Actions step debugging is enabled (e.g. by [enabling debug logging for a rerun](https://docs.github.com/en/actions/managing-workflow-runs/re-running-workflows-and-jobs#re-running-all-the-jobs-in-a-workflow),
+            //   or by setting the `ACTIONS_STEP_DEBUG` secret to `true`).
+            debugMode: (0, actions_util_1.getOptionalInput)("debug") === "true" || core.isDebug(),
+            debugArtifactName: (0, actions_util_1.getOptionalInput)("debug-artifact-name") || util_1.DEFAULT_DEBUG_ARTIFACT_NAME,
+            debugDatabaseName: (0, actions_util_1.getOptionalInput)("debug-database-name") || util_1.DEFAULT_DEBUG_DATABASE_NAME,
+            repository: repositoryNwo,
+            tempDir: (0, actions_util_1.getTemporaryDirectory)(),
+            codeql,
+            workspacePath: (0, util_1.getRequiredEnvParam)("GITHUB_WORKSPACE"),
+            githubVersion: gitHubVersion,
+            apiDetails,
+            logger,
+        });
         await (0, init_1.checkInstallPython311)(config.languages, codeql);
         if (config.languages.includes(languages_1.Language.python) &&
             (0, actions_util_1.getRequiredInput)("setup-python-dependencies") === "true") {
@@ -166,8 +185,6 @@ async function run() {
         return;
     }
     try {
-        // Query CLI for supported features
-        const versionInfo = await codeql.getVersion();
         // Forward Go flags
         const goFlags = process.env["GOFLAGS"];
         if (goFlags) {
@@ -184,7 +201,7 @@ async function run() {
                 // replacing the `go` binary with a shell script that invokes the actual `go` binary. Since the shell is
                 // typically dynamically linked, this provides a suitable entry point for the CodeQL tracer.
                 if (fileOutput.includes("statically linked") &&
-                    !(0, tools_features_1.isSupportedToolsFeature)(versionInfo, tools_features_1.ToolsFeature.IndirectTracingSupportsStaticBinaries)) {
+                    !(await codeql.supportsFeature(tools_features_1.ToolsFeature.IndirectTracingSupportsStaticBinaries))) {
                     try {
                         logger.debug(`Applying static binary workaround for Go`);
                         // Create a directory that we can add to the system PATH.
@@ -230,17 +247,31 @@ async function run() {
             !(await (0, util_1.codeQlVersionAbove)(codeql, "2.14.4"))) {
             core.exportVariable(kotlinLimitVar, "1.9.20");
         }
-        if (config.languages.includes(languages_1.Language.java)) {
+        if (config.languages.includes(languages_1.Language.java) &&
+            // Java Lombok support is enabled by default for >= 2.14.4
+            (await (0, util_1.codeQlVersionAbove)(codeql, "2.14.0")) &&
+            !(await (0, util_1.codeQlVersionAbove)(codeql, "2.14.4"))) {
             const envVar = "CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS";
             if (process.env[envVar]) {
                 logger.info(`Environment variable ${envVar} already set. Not en/disabling CodeQL Java Lombok support`);
             }
-            else if (await features.getValue(feature_flags_1.Feature.CodeqlJavaLombokEnabled, codeql)) {
+            else {
                 logger.info("Enabling CodeQL Java Lombok support");
                 core.exportVariable(envVar, "true");
             }
+        }
+        if (config.languages.includes(languages_1.Language.cpp)) {
+            const envVar = "CODEQL_EXTRACTOR_CPP_TRAP_CACHING";
+            if (process.env[envVar]) {
+                logger.info(`Environment variable ${envVar} already set. Not en/disabling CodeQL C++ TRAP caching support`);
+            }
+            else if (getTrapCachingEnabled() &&
+                (await features.getValue(feature_flags_1.Feature.CppTrapCachingEnabled, codeql))) {
+                logger.info("Enabling CodeQL C++ TRAP caching support");
+                core.exportVariable(envVar, "true");
+            }
             else {
-                logger.info("Disabling CodeQL Java Lombok support");
+                logger.info("Disabling CodeQL C++ TRAP caching support");
                 core.exportVariable(envVar, "false");
             }
         }

lib/init.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installPythonDeps = exports.checkInstallPython311 = exports.runInit = exports.initConfig = exports.initCodeQL = void 0;
+exports.installPythonDeps = exports.checkInstallPython311 = exports.printPathFiltersWarning = exports.runInit = exports.initConfig = exports.initCodeQL = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const toolrunner = __importStar(require("@actions/exec/lib/toolrunner"));
@@ -41,9 +41,10 @@ async function initCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliVe
     return { codeql, toolsDownloadDurationMs, toolsSource, toolsVersion };
 }
 exports.initCodeQL = initCodeQL;
-async function initConfig(languagesInput, queriesInput, packsInput, configFile, dbLocation, configInput, trapCachingEnabled, debugMode, debugArtifactName, debugDatabaseName, repository, tempDir, codeQL, workspacePath, gitHubVersion, apiDetails, logger) {
+async function initConfig(inputs) {
+    const logger = inputs.logger;
     logger.startGroup("Load language configuration");
-    const config = await configUtils.initConfig(languagesInput, queriesInput, packsInput, configFile, dbLocation, configInput, trapCachingEnabled, debugMode, debugArtifactName, debugDatabaseName, repository, tempDir, codeQL, workspacePath, gitHubVersion, apiDetails, logger);
+    const config = await configUtils.initConfig(inputs);
     printPathFiltersWarning(config, logger);
     logger.endGroup();
     return config;
@@ -63,18 +64,19 @@ async function runInit(codeql, config, sourceRoot, processName, registriesInput,
     catch (e) {
         throw processError(e);
     }
-    return await (0, tracer_config_1.getCombinedTracerConfig)(config);
+    return await (0, tracer_config_1.getCombinedTracerConfig)(codeql, config);
 }
 exports.runInit = runInit;
 function printPathFiltersWarning(config, logger) {
     // Index include/exclude/filters only work in javascript/python/ruby.
     // If any other languages are detected/configured then show a warning.
-    if ((config.originalUserInput.paths?.length !== 0 ||
-        config.originalUserInput["paths-ignore"]?.length !== 0) &&
+    if ((config.originalUserInput.paths?.length ||
+        config.originalUserInput["paths-ignore"]?.length) &&
         !config.languages.every(languages_1.isScannedLanguage)) {
         logger.warning('The "paths"/"paths-ignore" fields of the config only have effect for JavaScript, Python, and Ruby');
     }
 }
+exports.printPathFiltersWarning = printPathFiltersWarning;
 /**
  * Possibly convert this error into a UserError in order to avoid
  * counting this error towards our internal error budget.

lib/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"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"}

lib/init.test.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ava_1 = __importDefault(require("ava"));
+const init_1 = require("./init");
+const languages_1 = require("./languages");
+const testing_utils_1 = require("./testing-utils");
+(0, testing_utils_1.setupTests)(ava_1.default);
+(0, ava_1.default)("printPathFiltersWarning does not trigger when 'paths' and 'paths-ignore' are undefined", async (t) => {
+    const messages = [];
+    (0, init_1.printPathFiltersWarning)({
+        languages: [languages_1.Language.cpp],
+        originalUserInput: {},
+    }, (0, testing_utils_1.getRecordingLogger)(messages));
+    t.is(messages.length, 0);
+});
+(0, ava_1.default)("printPathFiltersWarning does not trigger when 'paths' and 'paths-ignore' are empty", async (t) => {
+    const messages = [];
+    (0, init_1.printPathFiltersWarning)({
+        languages: [languages_1.Language.cpp],
+        originalUserInput: { paths: [], "paths-ignore": [] },
+    }, (0, testing_utils_1.getRecordingLogger)(messages));
+    t.is(messages.length, 0);
+});
+//# sourceMappingURL=init.test.js.map

lib/init.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"init.test.js","sourceRoot":"","sources":["../src/init.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAGvB,iCAAiD;AACjD,2CAAuC;AACvC,mDAAgF;AAEhF,IAAA,0BAAU,EAAC,aAAI,CAAC,CAAC;AAEjB,IAAA,aAAI,EAAC,wFAAwF,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACzG,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,IAAA,8BAAuB,EACrB;QACE,SAAS,EAAE,CAAC,oBAAQ,CAAC,GAAG,CAAC;QACzB,iBAAiB,EAAE,EAAE;KACO,EAC9B,IAAA,kCAAkB,EAAC,QAAQ,CAAC,CAC7B,CAAC;IACF,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,oFAAoF,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACrG,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,IAAA,8BAAuB,EACrB;QACE,SAAS,EAAE,CAAC,oBAAQ,CAAC,GAAG,CAAC;QACzB,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE;KACxB,EAC9B,IAAA,kCAAkB,EAAC,QAAQ,CAAC,CAC7B,CAAC;IACF,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC"}

lib/resolve-environment-action.js

@@ -43,6 +43,7 @@ async function run() {
         }
         const gitHubVersion = await (0, api_client_1.getGitHubVersion)();
         (0, util_1.checkGitHubVersionInRange)(gitHubVersion, logger);
+        (0, util_1.checkActionVersion)((0, actions_util_1.getActionVersion)(), gitHubVersion);
         const config = await configUtils.getConfig((0, actions_util_1.getTemporaryDirectory)(), logger);
         if (config === undefined) {
             throw new Error("Config file could not be found at expected location. Has the 'init' action been called?");

lib/resolve-environment-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-environment-action.js","sourceRoot":"","sources":["../src/resolve-environment-action.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAsC;AAEtC,iDAIwB;AACxB,6CAAgD;AAChD,qCAAkD;AAClD,4DAA8C;AAC9C,uCAA6C;AAC7C,+DAAmE;AACnE,mDAIyB;AACzB,iCAKgB;AAEhB,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAC1C,MAAM,uBAAuB,GAAG,aAAa,CAAC;AAE9C,KAAK,UAAU,GAAG;IAChB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,IAAA,0BAAgB,GAAE,CAAC;IAElC,IAAI,CAAC;QACH,IACE,CAAC,CAAC,MAAM,IAAA,gCAAgB,EACtB,MAAM,IAAA,sCAAsB,EAC1B,WAAW,EACX,UAAU,EACV,SAAS,EACT,MAAM,IAAA,qBAAc,EAAC,MAAM,CAAC,CAC7B,CACF,CAAC,EACF,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAgB,GAAE,CAAC;QAC/C,IAAA,gCAAyB,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QAEjD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,IAAA,oCAAqB,GAAE,EAAE,MAAM,CAAC,CAAC;QAC5E,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CACb,yFAAyF,CAC1F,CAAC;QACJ,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAA,+BAAgB,EAAC,mBAAmB,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,MAAM,IAAA,gDAA0B,EAC7C,MAAM,CAAC,SAAS,EAChB,MAAM,EACN,gBAAgB,EAChB,IAAA,+BAAgB,EAAC,UAAU,CAAC,CAC7B,CAAC;QACF,IAAI,CAAC,SAAS,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,cAAc,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,IAAA,gBAAS,EAAC,cAAc,CAAC,CAAC;QAExC,IAAI,KAAK,YAAY,+BAAsB,EAAE,CAAC;YAC5C,6DAA6D;YAC7D,qEAAqE;YACrE,IAAI,CAAC,SAAS,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;YAC5C,MAAM,CAAC,OAAO,CACZ,wFAAwF,KAAK,CAAC,OAAO,EAAE,CACxG,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,kFAAkF;YAClF,IAAI,CAAC,SAAS,CACZ,wFAAwF,KAAK,CAAC,OAAO,EAAE,CACxG,CAAC;YAEF,MAAM,IAAA,gCAAgB,EACpB,MAAM,IAAA,sCAAsB,EAC1B,WAAW,EACX,IAAA,gCAAgB,EAAC,KAAK,CAAC,EACvB,SAAS,EACT,MAAM,IAAA,qBAAc,GAAE,EACtB,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,KAAK,CACZ,CACF,CAAC;QACJ,CAAC;QAED,OAAO;IACT,CAAC;IAED,MAAM,IAAA,gCAAgB,EACpB,MAAM,IAAA,sCAAsB,EAC1B,WAAW,EACX,SAAS,EACT,SAAS,EACT,MAAM,IAAA,qBAAc,GAAE,CACvB,CACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,UAAU;IACvB,IAAI,CAAC;QACH,MAAM,GAAG,EAAE,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,SAAS,CAAC,GAAG,WAAW,mBAAmB,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,IAAA,sBAAe,GAAE,CAAC;AAC1B,CAAC;AAED,KAAK,UAAU,EAAE,CAAC"}
+{"version":3,"file":"resolve-environment-action.js","sourceRoot":"","sources":["../src/resolve-environment-action.ts"],"names":[],"mappings":"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"}

lib/status-report.js

@@ -23,13 +23,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendStatusReport = exports.createStatusReportBase = exports.getActionsStatus = void 0;
+exports.sendStatusReport = exports.createStatusReportBase = exports.getActionsStatus = exports.JobStatus = void 0;
 const os = __importStar(require("os"));
 const core = __importStar(require("@actions/core"));
 const actions_util_1 = require("./actions-util");
 const api_client_1 = require("./api-client");
 const environment_1 = require("./environment");
 const util_1 = require("./util");
+/** Overall status of the entire job. String values match the Hydro schema. */
+var JobStatus;
+(function (JobStatus) {
+    JobStatus["Unknown"] = "JOB_STATUS_UNKNOWN";
+    JobStatus["Success"] = "JOB_STATUS_SUCCESS";
+    JobStatus["Failure"] = "JOB_STATUS_FAILURE";
+    JobStatus["ConfigurationError"] = "JOB_STATUS_CONFIGURATION_ERROR";
+})(JobStatus || (exports.JobStatus = JobStatus = {}));
 function getActionsStatus(error, otherFailureCause) {
     if (error || otherFailureCause) {
         return error instanceof util_1.UserError ? "user-error" : "failure";
@@ -39,6 +47,19 @@ function getActionsStatus(error, otherFailureCause) {
     }
 }
 exports.getActionsStatus = getActionsStatus;
+/**
+ * Sets the overall job status environment variable to configuration error
+ * or failure, unless it's already been set to one of these values in a
+ * previous step.
+ */
+function setJobStatusIfUnsuccessful(actionStatus) {
+    if (actionStatus === "user-error") {
+        core.exportVariable(environment_1.EnvVar.JOB_STATUS, process.env[environment_1.EnvVar.JOB_STATUS] ?? JobStatus.ConfigurationError);
+    }
+    else if (actionStatus === "failure" || actionStatus === "aborted") {
+        core.exportVariable(environment_1.EnvVar.JOB_STATUS, process.env[environment_1.EnvVar.JOB_STATUS] ?? JobStatus.Failure);
+    }
+}
 /**
  * Compose a StatusReport.
  *
@@ -82,9 +103,7 @@ async function createStatusReportBase(actionName, status, actionStartedAt, diskI
         job_name: jobName,
         job_run_uuid: jobRunUUID,
         ref,
-        runner_available_disk_space_bytes: diskInfo.numAvailableBytes,
         runner_os: runnerOs,
-        runner_total_disk_space_bytes: diskInfo.numTotalBytes,
         started_at: workflowStartedAt,
         status,
         testing_environment: testingEnvironment,
@@ -92,6 +111,10 @@ async function createStatusReportBase(actionName, status, actionStartedAt, diskI
         workflow_run_attempt: workflowRunAttempt,
         workflow_run_id: workflowRunID,
     };
+    if (diskInfo) {
+        statusReport.runner_available_disk_space_bytes = diskInfo.numAvailableBytes;
+        statusReport.runner_total_disk_space_bytes = diskInfo.numTotalBytes;
+    }
     // Add optional parameters
     if (cause) {
         statusReport.cause = cause;
@@ -141,6 +164,7 @@ const INCOMPATIBLE_MSG = "CodeQL Action version is incompatible with the code sc
  * Returns whether sending the status report was successful of not.
  */
 async function sendStatusReport(statusReport) {
+    setJobStatusIfUnsuccessful(statusReport.status);
     const statusReportJSON = JSON.stringify(statusReport);
     core.debug(`Sending status report: ${statusReportJSON}`);
     // If in test mode we don't want to upload the results

lib/testing-utils.js

@@ -26,14 +26,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mockBundleDownloadApi = exports.createFeatures = exports.mockCodeQLVersion = exports.makeVersionInfo = exports.mockLanguagesInRepo = exports.mockFeatureFlagApiEndpoint = exports.getRecordingLogger = exports.setupActionsVars = exports.setupTests = exports.SAMPLE_DEFAULT_CLI_VERSION = exports.SAMPLE_DOTCOM_API_DETAILS = void 0;
+exports.createTestConfig = exports.mockBundleDownloadApi = exports.createFeatures = exports.mockCodeQLVersion = exports.makeVersionInfo = exports.mockLanguagesInRepo = exports.mockFeatureFlagApiEndpoint = exports.getRecordingLogger = exports.setupActionsVars = exports.setupTests = exports.SAMPLE_DEFAULT_CLI_VERSION = exports.SAMPLE_DOTCOM_API_DETAILS = void 0;
 const node_util_1 = require("node:util");
 const path_1 = __importDefault(require("path"));
 const github = __importStar(require("@actions/github"));
 const nock_1 = __importDefault(require("nock"));
 const sinon = __importStar(require("sinon"));
 const apiClient = __importStar(require("./api-client"));
-const CodeQL = __importStar(require("./codeql"));
+const codeql = __importStar(require("./codeql"));
 const util_1 = require("./util");
 exports.SAMPLE_DOTCOM_API_DETAILS = {
     auth: "token",
@@ -74,7 +74,7 @@ function setupTests(test) {
     typedTest.beforeEach((t) => {
         // Set an empty CodeQL object so that all method calls will fail
         // unless the test explicitly sets one up.
-        CodeQL.setCodeQL({});
+        codeql.setCodeQL({});
         // Replace stdout and stderr so we can record output during tests
         t.context.testOutput = "";
         const processStdoutWrite = process.stdout.write.bind(process.stdout);
@@ -190,16 +190,17 @@ exports.mockLanguagesInRepo = mockLanguagesInRepo;
 /**
  * Constructs a `VersionInfo` object for testing purposes only.
  */
-const makeVersionInfo = (version) => ({
+const makeVersionInfo = (version, features) => ({
     version,
+    features,
 });
 exports.makeVersionInfo = makeVersionInfo;
-function mockCodeQLVersion(version) {
-    return {
+function mockCodeQLVersion(version, features) {
+    return codeql.setCodeQL({
         async getVersion() {
-            return (0, exports.makeVersionInfo)(version);
+            return (0, exports.makeVersionInfo)(version, features);
         },
-    };
+    });
 }
 exports.mockCodeQLVersion = mockCodeQLVersion;
 /**
@@ -240,4 +241,27 @@ function mockBundleDownloadApi({ apiDetails = exports.SAMPLE_DOTCOM_API_DETAILS,
     return `${baseUrl}${relativeUrl}`;
 }
 exports.mockBundleDownloadApi = mockBundleDownloadApi;
+function createTestConfig(overrides) {
+    return Object.assign({}, {
+        languages: [],
+        buildMode: undefined,
+        originalUserInput: {},
+        tempDir: "",
+        codeQLCmd: "",
+        gitHubVersion: {
+            type: util_1.GitHubVariant.DOTCOM,
+        },
+        dbLocation: "",
+        debugMode: false,
+        debugArtifactName: util_1.DEFAULT_DEBUG_ARTIFACT_NAME,
+        debugDatabaseName: util_1.DEFAULT_DEBUG_DATABASE_NAME,
+        augmentationProperties: {
+            packsInputCombines: false,
+            queriesInputCombines: false,
+        },
+        trapCaches: {},
+        trapCacheDownloadTime: 0,
+    }, overrides);
+}
+exports.createTestConfig = createTestConfig;
 //# sourceMappingURL=testing-utils.js.map

lib/tools-features.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isSupportedToolsFeature = exports.ToolsFeature = void 0;
 var ToolsFeature;
 (function (ToolsFeature) {
+    ToolsFeature["BuildModeOption"] = "buildModeOption";
     ToolsFeature["IndirectTracingSupportsStaticBinaries"] = "indirectTracingSupportsStaticBinaries";
+    ToolsFeature["SetsCodeqlRunnerEnvVar"] = "setsCodeqlRunnerEnvVar";
 })(ToolsFeature || (exports.ToolsFeature = ToolsFeature = {}));
 /**
  * Determines if the given feature is supported by the CLI.

lib/tools-features.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools-features.js","sourceRoot":"","sources":["../src/tools-features.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAEX;AAFD,WAAY,YAAY;IACtB,+FAA+E,CAAA;AACjF,CAAC,EAFW,YAAY,4BAAZ,YAAY,QAEvB;AAED;;;;;;GAMG;AACH,SAAgB,uBAAuB,CACrC,WAAwB,EACxB,OAAqB;IAErB,OAAO,CAAC,CAAC,WAAW,CAAC,QAAQ,IAAI,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACjE,CAAC;AALD,0DAKC"}
+{"version":3,"file":"tools-features.js","sourceRoot":"","sources":["../src/tools-features.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,mDAAmC,CAAA;IACnC,+FAA+E,CAAA;IAC/E,iEAAiD,CAAA;AACnD,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB;AAED;;;;;;GAMG;AACH,SAAgB,uBAAuB,CACrC,WAAwB,EACxB,OAAqB;IAErB,OAAO,CAAC,CAAC,WAAW,CAAC,QAAQ,IAAI,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACjE,CAAC;AALD,0DAKC"}

lib/tools-features.test.js

@@ -12,4 +12,10 @@ const tools_features_1 = require("./tools-features");
     versionInfo.features = { indirectTracingSupportsStaticBinaries: true };
     t.true((0, tools_features_1.isSupportedToolsFeature)(versionInfo, tools_features_1.ToolsFeature.IndirectTracingSupportsStaticBinaries));
 });
+(0, ava_1.default)("setsCodeqlRunnerEnvVar", async (t) => {
+    const versionInfo = (0, testing_utils_1.makeVersionInfo)("1.0.0");
+    t.false((0, tools_features_1.isSupportedToolsFeature)(versionInfo, tools_features_1.ToolsFeature.SetsCodeqlRunnerEnvVar));
+    versionInfo.features = { setsCodeqlRunnerEnvVar: true };
+    t.true((0, tools_features_1.isSupportedToolsFeature)(versionInfo, tools_features_1.ToolsFeature.SetsCodeqlRunnerEnvVar));
+});
 //# sourceMappingURL=tools-features.test.js.map

lib/tools-features.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools-features.test.js","sourceRoot":"","sources":["../src/tools-features.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,mDAAkD;AAClD,qDAAyE;AAEzE,IAAA,aAAI,EAAC,yBAAyB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC1C,MAAM,WAAW,GAAG,IAAA,+BAAe,EAAC,OAAO,CAAC,CAAC;IAE7C,CAAC,CAAC,KAAK,CACL,IAAA,wCAAuB,EACrB,WAAW,EACX,6BAAY,CAAC,qCAAqC,CACnD,CACF,CAAC;IAEF,WAAW,CAAC,QAAQ,GAAG,EAAE,qCAAqC,EAAE,IAAI,EAAE,CAAC;IAEvE,CAAC,CAAC,IAAI,CACJ,IAAA,wCAAuB,EACrB,WAAW,EACX,6BAAY,CAAC,qCAAqC,CACnD,CACF,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"tools-features.test.js","sourceRoot":"","sources":["../src/tools-features.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,mDAAkD;AAClD,qDAAyE;AAEzE,IAAA,aAAI,EAAC,yBAAyB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC1C,MAAM,WAAW,GAAG,IAAA,+BAAe,EAAC,OAAO,CAAC,CAAC;IAE7C,CAAC,CAAC,KAAK,CACL,IAAA,wCAAuB,EACrB,WAAW,EACX,6BAAY,CAAC,qCAAqC,CACnD,CACF,CAAC;IAEF,WAAW,CAAC,QAAQ,GAAG,EAAE,qCAAqC,EAAE,IAAI,EAAE,CAAC;IAEvE,CAAC,CAAC,IAAI,CACJ,IAAA,wCAAuB,EACrB,WAAW,EACX,6BAAY,CAAC,qCAAqC,CACnD,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,wBAAwB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACzC,MAAM,WAAW,GAAG,IAAA,+BAAe,EAAC,OAAO,CAAC,CAAC;IAE7C,CAAC,CAAC,KAAK,CACL,IAAA,wCAAuB,EAAC,WAAW,EAAE,6BAAY,CAAC,sBAAsB,CAAC,CAC1E,CAAC;IAEF,WAAW,CAAC,QAAQ,GAAG,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC;IAExD,CAAC,CAAC,IAAI,CACJ,IAAA,wCAAuB,EAAC,WAAW,EAAE,6BAAY,CAAC,sBAAsB,CAAC,CAC1E,CAAC;AACJ,CAAC,CAAC,CAAC"}

lib/tracer-config.js

@@ -27,6 +27,7 @@ exports.getCombinedTracerConfig = exports.getTracerConfigForCluster = exports.en
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const languages_1 = require("./languages");
+const tools_features_1 = require("./tools-features");
 async function endTracingForCluster(config) {
     // If there are no traced languages, we don't need to do anything.
     if (!config.languages.some((l) => (0, languages_1.isTracedLanguage)(l)))
@@ -58,19 +59,24 @@ async function getTracerConfigForCluster(config) {
     };
 }
 exports.getTracerConfigForCluster = getTracerConfigForCluster;
-async function getCombinedTracerConfig(config) {
+async function getCombinedTracerConfig(codeql, config) {
     // Abort if there are no traced languages as there's nothing to do
     const tracedLanguages = config.languages.filter((l) => (0, languages_1.isTracedLanguage)(l));
     if (tracedLanguages.length === 0) {
         return undefined;
     }
     const mainTracerConfig = await getTracerConfigForCluster(config);
-    // On macos it's necessary to prefix the build command with the runner executable
-    // on order to trace when System Integrity Protection is enabled.
-    // The executable also exists and works for other platforms so we output this env
-    // var with a path to the runner regardless so it's always available.
-    const runnerExeName = process.platform === "win32" ? "runner.exe" : "runner";
-    mainTracerConfig.env["CODEQL_RUNNER"] = path.join(mainTracerConfig.env["CODEQL_DIST"], "tools", mainTracerConfig.env["CODEQL_PLATFORM"], runnerExeName);
+    // If the CLI doesn't yet support setting the CODEQL_RUNNER environment variable to
+    // the runner executable path, we set it here in the Action.
+    if (!(await codeql.supportsFeature(tools_features_1.ToolsFeature.SetsCodeqlRunnerEnvVar))) {
+        // On MacOS when System Integrity Protection is enabled, it's necessary to prefix
+        // the build command with the runner executable for indirect tracing, so we expose
+        // it here via the CODEQL_RUNNER environment variable.
+        // The executable also exists and works for other platforms so we unconditionally
+        // set the environment variable.
+        const runnerExeName = process.platform === "win32" ? "runner.exe" : "runner";
+        mainTracerConfig.env["CODEQL_RUNNER"] = path.join(mainTracerConfig.env["CODEQL_DIST"], "tools", mainTracerConfig.env["CODEQL_PLATFORM"], runnerExeName);
+    }
     return mainTracerConfig;
 }
 exports.getCombinedTracerConfig = getCombinedTracerConfig;

lib/tracer-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracer-config.js","sourceRoot":"","sources":["../src/tracer-config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAG7B,2CAA+C;AAMxC,KAAK,UAAU,oBAAoB,CACxC,MAA0B;IAE1B,kEAAkE;IAClE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,4BAAgB,EAAC,CAAC,CAAC,CAAC;QAAE,OAAO;IAE/D,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CACnC,MAAM,CAAC,UAAU,EACjB,0CAA0C,CAC3C,CAAC;IACF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACb,kDAAkD,gBAAgB,EAAE,CACrE,CAAC;IACJ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,sBAAsB,GAA+B,IAAI,CAAC,KAAK,CACnE,EAAE,CAAC,YAAY,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAC1C,CAAC;QACF,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAClE,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,sEAAsE,CAAC,EAAE,CAC1E,CAAC;IACJ,CAAC;AACH,CAAC;AA/BD,oDA+BC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,MAA0B;IAE1B,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CACpC,EAAE,CAAC,YAAY,CACb,IAAI,CAAC,OAAO,CACV,MAAM,CAAC,UAAU,EACjB,4CAA4C,CAC7C,EACD,MAAM,CACP,CACF,CAAC;IACF,OAAO;QACL,GAAG,EAAE,mBAAmB;KACzB,CAAC;AACJ,CAAC;AAfD,8DAeC;AAEM,KAAK,UAAU,uBAAuB,CAC3C,MAA0B;IAE1B,kEAAkE;IAClE,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,4BAAgB,EAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,gBAAgB,GAAG,MAAM,yBAAyB,CAAC,MAAM,CAAC,CAAC;IAEjE,iFAAiF;IACjF,iEAAiE;IACjE,iFAAiF;IACjF,qEAAqE;IACrE,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC7E,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,IAAI,CAC/C,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAC,EACnC,OAAO,EACP,gBAAgB,CAAC,GAAG,CAAC,iBAAiB,CAAC,EACvC,aAAa,CACd,CAAC;IAEF,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAxBD,0DAwBC"}
+{"version":3,"file":"tracer-config.js","sourceRoot":"","sources":["../src/tracer-config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAI7B,2CAA+C;AAC/C,qDAAgD;AAMzC,KAAK,UAAU,oBAAoB,CACxC,MAA0B;IAE1B,kEAAkE;IAClE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,4BAAgB,EAAC,CAAC,CAAC,CAAC;QAAE,OAAO;IAE/D,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CACnC,MAAM,CAAC,UAAU,EACjB,0CAA0C,CAC3C,CAAC;IACF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACb,kDAAkD,gBAAgB,EAAE,CACrE,CAAC;IACJ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,sBAAsB,GAA+B,IAAI,CAAC,KAAK,CACnE,EAAE,CAAC,YAAY,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAC1C,CAAC;QACF,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAClE,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,sEAAsE,CAAC,EAAE,CAC1E,CAAC;IACJ,CAAC;AACH,CAAC;AA/BD,oDA+BC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,MAA0B;IAE1B,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CACpC,EAAE,CAAC,YAAY,CACb,IAAI,CAAC,OAAO,CACV,MAAM,CAAC,UAAU,EACjB,4CAA4C,CAC7C,EACD,MAAM,CACP,CACF,CAAC;IACF,OAAO;QACL,GAAG,EAAE,mBAAmB;KACzB,CAAC;AACJ,CAAC;AAfD,8DAeC;AAEM,KAAK,UAAU,uBAAuB,CAC3C,MAAc,EACd,MAA0B;IAE1B,kEAAkE;IAClE,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,4BAAgB,EAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,gBAAgB,GAAG,MAAM,yBAAyB,CAAC,MAAM,CAAC,CAAC;IAEjE,mFAAmF;IACnF,4DAA4D;IAC5D,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,eAAe,CAAC,6BAAY,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC;QACzE,iFAAiF;QACjF,kFAAkF;QAClF,sDAAsD;QACtD,iFAAiF;QACjF,gCAAgC;QAChC,MAAM,aAAa,GACjB,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC;QACzD,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,IAAI,CAC/C,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAC,EACnC,OAAO,EACP,gBAAgB,CAAC,GAAG,CAAC,iBAAiB,CAAC,EACvC,aAAa,CACd,CAAC;IACJ,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AA/BD,0DA+BC"}

lib/tracer-config.test.js

@@ -29,34 +29,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const ava_1 = __importDefault(require("ava"));
-const configUtils = __importStar(require("./config-utils"));
 const languages_1 = require("./languages");
 const testing_utils_1 = require("./testing-utils");
 const tracer_config_1 = require("./tracer-config");
 const util = __importStar(require("./util"));
 (0, testing_utils_1.setupTests)(ava_1.default);
-function getTestConfig(tmpDir) {
-    return {
+function getTestConfig(tempDir) {
+    return (0, testing_utils_1.createTestConfig)({
         languages: [languages_1.Language.java],
-        originalUserInput: {},
-        tempDir: tmpDir,
-        codeQLCmd: "",
-        gitHubVersion: { type: util.GitHubVariant.DOTCOM },
-        dbLocation: path.resolve(tmpDir, "codeql_databases"),
-        debugMode: false,
-        debugArtifactName: util.DEFAULT_DEBUG_ARTIFACT_NAME,
-        debugDatabaseName: util.DEFAULT_DEBUG_DATABASE_NAME,
-        augmentationProperties: configUtils.defaultAugmentationProperties,
-        trapCaches: {},
-        trapCacheDownloadTime: 0,
-    };
+        tempDir,
+        dbLocation: path.resolve(tempDir, "codeql_databases"),
+    });
 }
 (0, ava_1.default)("getCombinedTracerConfig - return undefined when no languages are traced languages", async (t) => {
     await util.withTmpDir(async (tmpDir) => {
         const config = getTestConfig(tmpDir);
         // No traced languages
         config.languages = [languages_1.Language.javascript, languages_1.Language.python];
-        t.deepEqual(await (0, tracer_config_1.getCombinedTracerConfig)(config), undefined);
+        t.deepEqual(await (0, tracer_config_1.getCombinedTracerConfig)((0, testing_utils_1.mockCodeQLVersion)("1.0.0"), config), undefined);
     });
 });
 (0, ava_1.default)("getCombinedTracerConfig - with start-tracing.json environment file", async (t) => {
@@ -77,7 +67,7 @@ function getTestConfig(tmpDir) {
         fs.mkdirSync(tracingEnvironmentDir, { recursive: true });
         const startTracingJson = path.join(tracingEnvironmentDir, "start-tracing.json");
         fs.writeFileSync(startTracingJson, JSON.stringify(startTracingEnv));
-        const result = await (0, tracer_config_1.getCombinedTracerConfig)(config);
+        const result = await (0, tracer_config_1.getCombinedTracerConfig)((0, testing_utils_1.mockCodeQLVersion)("1.0.0"), config);
         t.notDeepEqual(result, undefined);
         const expectedEnv = startTracingEnv;
         if (process.platform === "win32") {
@@ -94,4 +84,27 @@ function getTestConfig(tmpDir) {
         });
     });
 });
+(0, ava_1.default)("getCombinedTracerConfig - with SetsCodeqlRunnerEnvVar feature enabled in CLI", async (t) => {
+    await util.withTmpDir(async (tmpDir) => {
+        const config = getTestConfig(tmpDir);
+        const bundlePath = path.join(tmpDir, "bundle");
+        const codeqlPlatform = process.platform === "win32"
+            ? "win64"
+            : process.platform === "darwin"
+                ? "osx64"
+                : "linux64";
+        const startTracingEnv = {
+            foo: "bar",
+            CODEQL_DIST: bundlePath,
+            CODEQL_PLATFORM: codeqlPlatform,
+        };
+        const tracingEnvironmentDir = path.join(config.dbLocation, "temp", "tracingEnvironment");
+        fs.mkdirSync(tracingEnvironmentDir, { recursive: true });
+        const startTracingJson = path.join(tracingEnvironmentDir, "start-tracing.json");
+        fs.writeFileSync(startTracingJson, JSON.stringify(startTracingEnv));
+        const result = await (0, tracer_config_1.getCombinedTracerConfig)((0, testing_utils_1.mockCodeQLVersion)("1.0.0", { setsCodeqlRunnerEnvVar: true }), config);
+        t.notDeepEqual(result, undefined);
+        t.false(Object.prototype.hasOwnProperty.call(result?.env, "CODEQL_RUNNER"));
+    });
+});
 //# sourceMappingURL=tracer-config.test.js.map

lib/tracer-config.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracer-config.test.js","sourceRoot":"","sources":["../src/tracer-config.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tracer-config.test.js","sourceRoot":"","sources":["../src/tracer-config.test.ts"],"names":[],"mappings":"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"}

lib/trap-caching.test.js

@@ -78,48 +78,22 @@ const stubCodeql = (0, codeql_1.setCodeQL)({
         };
     },
 });
-const testConfigWithoutTmpDir = {
+const testConfigWithoutTmpDir = (0, testing_utils_1.createTestConfig)({
     languages: [languages_1.Language.javascript, languages_1.Language.cpp],
-    originalUserInput: {},
-    tempDir: "",
-    codeQLCmd: "",
-    gitHubVersion: {
-        type: util.GitHubVariant.DOTCOM,
-    },
-    dbLocation: "",
-    debugMode: false,
-    debugArtifactName: util.DEFAULT_DEBUG_ARTIFACT_NAME,
-    debugDatabaseName: util.DEFAULT_DEBUG_DATABASE_NAME,
-    augmentationProperties: {
-        packsInputCombines: false,
-        queriesInputCombines: false,
-    },
     trapCaches: {
         javascript: "/some/cache/dir",
     },
-    trapCacheDownloadTime: 0,
-};
-function getTestConfigWithTempDir(tmpDir) {
-    return {
+});
+function getTestConfigWithTempDir(tempDir) {
+    return (0, testing_utils_1.createTestConfig)({
         languages: [languages_1.Language.javascript, languages_1.Language.ruby],
-        originalUserInput: {},
-        tempDir: tmpDir,
-        codeQLCmd: "",
-        gitHubVersion: { type: util.GitHubVariant.DOTCOM },
-        dbLocation: path.resolve(tmpDir, "codeql_databases"),
-        debugMode: false,
-        debugArtifactName: util.DEFAULT_DEBUG_ARTIFACT_NAME,
-        debugDatabaseName: util.DEFAULT_DEBUG_DATABASE_NAME,
-        augmentationProperties: {
-            packsInputCombines: false,
-            queriesInputCombines: false,
-        },
+        tempDir,
+        dbLocation: path.resolve(tempDir, "codeql_databases"),
         trapCaches: {
-            javascript: path.resolve(tmpDir, "jsCache"),
-            ruby: path.resolve(tmpDir, "rubyCache"),
+            javascript: path.resolve(tempDir, "jsCache"),
+            ruby: path.resolve(tempDir, "rubyCache"),
         },
-        trapCacheDownloadTime: 0,
-    };
+    });
 }
 (0, ava_1.default)("check flags for JS, analyzing default branch", async (t) => {
     await util.withTmpDir(async (tmpDir) => {

lib/upload-sarif-action.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(require("@actions/core"));
 const actionsUtil = __importStar(require("./actions-util"));
 const actions_util_1 = require("./actions-util");
+const api_client_1 = require("./api-client");
 const logging_1 = require("./logging");
 const repository_1 = require("./repository");
 const status_report_1 = require("./status-report");
@@ -43,6 +44,8 @@ async function run() {
     const startedAt = new Date();
     const logger = (0, logging_1.getActionsLogger)();
     (0, util_1.initializeEnvironment)((0, actions_util_1.getActionVersion)());
+    const gitHubVersion = await (0, api_client_1.getGitHubVersion)();
+    (0, util_1.checkActionVersion)((0, actions_util_1.getActionVersion)(), gitHubVersion);
     if (!(await (0, status_report_1.sendStatusReport)(await (0, status_report_1.createStatusReportBase)("upload-sarif", "starting", startedAt, await (0, util_1.checkDiskUsage)())))) {
         return;
     }

lib/upload-sarif-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload-sarif-action.js","sourceRoot":"","sources":["../src/upload-sarif-action.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload-sarif-action.js","sourceRoot":"","sources":["../src/upload-sarif-action.ts"],"names":[],"mappings":"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"}

lib/util.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkDiskUsage = exports.prettyPrintPack = exports.getErrorMessage = exports.wrapError = exports.fixInvalidNotificationsInFile = exports.fixInvalidNotifications = exports.parseMatrixInput = exports.isHostedRunner = exports.checkForTimeout = exports.withTimeout = exports.tryGetFolderBytes = exports.listFolder = exports.doesDirectoryExist = exports.isInTestMode = exports.supportExpectDiscardedCache = exports.isGoodVersion = exports.delay = exports.bundleDb = exports.codeQlVersionAbove = exports.getCachedCodeQlVersion = exports.cacheCodeQlVersion = exports.isHTTPError = exports.UserError = exports.HTTPError = exports.getRequiredEnvParam = exports.initializeEnvironment = exports.assertNever = exports.apiVersionInRange = exports.DisallowedAPIVersionReason = exports.checkGitHubVersionInRange = exports.GitHubVariant = exports.parseGitHubUrl = exports.getCodeQLDatabasePath = exports.getThreadsFlag = exports.getThreadsFlagValue = exports.getAddSnippetsFlag = exports.getMemoryFlag = exports.getMemoryFlagValue = exports.getMemoryFlagValueForPlatform = exports.withTmpDir = exports.getToolNames = exports.getExtraOptionsEnvParam = exports.DEFAULT_DEBUG_DATABASE_NAME = exports.DEFAULT_DEBUG_ARTIFACT_NAME = exports.GITHUB_DOTCOM_URL = void 0;
+exports.checkActionVersion = exports.checkDiskUsage = exports.prettyPrintPack = exports.getErrorMessage = exports.wrapError = exports.fixInvalidNotificationsInFile = exports.fixInvalidNotifications = exports.parseMatrixInput = exports.isHostedRunner = exports.checkForTimeout = exports.withTimeout = exports.tryGetFolderBytes = exports.listFolder = exports.doesDirectoryExist = exports.isInTestMode = exports.supportExpectDiscardedCache = exports.isGoodVersion = exports.delay = exports.bundleDb = exports.codeQlVersionAbove = exports.getCachedCodeQlVersion = exports.cacheCodeQlVersion = exports.isHTTPError = exports.UserError = exports.HTTPError = exports.getRequiredEnvParam = exports.initializeEnvironment = exports.assertNever = exports.apiVersionInRange = exports.DisallowedAPIVersionReason = exports.checkGitHubVersionInRange = exports.GitHubVariant = exports.parseGitHubUrl = exports.getCodeQLDatabasePath = exports.getThreadsFlag = exports.getThreadsFlagValue = exports.getAddSnippetsFlag = exports.getMemoryFlag = exports.getMemoryFlagValue = exports.getMemoryFlagValueForPlatform = exports.withTmpDir = exports.getToolNames = exports.getExtraOptionsEnvParam = exports.DEFAULT_DEBUG_DATABASE_NAME = exports.DEFAULT_DEBUG_ARTIFACT_NAME = exports.GITHUB_DOTCOM_URL = void 0;
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
@@ -247,7 +247,18 @@ exports.getAddSnippetsFlag = getAddSnippetsFlag;
  */
 function getThreadsFlagValue(userInput, logger) {
     let numThreads;
-    const maxThreads = os.cpus().length;
+    const maxThreadsCandidates = [os.cpus().length];
+    if (os.platform() === "linux") {
+        maxThreadsCandidates.push(...["/sys/fs/cgroup/cpuset.cpus.effective", "/sys/fs/cgroup/cpuset.cpus"]
+            .map((file) => getCgroupCpuCountFromCpus(file, logger))
+            .filter((count) => count !== undefined && count > 0)
+            .map((count) => count));
+        maxThreadsCandidates.push(...["/sys/fs/cgroup/cpu.max"]
+            .map((file) => getCgroupCpuCountFromCpuMax(file, logger))
+            .filter((count) => count !== undefined && count > 0)
+            .map((count) => count));
+    }
+    const maxThreads = Math.min(...maxThreadsCandidates);
     if (userInput) {
         numThreads = Number(userInput);
         if (Number.isNaN(numThreads)) {
@@ -270,6 +281,56 @@ function getThreadsFlagValue(userInput, logger) {
     return numThreads;
 }
 exports.getThreadsFlagValue = getThreadsFlagValue;
+/**
+ * Gets the number of available cores specified by the cgroup cpu.max file at the given path.
+ * Format of file: two values, the limit and the duration (period). If the limit is "max" then
+ * we return undefined and do not use this file to determine CPU limits.
+ */
+function getCgroupCpuCountFromCpuMax(cpuMaxFile, logger) {
+    if (!fs.existsSync(cpuMaxFile)) {
+        logger.debug(`While resolving threads, did not find a cgroup CPU file at ${cpuMaxFile}.`);
+        return undefined;
+    }
+    const cpuMaxString = fs.readFileSync(cpuMaxFile, "utf-8");
+    const cpuMaxStringSplit = cpuMaxString.split(" ");
+    if (cpuMaxStringSplit.length !== 2) {
+        logger.debug(`While resolving threads, did not use cgroup CPU file at ${cpuMaxFile} because it contained ${cpuMaxStringSplit.length} value(s) rather than the two expected.`);
+        return undefined;
+    }
+    const cpuLimit = cpuMaxStringSplit[0];
+    if (cpuLimit === "max") {
+        return undefined;
+    }
+    const duration = cpuMaxStringSplit[1];
+    const cpuCount = Math.floor(parseInt(cpuLimit) / parseInt(duration));
+    logger.info(`While resolving threads, found a cgroup CPU file with ${cpuCount} CPUs in ${cpuMaxFile}.`);
+    return cpuCount;
+}
+/**
+ * Gets the number of available cores listed in the cgroup cpuset.cpus file at the given path.
+ */
+function getCgroupCpuCountFromCpus(cpusFile, logger) {
+    if (!fs.existsSync(cpusFile)) {
+        logger.debug(`While resolving threads, did not find a cgroup CPUs file at ${cpusFile}.`);
+        return undefined;
+    }
+    let cpuCount = 0;
+    // Comma-separated numbers and ranges, for eg. 0-1,3
+    const cpusString = fs.readFileSync(cpusFile, "utf-8");
+    for (const token of cpusString.split(",")) {
+        if (!token.includes("-")) {
+            // Not a range
+            ++cpuCount;
+        }
+        else {
+            const cpuStartIndex = parseInt(token.split("-")[0]);
+            const cpuEndIndex = parseInt(token.split("-")[1]);
+            cpuCount += cpuEndIndex - cpuStartIndex + 1;
+        }
+    }
+    logger.info(`While resolving threads, found a cgroup CPUs file with ${cpuCount} CPUs in ${cpusFile}.`);
+    return cpuCount;
+}
 /**
  * Get the codeql `--threads` flag specified for the `threads` input.
  * If no value was specified, all available threads will be used.
@@ -728,23 +789,61 @@ function prettyPrintPack(pack) {
 }
 exports.prettyPrintPack = prettyPrintPack;
 async function checkDiskUsage(logger) {
-    const diskUsage = await (0, check_disk_space_1.default)(getRequiredEnvParam("GITHUB_WORKSPACE"));
-    const gbInBytes = 1024 * 1024 * 1024;
-    if (logger && diskUsage.free < 2 * gbInBytes) {
-        const message = "The Actions runner is running low on disk space " +
-            `(${(diskUsage.free / gbInBytes).toPrecision(4)} GB available).`;
-        if (process.env[environment_1.EnvVar.HAS_WARNED_ABOUT_DISK_SPACE] !== "true") {
-            logger.warning(message);
+    try {
+        const diskUsage = await (0, check_disk_space_1.default)(getRequiredEnvParam("GITHUB_WORKSPACE"));
+        const gbInBytes = 1024 * 1024 * 1024;
+        if (logger && diskUsage.free < 2 * gbInBytes) {
+            const message = "The Actions runner is running low on disk space " +
+                `(${(diskUsage.free / gbInBytes).toPrecision(4)} GB available).`;
+            if (process.env[environment_1.EnvVar.HAS_WARNED_ABOUT_DISK_SPACE] !== "true") {
+                logger.warning(message);
+            }
+            else {
+                logger.debug(message);
+            }
+            core.exportVariable(environment_1.EnvVar.HAS_WARNED_ABOUT_DISK_SPACE, "true");
         }
-        else {
-            logger.debug(message);
-        }
-        core.exportVariable(environment_1.EnvVar.HAS_WARNED_ABOUT_DISK_SPACE, "true");
+        return {
+            numAvailableBytes: diskUsage.free,
+            numTotalBytes: diskUsage.size,
+        };
+    }
+    catch (error) {
+        if (logger) {
+            logger.warning(`Failed to check available disk space: ${getErrorMessage(error)}`);
+        }
+        return undefined;
     }
-    return {
-        numAvailableBytes: diskUsage.free,
-        numTotalBytes: diskUsage.size,
-    };
 }
 exports.checkDiskUsage = checkDiskUsage;
+/**
+ * Prompt the customer to upgrade to CodeQL Action v3, if appropriate.
+ *
+ * Check whether a customer is running v2. If they are, and we can determine that the GitHub
+ * instance supports v3, then log a warning about v2's upcoming deprecation prompting the customer
+ * to upgrade to v3.
+ */
+function checkActionVersion(version, githubVersion) {
+    if (!semver.satisfies(version, ">=3") && // do not warn if the customer is already running v3
+        !process.env.CODEQL_V2_DEPRECATION_WARNING // do not warn if we have already warned
+    ) {
+        // Only log a warning for versions of GHES that are compatible with CodeQL Action version 3.
+        //
+        // GHES 3.11 shipped without the v3 tag, but it also shipped without this warning message code.
+        // Therefore users who are seeing this warning message code have pulled in a new version of the
+        // Action, and with it the v3 tag.
+        if (githubVersion.type === GitHubVariant.DOTCOM ||
+            githubVersion.type === GitHubVariant.GHE_DOTCOM ||
+            (githubVersion.type === GitHubVariant.GHES &&
+                semver.satisfies(semver.coerce(githubVersion.version) ?? "0.0.0", ">=3.11"))) {
+            core.warning("CodeQL Action v2 will be deprecated on December 5th, 2024. " +
+                "Please update all occurrences of the CodeQL Action in your workflow files to v3. " +
+                "For more information, see " +
+                "https://github.blog/changelog/2024-01-12-code-scanning-deprecation-of-codeql-action-v2/");
+            // set CODEQL_V2_DEPRECATION_WARNING env var to prevent the warning from being logged multiple times
+            core.exportVariable("CODEQL_V2_DEPRECATION_WARNING", "true");
+        }
+    }
+}
+exports.checkActionVersion = checkActionVersion;
 //# sourceMappingURL=util.js.map

lib/util.test.js

@@ -29,7 +29,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path_1 = __importDefault(require("path"));
+const core = __importStar(require("@actions/core"));
 const ava_1 = __importDefault(require("ava"));
+const sinon = __importStar(require("sinon"));
+const api = __importStar(require("./api-client"));
 const environment_1 = require("./environment");
 const logging_1 = require("./logging");
 const testing_utils_1 = require("./testing-utils");
@@ -305,4 +308,50 @@ const stubLocation = {
         message: "Removed 1 duplicate locations from SARIF notification objects.",
     });
 });
+function formatGitHubVersion(version) {
+    switch (version.type) {
+        case util.GitHubVariant.DOTCOM:
+            return "dotcom";
+        case util.GitHubVariant.GHE_DOTCOM:
+            return "GHE dotcom";
+        case util.GitHubVariant.GHES:
+            return `GHES ${version.version}`;
+        default:
+            util.assertNever(version);
+    }
+}
+const CHECK_ACTION_VERSION_TESTS = [
+    ["2.2.1", { type: util.GitHubVariant.DOTCOM }, true],
+    ["2.2.1", { type: util.GitHubVariant.GHE_DOTCOM }, true],
+    ["2.2.1", { type: util.GitHubVariant.GHES, version: "3.10" }, false],
+    ["2.2.1", { type: util.GitHubVariant.GHES, version: "3.11" }, true],
+    ["2.2.1", { type: util.GitHubVariant.GHES, version: "3.12" }, true],
+    ["3.2.1", { type: util.GitHubVariant.DOTCOM }, false],
+    ["3.2.1", { type: util.GitHubVariant.GHE_DOTCOM }, false],
+    ["3.2.1", { type: util.GitHubVariant.GHES, version: "3.10" }, false],
+    ["3.2.1", { type: util.GitHubVariant.GHES, version: "3.11" }, false],
+    ["3.2.1", { type: util.GitHubVariant.GHES, version: "3.12" }, false],
+];
+for (const [version, githubVersion, shouldReportWarning,] of CHECK_ACTION_VERSION_TESTS) {
+    const reportWarningDescription = shouldReportWarning
+        ? "reports warning"
+        : "doesn't report warning";
+    const versionsDescription = `CodeQL Action version ${version} and GitHub version ${formatGitHubVersion(githubVersion)}`;
+    (0, ava_1.default)(`checkActionVersion ${reportWarningDescription} for ${versionsDescription}`, async (t) => {
+        const warningSpy = sinon.spy(core, "warning");
+        const versionStub = sinon
+            .stub(api, "getGitHubVersion")
+            .resolves(githubVersion);
+        // call checkActionVersion twice and assert below that warning is reported only once
+        util.checkActionVersion(version, await api.getGitHubVersion());
+        util.checkActionVersion(version, await api.getGitHubVersion());
+        if (shouldReportWarning) {
+            t.true(warningSpy.calledOnceWithExactly(sinon.match("CodeQL Action v2 will be deprecated")));
+        }
+        else {
+            t.false(warningSpy.called);
+        }
+        versionStub.restore();
+    });
+}
 //# sourceMappingURL=util.test.js.map

node_modules/.package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "3.23.1",
+  "version": "2.24.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
@@ -25,9 +25,9 @@
       }
     },
     "node_modules/@actions/cache": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.2.2.tgz",
-      "integrity": "sha512-6D0Jq5JrLZRQ3VApeQwQkkV20ZZXjXsHNYXd9VjNUdi9E0h93wESpxfMJ2JWLCUCgHNLcfY0v3GjNM+2FdRMlg==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.2.3.tgz",
+      "integrity": "sha512-m8KvmcD+JxSLOfNUXuBF2jL0Lp+co/Fhbf0NTt0M9lz61WnXRdqpIGrOvTRZmKIl+7HaHil6kGE3fkEfrKQCQA==",
       "dependencies": {
         "@actions/core": "^1.10.0",
         "@actions/exec": "^1.0.1",
@@ -37,7 +37,7 @@
         "@azure/abort-controller": "^1.1.0",
         "@azure/ms-rest-js": "^2.6.0",
         "@azure/storage-blob": "^12.13.0",
-        "semver": "^6.1.0",
+        "semver": "^6.3.1",
         "uuid": "^3.3.3"
       }
     },
@@ -896,12 +896,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.9.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz",
-      "integrity": "sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==",
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
+      "version": "16.11.22",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.22.tgz",
+      "integrity": "sha512-DYNtJWauMQ9RNpesl4aVothr97/tIJM8HbyOXJ0AYT1Z2bEjLHyfjOBPAQQVMLf8h3kSShYfNk8Wnto8B2zHUA=="
     },
     "node_modules/@types/node-fetch": {
       "version": "2.6.4",
@@ -932,9 +929,9 @@
       "dev": true
     },
     "node_modules/@types/sinon": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-17.0.2.tgz",
-      "integrity": "sha512-Zt6heIGsdqERkxctIpvN5Pv3edgBrhoeb3yHyxffd4InN0AX2SVNKSrhdDZKGQICVOxWP/q4DyhpfPNMSrpIiA==",
+      "version": "17.0.3",
+      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-17.0.3.tgz",
+      "integrity": "sha512-j3uovdn8ewky9kRBG19bOwaZbexJu/XjtkHyjvUgt4xfPFz18dcORIMqnYh66Fx3Powhcr85NT5+er3+oViapw==",
       "dev": true,
       "dependencies": {
         "@types/sinonjs__fake-timers": "*"
@@ -955,21 +952,21 @@
       }
     },
     "node_modules/@types/uuid": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.7.tgz",
-      "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g=="
+      "version": "9.0.8",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
+      "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA=="
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.17.0.tgz",
-      "integrity": "sha512-Vih/4xLXmY7V490dGwBQJTpIZxH4ZFH6eCVmQ4RFkB+wmaCTDAx4dtgoWwMNGKLkqRY1L6rPqzEbjorRnDo4rQ==",
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.20.0.tgz",
+      "integrity": "sha512-fTwGQUnjhoYHeSF6m5pWNkzmDDdsKELYrOBxhjMrofPqCkoC2k3B2wvGHFxa1CTIqkEn88nlW1HVMztjo2K8Hg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.17.0",
-        "@typescript-eslint/type-utils": "6.17.0",
-        "@typescript-eslint/utils": "6.17.0",
-        "@typescript-eslint/visitor-keys": "6.17.0",
+        "@typescript-eslint/scope-manager": "6.20.0",
+        "@typescript-eslint/type-utils": "6.20.0",
+        "@typescript-eslint/utils": "6.20.0",
+        "@typescript-eslint/visitor-keys": "6.20.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -995,15 +992,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.17.0.tgz",
-      "integrity": "sha512-C4bBaX2orvhK+LlwrY8oWGmSl4WolCfYm513gEccdWZj0CwGadbIADb0FtVEcI+WzUyjyoBj2JRP8g25E6IB8A==",
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.20.0.tgz",
+      "integrity": "sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.17.0",
-        "@typescript-eslint/types": "6.17.0",
-        "@typescript-eslint/typescript-estree": "6.17.0",
-        "@typescript-eslint/visitor-keys": "6.17.0",
+        "@typescript-eslint/scope-manager": "6.20.0",
+        "@typescript-eslint/types": "6.20.0",
+        "@typescript-eslint/typescript-estree": "6.20.0",
+        "@typescript-eslint/visitor-keys": "6.20.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1023,13 +1020,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.17.0.tgz",
-      "integrity": "sha512-RX7a8lwgOi7am0k17NUO0+ZmMOX4PpjLtLRgLmT1d3lBYdWH4ssBUbwdmc5pdRX8rXon8v9x8vaoOSpkHfcXGA==",
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz",
+      "integrity": "sha512-p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.17.0",
-        "@typescript-eslint/visitor-keys": "6.17.0"
+        "@typescript-eslint/types": "6.20.0",
+        "@typescript-eslint/visitor-keys": "6.20.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -1040,13 +1037,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.17.0.tgz",
-      "integrity": "sha512-hDXcWmnbtn4P2B37ka3nil3yi3VCQO2QEB9gBiHJmQp5wmyQWqnjA85+ZcE8c4FqnaB6lBwMrPkgd4aBYz3iNg==",
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.20.0.tgz",
+      "integrity": "sha512-qnSobiJQb1F5JjN0YDRPHruQTrX7ICsmltXhkV536mp4idGAYrIyr47zF/JmkJtEcAVnIz4gUYJ7gOZa6SmN4g==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.17.0",
-        "@typescript-eslint/utils": "6.17.0",
+        "@typescript-eslint/typescript-estree": "6.20.0",
+        "@typescript-eslint/utils": "6.20.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -1067,9 +1064,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.17.0.tgz",
-      "integrity": "sha512-qRKs9tvc3a4RBcL/9PXtKSehI/q8wuU9xYJxe97WFxnzH8NWWtcW3ffNS+EWg8uPvIerhjsEZ+rHtDqOCiH57A==",
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.20.0.tgz",
+      "integrity": "sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -1080,13 +1077,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.17.0.tgz",
-      "integrity": "sha512-gVQe+SLdNPfjlJn5VNGhlOhrXz4cajwFd5kAgWtZ9dCZf4XJf8xmgCTLIqec7aha3JwgLI2CK6GY1043FRxZwg==",
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz",
+      "integrity": "sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.17.0",
-        "@typescript-eslint/visitor-keys": "6.17.0",
+        "@typescript-eslint/types": "6.20.0",
+        "@typescript-eslint/visitor-keys": "6.20.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -1132,17 +1129,17 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.17.0.tgz",
-      "integrity": "sha512-LofsSPjN/ITNkzV47hxas2JCsNCEnGhVvocfyOcLzT9c/tSZE7SfhS/iWtzP1lKNOEfLhRTZz6xqI8N2RzweSQ==",
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.20.0.tgz",
+      "integrity": "sha512-/EKuw+kRu2vAqCoDwDCBtDRU6CTKbUmwwI7SH7AashZ+W+7o8eiyy6V2cdOqN49KsTcASWsC5QeghYuRDTyOOg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.17.0",
-        "@typescript-eslint/types": "6.17.0",
-        "@typescript-eslint/typescript-estree": "6.17.0",
+        "@typescript-eslint/scope-manager": "6.20.0",
+        "@typescript-eslint/types": "6.20.0",
+        "@typescript-eslint/typescript-estree": "6.20.0",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -1157,12 +1154,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.17.0.tgz",
-      "integrity": "sha512-H6VwB/k3IuIeQOyYczyyKN8wH6ed8EwliaYHLxOIhyF0dYEIsN8+Bk3GE19qafeMKyZJJHP8+O1HiFhFLUNKSg==",
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz",
+      "integrity": "sha512-E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.17.0",
+        "@typescript-eslint/types": "6.20.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -4564,9 +4561,9 @@
       }
     },
     "node_modules/nock": {
-      "version": "13.4.0",
-      "resolved": "https://registry.npmjs.org/nock/-/nock-13.4.0.tgz",
-      "integrity": "sha512-W8NVHjO/LCTNA64yxAPHV/K47LpGYcVzgKd3Q0n6owhwvD0Dgoterc25R4rnZbckJEb6Loxz1f5QMuJpJnbSyQ==",
+      "version": "13.5.1",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.1.tgz",
+      "integrity": "sha512-+s7b73fzj5KnxbKH4Oaqz07tQ8degcMilU4rrmnKvI//b0JMBU4wEXFQ8zqr+3+L4eWSfU3H/UoIVGUV0tue1Q==",
       "dev": true,
       "dependencies": {
         "debug": "^4.1.0",
@@ -6089,11 +6086,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
-    },
     "node_modules/universal-user-agent": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",

node_modules/@actions/cache/lib/internal/cacheHttpClient.js

@@ -70,7 +70,8 @@ function createHttpClient() {
     return new http_client_1.HttpClient('actions/cache', [bearerCredentialHandler], getRequestOptions());
 }
 function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
-    const components = paths;
+    // don't pass changes upstream
+    const components = paths.slice();
     // Add compression method to cache version to restore
     // compressed cache as per compression method
     if (compressionMethod) {

node_modules/@actions/cache/lib/internal/cacheUtils.js

@@ -91,26 +91,21 @@ function resolvePaths(patterns) {
             implicitDescendants: false
         });
         try {
-            for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a;) {
+            for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a; _e = true) {
                 _c = _g.value;
                 _e = false;
-                try {
-                    const file = _c;
-                    const relativeFile = path
-                        .relative(workspace, file)
-                        .replace(new RegExp(`\\${path.sep}`, 'g'), '/');
-                    core.debug(`Matched: ${relativeFile}`);
-                    // Paths are made relative so the tar entries are all relative to the root of the workspace.
-                    if (relativeFile === '') {
-                        // path.relative returns empty string if workspace and file are equal
-                        paths.push('.');
-                    }
-                    else {
-                        paths.push(`${relativeFile}`);
-                    }
+                const file = _c;
+                const relativeFile = path
+                    .relative(workspace, file)
+                    .replace(new RegExp(`\\${path.sep}`, 'g'), '/');
+                core.debug(`Matched: ${relativeFile}`);
+                // Paths are made relative so the tar entries are all relative to the root of the workspace.
+                if (relativeFile === '') {
+                    // path.relative returns empty string if workspace and file are equal
+                    paths.push('.');
                 }
-                finally {
-                    _e = true;
+                else {
+                    paths.push(`${relativeFile}`);
                 }
             }
         }

node_modules/@actions/cache/lib/internal/cacheUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"cacheUtils.js","sourceRoot":"","sources":["../../src/internal/cacheUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cacheUtils.js","sourceRoot":"","sources":["../../src/internal/cacheUtils.ts"],"names":[],"mappings":"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"}

node_modules/@actions/cache/lib/internal/constants.js

@@ -5,7 +5,7 @@ var CacheFilename;
 (function (CacheFilename) {
     CacheFilename["Gzip"] = "cache.tgz";
     CacheFilename["Zstd"] = "cache.tzst";
-})(CacheFilename = exports.CacheFilename || (exports.CacheFilename = {}));
+})(CacheFilename || (exports.CacheFilename = CacheFilename = {}));
 var CompressionMethod;
 (function (CompressionMethod) {
     CompressionMethod["Gzip"] = "gzip";
@@ -13,12 +13,12 @@ var CompressionMethod;
     // This enum is for earlier version of zstd that does not have --long support
     CompressionMethod["ZstdWithoutLong"] = "zstd-without-long";
     CompressionMethod["Zstd"] = "zstd";
-})(CompressionMethod = exports.CompressionMethod || (exports.CompressionMethod = {}));
+})(CompressionMethod || (exports.CompressionMethod = CompressionMethod = {}));
 var ArchiveToolType;
 (function (ArchiveToolType) {
     ArchiveToolType["GNU"] = "gnu";
     ArchiveToolType["BSD"] = "bsd";
-})(ArchiveToolType = exports.ArchiveToolType || (exports.ArchiveToolType = {}));
+})(ArchiveToolType || (exports.ArchiveToolType = ArchiveToolType = {}));
 // The default number of retry attempts.
 exports.DefaultRetryAttempts = 2;
 // The default delay in milliseconds between retry attempts.

node_modules/@actions/cache/lib/internal/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/internal/constants.ts"],"names":[],"mappings":";;;AAAA,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,mCAAkB,CAAA;IAClB,oCAAmB,CAAA;AACrB,CAAC,EAHW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAGxB;AAED,IAAY,iBAMX;AAND,WAAY,iBAAiB;IAC3B,kCAAa,CAAA;IACb,+CAA+C;IAC/C,6EAA6E;IAC7E,0DAAqC,CAAA;IACrC,kCAAa,CAAA;AACf,CAAC,EANW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAM5B;AAED,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,8BAAW,CAAA;IACX,8BAAW,CAAA;AACb,CAAC,EAHW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAG1B;AAED,wCAAwC;AAC3B,QAAA,oBAAoB,GAAG,CAAC,CAAA;AAErC,4DAA4D;AAC/C,QAAA,iBAAiB,GAAG,IAAI,CAAA;AAErC,6EAA6E;AAC7E,+EAA+E;AAC/E,cAAc;AACD,QAAA,aAAa,GAAG,IAAI,CAAA;AAEjC,uDAAuD;AAC1C,QAAA,mBAAmB,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,0BAA0B,CAAA;AAE3F,uDAAuD;AAC1C,QAAA,sBAAsB,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,8BAA8B,CAAA;AAEpF,QAAA,WAAW,GAAG,WAAW,CAAA;AAEzB,QAAA,gBAAgB,GAAG,cAAc,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/internal/constants.ts"],"names":[],"mappings":";;;AAAA,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,mCAAkB,CAAA;IAClB,oCAAmB,CAAA;AACrB,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB;AAED,IAAY,iBAMX;AAND,WAAY,iBAAiB;IAC3B,kCAAa,CAAA;IACb,+CAA+C;IAC/C,6EAA6E;IAC7E,0DAAqC,CAAA;IACrC,kCAAa,CAAA;AACf,CAAC,EANW,iBAAiB,iCAAjB,iBAAiB,QAM5B;AAED,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,8BAAW,CAAA;IACX,8BAAW,CAAA;AACb,CAAC,EAHW,eAAe,+BAAf,eAAe,QAG1B;AAED,wCAAwC;AAC3B,QAAA,oBAAoB,GAAG,CAAC,CAAA;AAErC,4DAA4D;AAC/C,QAAA,iBAAiB,GAAG,IAAI,CAAA;AAErC,6EAA6E;AAC7E,+EAA+E;AAC/E,cAAc;AACD,QAAA,aAAa,GAAG,IAAI,CAAA;AAEjC,uDAAuD;AAC1C,QAAA,mBAAmB,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,0BAA0B,CAAA;AAE3F,uDAAuD;AAC1C,QAAA,sBAAsB,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,8BAA8B,CAAA;AAEpF,QAAA,WAAW,GAAG,WAAW,CAAA;AAEzB,QAAA,gBAAgB,GAAG,cAAc,CAAA"}

node_modules/@actions/cache/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/cache",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "preview": true,
   "description": "Actions cache lib",
   "keywords": [
@@ -45,12 +45,12 @@
     "@azure/abort-controller": "^1.1.0",
     "@azure/ms-rest-js": "^2.6.0",
     "@azure/storage-blob": "^12.13.0",
-    "semver": "^6.1.0",
+    "semver": "^6.3.1",
     "uuid": "^3.3.3"
   },
   "devDependencies": {
     "@types/semver": "^6.0.0",
     "@types/uuid": "^3.4.5",
-    "typescript": "^4.8.0"
+    "typescript": "^5.2.2"
   }
 }

node_modules/@types/node/README.md

@@ -2,14 +2,15 @@
 > `npm install --save @types/node`
 
 # Summary
-This package contains type definitions for node (https://nodejs.org/).
+This package contains type definitions for Node.js (https://nodejs.org/).
 
 # Details
-Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node.
+Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node/v16.
 
 ### Additional Details
- * Last updated: Tue, 07 Nov 2023 20:08:00 GMT
- * Dependencies: [undici-types](https://npmjs.com/package/undici-types)
+ * Last updated: Tue, 01 Feb 2022 08:31:30 GMT
+ * Dependencies: none
+ * Global values: `AbortController`, `AbortSignal`, `__dirname`, `__filename`, `console`, `exports`, `gc`, `global`, `module`, `process`, `require`
 
 # Credits
-These definitions were written by [Microsoft TypeScript](https://github.com/Microsoft), [Alberto Schiabel](https://github.com/jkomyno), [Alvis HT Tang](https://github.com/alvis), [Andrew Makarov](https://github.com/r3nya), [Benjamin Toueg](https://github.com/btoueg), [Chigozirim C.](https://github.com/smac89), [David Junger](https://github.com/touffy), [Deividas Bakanas](https://github.com/DeividasBakanas), [Eugene Y. Q. Shen](https://github.com/eyqs), [Hannes Magnusson](https://github.com/Hannes-Magnusson-CK), [Huw](https://github.com/hoo29), [Kelvin Jin](https://github.com/kjin), [Klaus Meinhardt](https://github.com/ajafff), [Lishude](https://github.com/islishude), [Mariusz Wiktorczyk](https://github.com/mwiktorczyk), [Mohsen Azimi](https://github.com/mohsen1), [Nicolas Even](https://github.com/n-e), [Nikita Galkin](https://github.com/galkin), [Parambir Singh](https://github.com/parambirs), [Sebastian Silbermann](https://github.com/eps1lon), [Thomas den Hollander](https://github.com/ThomasdenH), [Wilco Bakker](https://github.com/WilcoBakker), [wwwy3y3](https://github.com/wwwy3y3), [Samuel Ainsworth](https://github.com/samuela), [Kyle Uehlein](https://github.com/kuehlein), [Thanik Bhongbhibhat](https://github.com/bhongy), [Marcin Kopacz](https://github.com/chyzwar), [Trivikram Kamat](https://github.com/trivikr), [Junxiao Shi](https://github.com/yoursunny), [Ilia Baryshnikov](https://github.com/qwelias), [ExE Boss](https://github.com/ExE-Boss), [Piotr Błażejewicz](https://github.com/peterblazejewicz), [Anna Henningsen](https://github.com/addaleax), [Victor Perin](https://github.com/victorperin), [Yongsheng Zhang](https://github.com/ZYSzys), [NodeJS Contributors](https://github.com/NodeJS), [Linus Unnebäck](https://github.com/LinusU), [wafuwafu13](https://github.com/wafuwafu13), [Matteo Collina](https://github.com/mcollina), and [Dmitry Semigradsky](https://github.com/Semigradsky).
+These definitions were written by [Microsoft TypeScript](https://github.com/Microsoft), [DefinitelyTyped](https://github.com/DefinitelyTyped), [Alberto Schiabel](https://github.com/jkomyno), [Alvis HT Tang](https://github.com/alvis), [Andrew Makarov](https://github.com/r3nya), [Benjamin Toueg](https://github.com/btoueg), [Chigozirim C.](https://github.com/smac89), [David Junger](https://github.com/touffy), [Deividas Bakanas](https://github.com/DeividasBakanas), [Eugene Y. Q. Shen](https://github.com/eyqs), [Hannes Magnusson](https://github.com/Hannes-Magnusson-CK), [Huw](https://github.com/hoo29), [Kelvin Jin](https://github.com/kjin), [Klaus Meinhardt](https://github.com/ajafff), [Lishude](https://github.com/islishude), [Mariusz Wiktorczyk](https://github.com/mwiktorczyk), [Mohsen Azimi](https://github.com/mohsen1), [Nicolas Even](https://github.com/n-e), [Nikita Galkin](https://github.com/galkin), [Parambir Singh](https://github.com/parambirs), [Sebastian Silbermann](https://github.com/eps1lon), [Seth Westphal](https://github.com/westy92), [Simon Schick](https://github.com/SimonSchick), [Thomas den Hollander](https://github.com/ThomasdenH), [Wilco Bakker](https://github.com/WilcoBakker), [wwwy3y3](https://github.com/wwwy3y3), [Samuel Ainsworth](https://github.com/samuela), [Kyle Uehlein](https://github.com/kuehlein), [Thanik Bhongbhibhat](https://github.com/bhongy), [Marcin Kopacz](https://github.com/chyzwar), [Trivikram Kamat](https://github.com/trivikr), [Junxiao Shi](https://github.com/yoursunny), [Ilia Baryshnikov](https://github.com/qwelias), [ExE Boss](https://github.com/ExE-Boss), [Piotr Błażejewicz](https://github.com/peterblazejewicz), [Anna Henningsen](https://github.com/addaleax), [Victor Perin](https://github.com/victorperin), [Yongsheng Zhang](https://github.com/ZYSzys), [NodeJS Contributors](https://github.com/NodeJS), [Linus Unnebäck](https://github.com/LinusU), and [wafuwafu13](https://github.com/wafuwafu13).

node_modules/@types/node/assert.d.ts

@@ -1,9 +1,9 @@
 /**
- * The `node:assert` module provides a set of assertion functions for verifying
+ * The `assert` module provides a set of assertion functions for verifying
  * invariants.
- * @see [source](https://github.com/nodejs/node/blob/v20.2.0/lib/assert.js)
+ * @see [source](https://github.com/nodejs/node/blob/v16.9.0/lib/assert.js)
  */
-declare module "assert" {
+declare module 'assert' {
     /**
      * An alias of {@link ok}.
      * @since v0.5.9
@@ -12,29 +12,15 @@ declare module "assert" {
     function assert(value: unknown, message?: string | Error): asserts value;
     namespace assert {
         /**
-         * Indicates the failure of an assertion. All errors thrown by the `node:assert`module will be instances of the `AssertionError` class.
+         * Indicates the failure of an assertion. All errors thrown by the `assert` module
+         * will be instances of the `AssertionError` class.
          */
         class AssertionError extends Error {
-            /**
-             * Set to the `actual` argument for methods such as {@link assert.strictEqual()}.
-             */
             actual: unknown;
-            /**
-             * Set to the `expected` argument for methods such as {@link assert.strictEqual()}.
-             */
             expected: unknown;
-            /**
-             * Set to the passed in operator value.
-             */
             operator: string;
-            /**
-             * Indicates if the message was auto-generated (`true`) or not.
-             */
             generatedMessage: boolean;
-            /**
-             * Value is always `ERR_ASSERTION` to show that the error is an assertion error.
-             */
-            code: "ERR_ASSERTION";
+            code: 'ERR_ASSERTION';
             constructor(options?: {
                 /** If provided, the error message is set to this value. */
                 message?: string | undefined;
@@ -50,10 +36,9 @@ declare module "assert" {
             });
         }
         /**
-         * This feature is deprecated and will be removed in a future version.
-         * Please consider using alternatives such as the `mock` helper function.
+         * This feature is currently experimental and behavior might still change.
          * @since v14.2.0, v12.19.0
-         * @deprecated Deprecated
+         * @experimental
          */
         class CallTracker {
             /**
@@ -62,7 +47,7 @@ declare module "assert" {
              * error.
              *
              * ```js
-             * import assert from 'node:assert';
+             * import assert from 'assert';
              *
              * // Creates call tracker.
              * const tracker = new assert.CallTracker();
@@ -80,44 +65,26 @@ declare module "assert" {
              */
             calls(exact?: number): () => void;
             calls<Func extends (...args: any[]) => any>(fn?: Func, exact?: number): Func;
-            /**
-             * Example:
-             *
-             * ```js
-             * import assert from 'node:assert';
-             *
-             * const tracker = new assert.CallTracker();
-             *
-             * function func() {}
-             * const callsfunc = tracker.calls(func);
-             * callsfunc(1, 2, 3);
-             *
-             * assert.deepStrictEqual(tracker.getCalls(callsfunc),
-             *                        [{ thisArg: undefined, arguments: [1, 2, 3] }]);
-             * ```
-             * @since v18.8.0, v16.18.0
-             * @param fn
-             * @return An Array with all the calls to a tracked function.
-             */
-            getCalls(fn: Function): CallTrackerCall[];
             /**
              * The arrays contains information about the expected and actual number of calls of
              * the functions that have not been called the expected number of times.
              *
              * ```js
-             * import assert from 'node:assert';
+             * import assert from 'assert';
              *
              * // Creates call tracker.
              * const tracker = new assert.CallTracker();
              *
              * function func() {}
              *
+             * function foo() {}
+             *
              * // Returns a function that wraps func() that must be called exact times
              * // before tracker.verify().
              * const callsfunc = tracker.calls(func, 2);
              *
              * // Returns an array containing information on callsfunc()
-             * console.log(tracker.report());
+             * tracker.report();
              * // [
              * //  {
              * //    message: 'Expected the func function to be executed 2 time(s) but was
@@ -130,39 +97,15 @@ declare module "assert" {
              * // ]
              * ```
              * @since v14.2.0, v12.19.0
-             * @return An Array of objects containing information about the wrapper functions returned by `calls`.
+             * @return of objects containing information about the wrapper functions returned by `calls`.
              */
             report(): CallTrackerReportInformation[];
-            /**
-             * Reset calls of the call tracker.
-             * If a tracked function is passed as an argument, the calls will be reset for it.
-             * If no arguments are passed, all tracked functions will be reset.
-             *
-             * ```js
-             * import assert from 'node:assert';
-             *
-             * const tracker = new assert.CallTracker();
-             *
-             * function func() {}
-             * const callsfunc = tracker.calls(func);
-             *
-             * callsfunc();
-             * // Tracker was called once
-             * assert.strictEqual(tracker.getCalls(callsfunc).length, 1);
-             *
-             * tracker.reset(callsfunc);
-             * assert.strictEqual(tracker.getCalls(callsfunc).length, 0);
-             * ```
-             * @since v18.8.0, v16.18.0
-             * @param fn a tracked function to reset.
-             */
-            reset(fn?: Function): void;
             /**
              * Iterates through the list of functions passed to `tracker.calls()` and will throw an error for functions that
              * have not been called the expected number of times.
              *
              * ```js
-             * import assert from 'node:assert';
+             * import assert from 'assert';
              *
              * // Creates call tracker.
              * const tracker = new assert.CallTracker();
@@ -182,10 +125,6 @@ declare module "assert" {
              */
             verify(): void;
         }
-        interface CallTrackerCall {
-            thisArg: object;
-            arguments: unknown[];
-        }
         interface CallTrackerReportInformation {
             message: string;
             /** The actual number of times the function was called. */
@@ -197,14 +136,14 @@ declare module "assert" {
             /** A stack trace of the function. */
             stack: object;
         }
-        type AssertPredicate = RegExp | (new() => object) | ((thrown: unknown) => boolean) | object | Error;
+        type AssertPredicate = RegExp | (new () => object) | ((thrown: unknown) => boolean) | object | Error;
         /**
          * Throws an `AssertionError` with the provided error message or a default
          * error message. If the `message` parameter is an instance of an `Error` then
          * it will be thrown instead of the `AssertionError`.
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.fail();
          * // AssertionError [ERR_ASSERTION]: Failed
@@ -229,7 +168,7 @@ declare module "assert" {
             message?: string | Error,
             operator?: string,
             // tslint:disable-next-line:ban-types
-            stackStartFn?: Function,
+            stackStartFn?: Function
         ): never;
         /**
          * Tests if `value` is truthy. It is equivalent to`assert.equal(!!value, true, message)`.
@@ -242,7 +181,7 @@ declare module "assert" {
          * thrown in a file! See below for further details.
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.ok(true);
          * // OK
@@ -277,7 +216,7 @@ declare module "assert" {
          * ```
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * // Using `assert()` works the same:
          * assert(0);
@@ -298,11 +237,11 @@ declare module "assert" {
          * > Stability: 3 - Legacy: Use {@link strictEqual} instead.
          *
          * Tests shallow, coercive equality between the `actual` and `expected` parameters
-         * using the [`==` operator](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Equality). `NaN` is specially handled
-         * and treated as being identical if both sides are `NaN`.
+         * using the [Abstract Equality Comparison](https://tc39.github.io/ecma262/#sec-abstract-equality-comparison) ( `==` ). `NaN` is special handled
+         * and treated as being identical in case both sides are `NaN`.
          *
          * ```js
-         * import assert from 'node:assert';
+         * import assert from 'assert';
          *
          * assert.equal(1, 1);
          * // OK, 1 == 1
@@ -331,11 +270,12 @@ declare module "assert" {
          *
          * > Stability: 3 - Legacy: Use {@link notStrictEqual} instead.
          *
-         * Tests shallow, coercive inequality with the [`!=` operator](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Inequality). `NaN` is
-         * specially handled and treated as being identical if both sides are `NaN`.
+         * Tests shallow, coercive inequality with the [Abstract Equality Comparison](https://tc39.github.io/ecma262/#sec-abstract-equality-comparison)(`!=` ). `NaN` is special handled and treated as
+         * being identical in case both
+         * sides are `NaN`.
          *
          * ```js
-         * import assert from 'node:assert';
+         * import assert from 'assert';
          *
          * assert.notEqual(1, 2);
          * // OK
@@ -382,24 +322,24 @@ declare module "assert" {
          * Tests for any deep inequality. Opposite of {@link deepEqual}.
          *
          * ```js
-         * import assert from 'node:assert';
+         * import assert from 'assert';
          *
          * const obj1 = {
          *   a: {
-         *     b: 1,
-         *   },
+         *     b: 1
+         *   }
          * };
          * const obj2 = {
          *   a: {
-         *     b: 2,
-         *   },
+         *     b: 2
+         *   }
          * };
          * const obj3 = {
          *   a: {
-         *     b: 1,
-         *   },
+         *     b: 1
+         *   }
          * };
-         * const obj4 = { __proto__: obj1 };
+         * const obj4 = Object.create(obj1);
          *
          * assert.notDeepEqual(obj1, obj1);
          * // AssertionError: { a: { b: 1 } } notDeepEqual { a: { b: 1 } }
@@ -422,10 +362,10 @@ declare module "assert" {
         function notDeepEqual(actual: unknown, expected: unknown, message?: string | Error): void;
         /**
          * Tests strict equality between the `actual` and `expected` parameters as
-         * determined by [`Object.is()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is).
+         * determined by the [SameValue Comparison](https://tc39.github.io/ecma262/#sec-samevalue).
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.strictEqual(1, 2);
          * // AssertionError [ERR_ASSERTION]: Expected inputs to be strictly equal:
@@ -460,10 +400,10 @@ declare module "assert" {
         function strictEqual<T>(actual: unknown, expected: T, message?: string | Error): asserts actual is T;
         /**
          * Tests strict inequality between the `actual` and `expected` parameters as
-         * determined by [`Object.is()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is).
+         * determined by the [SameValue Comparison](https://tc39.github.io/ecma262/#sec-samevalue).
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.notStrictEqual(1, 2);
          * // OK
@@ -494,7 +434,7 @@ declare module "assert" {
          * Tests for deep strict inequality. Opposite of {@link deepStrictEqual}.
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.notDeepStrictEqual({ a: 1 }, { a: '1' });
          * // OK
@@ -525,14 +465,14 @@ declare module "assert" {
          * Custom validation object/error instance:
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * const err = new TypeError('Wrong value');
          * err.code = 404;
          * err.foo = 'bar';
          * err.info = {
          *   nested: true,
-         *   baz: 'text',
+         *   baz: 'text'
          * };
          * err.reg = /abc/i;
          *
@@ -545,16 +485,16 @@ declare module "assert" {
          *     message: 'Wrong value',
          *     info: {
          *       nested: true,
-         *       baz: 'text',
-         *     },
+         *       baz: 'text'
+         *     }
          *     // Only properties on the validation object will be tested for.
          *     // Using nested objects requires all properties to be present. Otherwise
          *     // the validation is going to fail.
-         *   },
+         *   }
          * );
          *
          * // Using regular expressions to validate error properties:
-         * assert.throws(
+         * throws(
          *   () => {
          *     throw err;
          *   },
@@ -568,17 +508,17 @@ declare module "assert" {
          *     info: {
          *       nested: true,
          *       // It is not possible to use regular expressions for nested properties!
-         *       baz: 'text',
+         *       baz: 'text'
          *     },
          *     // The `reg` property contains a regular expression and only if the
          *     // validation object contains an identical regular expression, it is going
          *     // to pass.
-         *     reg: /abc/i,
-         *   },
+         *     reg: /abc/i
+         *   }
          * );
          *
          * // Fails due to the different `message` and `name` properties:
-         * assert.throws(
+         * throws(
          *   () => {
          *     const otherErr = new Error('Not found');
          *     // Copy all enumerable properties from `err` to `otherErr`.
@@ -589,20 +529,20 @@ declare module "assert" {
          *   },
          *   // The error's `message` and `name` properties will also be checked when using
          *   // an error as validation object.
-         *   err,
+         *   err
          * );
          * ```
          *
          * Validate instanceof using constructor:
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.throws(
          *   () => {
          *     throw new Error('Wrong value');
          *   },
-         *   Error,
+         *   Error
          * );
          * ```
          *
@@ -612,13 +552,13 @@ declare module "assert" {
          * therefore also include the error name.
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.throws(
          *   () => {
          *     throw new Error('Wrong value');
          *   },
-         *   /^Error: Wrong value$/,
+         *   /^Error: Wrong value$/
          * );
          * ```
          *
@@ -628,7 +568,7 @@ declare module "assert" {
          * It will otherwise fail with an `AssertionError`.
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.throws(
          *   () => {
@@ -644,7 +584,7 @@ declare module "assert" {
          *     // possible.
          *     return true;
          *   },
-         *   'unexpected error',
+         *   'unexpected error'
          * );
          * ```
          *
@@ -654,7 +594,7 @@ declare module "assert" {
          * a string as the second argument gets considered:
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * function throwingFirst() {
          *   throw new Error('First');
@@ -710,20 +650,20 @@ declare module "assert" {
          * propagated back to the caller.
          *
          * If specified, `error` can be a [`Class`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes),
-         * [`RegExp`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions), or a validation
+         * [`RegExp`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions) or a validation
          * function. See {@link throws} for more details.
          *
          * The following, for instance, will throw the `TypeError` because there is no
          * matching error type in the assertion:
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.doesNotThrow(
          *   () => {
          *     throw new TypeError('Wrong value');
          *   },
-         *   SyntaxError,
+         *   SyntaxError
          * );
          * ```
          *
@@ -731,27 +671,27 @@ declare module "assert" {
          * 'Got unwanted exception...':
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.doesNotThrow(
          *   () => {
          *     throw new TypeError('Wrong value');
          *   },
-         *   TypeError,
+         *   TypeError
          * );
          * ```
          *
          * If an `AssertionError` is thrown and a value is provided for the `message`parameter, the value of `message` will be appended to the `AssertionError` message:
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.doesNotThrow(
          *   () => {
          *     throw new TypeError('Wrong value');
          *   },
          *   /Wrong value/,
-         *   'Whoops',
+         *   'Whoops'
          * );
          * // Throws: AssertionError: Got unwanted exception: Whoops
          * ```
@@ -765,7 +705,7 @@ declare module "assert" {
          * from the error passed to `ifError()` including the potential new frames for`ifError()` itself.
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.ifError(null);
          * // OK
@@ -811,7 +751,7 @@ declare module "assert" {
          * If specified, `message` will be the message provided by the `AssertionError` if the `asyncFn` fails to reject.
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * await assert.rejects(
          *   async () => {
@@ -819,13 +759,13 @@ declare module "assert" {
          *   },
          *   {
          *     name: 'TypeError',
-         *     message: 'Wrong value',
-         *   },
+         *     message: 'Wrong value'
+         *   }
          * );
          * ```
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * await assert.rejects(
          *   async () => {
@@ -835,16 +775,16 @@ declare module "assert" {
          *     assert.strictEqual(err.name, 'TypeError');
          *     assert.strictEqual(err.message, 'Wrong value');
          *     return true;
-         *   },
+         *   }
          * );
          * ```
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.rejects(
          *   Promise.reject(new Error('Wrong value')),
-         *   Error,
+         *   Error
          * ).then(() => {
          *   // ...
          * });
@@ -857,11 +797,7 @@ declare module "assert" {
          * @since v10.0.0
          */
         function rejects(block: (() => Promise<unknown>) | Promise<unknown>, message?: string | Error): Promise<void>;
-        function rejects(
-            block: (() => Promise<unknown>) | Promise<unknown>,
-            error: AssertPredicate,
-            message?: string | Error,
-        ): Promise<void>;
+        function rejects(block: (() => Promise<unknown>) | Promise<unknown>, error: AssertPredicate, message?: string | Error): Promise<void>;
         /**
          * Awaits the `asyncFn` promise or, if `asyncFn` is a function, immediately
          * calls the function and awaits the returned promise to complete. It will then
@@ -878,24 +814,24 @@ declare module "assert" {
          * error messages as expressive as possible.
          *
          * If specified, `error` can be a [`Class`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes),
-         * [`RegExp`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions), or a validation
+         * [`RegExp`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions) or a validation
          * function. See {@link throws} for more details.
          *
          * Besides the async nature to await the completion behaves identically to {@link doesNotThrow}.
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * await assert.doesNotReject(
          *   async () => {
          *     throw new TypeError('Wrong value');
          *   },
-         *   SyntaxError,
+         *   SyntaxError
          * );
          * ```
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.doesNotReject(Promise.reject(new TypeError('Wrong value')))
          *   .then(() => {
@@ -904,20 +840,13 @@ declare module "assert" {
          * ```
          * @since v10.0.0
          */
-        function doesNotReject(
-            block: (() => Promise<unknown>) | Promise<unknown>,
-            message?: string | Error,
-        ): Promise<void>;
-        function doesNotReject(
-            block: (() => Promise<unknown>) | Promise<unknown>,
-            error: AssertPredicate,
-            message?: string | Error,
-        ): Promise<void>;
+        function doesNotReject(block: (() => Promise<unknown>) | Promise<unknown>, message?: string | Error): Promise<void>;
+        function doesNotReject(block: (() => Promise<unknown>) | Promise<unknown>, error: AssertPredicate, message?: string | Error): Promise<void>;
         /**
          * Expects the `string` input to match the regular expression.
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.match('I will fail', /pass/);
          * // AssertionError [ERR_ASSERTION]: The input did not match the regular ...
@@ -940,7 +869,7 @@ declare module "assert" {
          * Expects the `string` input not to match the regular expression.
          *
          * ```js
-         * import assert from 'node:assert/strict';
+         * import assert from 'assert/strict';
          *
          * assert.doesNotMatch('I will fail', /fail/);
          * // AssertionError [ERR_ASSERTION]: The input was expected to not match the ...
@@ -959,38 +888,25 @@ declare module "assert" {
          * @since v13.6.0, v12.16.0
          */
         function doesNotMatch(value: string, regExp: RegExp, message?: string | Error): void;
-        const strict:
-            & Omit<
-                typeof assert,
-                | "equal"
-                | "notEqual"
-                | "deepEqual"
-                | "notDeepEqual"
-                | "ok"
-                | "strictEqual"
-                | "deepStrictEqual"
-                | "ifError"
-                | "strict"
-            >
-            & {
-                (value: unknown, message?: string | Error): asserts value;
-                equal: typeof strictEqual;
-                notEqual: typeof notStrictEqual;
-                deepEqual: typeof deepStrictEqual;
-                notDeepEqual: typeof notDeepStrictEqual;
-                // Mapped types and assertion functions are incompatible?
-                // TS2775: Assertions require every name in the call target
-                // to be declared with an explicit type annotation.
-                ok: typeof ok;
-                strictEqual: typeof strictEqual;
-                deepStrictEqual: typeof deepStrictEqual;
-                ifError: typeof ifError;
-                strict: typeof strict;
-            };
+        const strict: Omit<typeof assert, 'equal' | 'notEqual' | 'deepEqual' | 'notDeepEqual' | 'ok' | 'strictEqual' | 'deepStrictEqual' | 'ifError' | 'strict'> & {
+            (value: unknown, message?: string | Error): asserts value;
+            equal: typeof strictEqual;
+            notEqual: typeof notStrictEqual;
+            deepEqual: typeof deepStrictEqual;
+            notDeepEqual: typeof notDeepStrictEqual;
+            // Mapped types and assertion functions are incompatible?
+            // TS2775: Assertions require every name in the call target
+            // to be declared with an explicit type annotation.
+            ok: typeof ok;
+            strictEqual: typeof strictEqual;
+            deepStrictEqual: typeof deepStrictEqual;
+            ifError: typeof ifError;
+            strict: typeof strict;
+        };
     }
     export = assert;
 }
-declare module "node:assert" {
-    import assert = require("assert");
+declare module 'node:assert' {
+    import assert = require('assert');
     export = assert;
 }

node_modules/@types/node/assert/strict.d.ts

@@ -1,8 +1,8 @@
-declare module "assert/strict" {
-    import { strict } from "node:assert";
+declare module 'assert/strict' {
+    import { strict } from 'node:assert';
     export = strict;
 }
-declare module "node:assert/strict" {
-    import { strict } from "node:assert";
+declare module 'node:assert/strict' {
+    import { strict } from 'node:assert';
     export = strict;
 }

node_modules/@types/node/async_hooks.d.ts

@@ -1,27 +1,19 @@
 /**
- * We strongly discourage the use of the `async_hooks` API.
- * Other APIs that can cover most of its use cases include:
- *
- * * `AsyncLocalStorage` tracks async context
- * * `process.getActiveResourcesInfo()` tracks active resources
- *
- * The `node:async_hooks` module provides an API to track asynchronous resources.
- * It can be accessed using:
+ * The `async_hooks` module provides an API to track asynchronous resources. It
+ * can be accessed using:
  *
  * ```js
- * import async_hooks from 'node:async_hooks';
+ * import async_hooks from 'async_hooks';
  * ```
  * @experimental
- * @see [source](https://github.com/nodejs/node/blob/v20.2.0/lib/async_hooks.js)
+ * @see [source](https://github.com/nodejs/node/blob/v16.9.0/lib/async_hooks.js)
  */
-declare module "async_hooks" {
+declare module 'async_hooks' {
     /**
      * ```js
-     * import { executionAsyncId } from 'node:async_hooks';
-     * import fs from 'node:fs';
+     * import { executionAsyncId } from 'async_hooks';
      *
      * console.log(executionAsyncId());  // 1 - bootstrap
-     * const path = '.';
      * fs.open(path, 'r', (err, fd) => {
      *   console.log(executionAsyncId());  // 6 - open()
      * });
@@ -59,8 +51,8 @@ declare module "async_hooks" {
      * but having an object representing the top-level can be helpful.
      *
      * ```js
-     * import { open } from 'node:fs';
-     * import { executionAsyncId, executionAsyncResource } from 'node:async_hooks';
+     * import { open } from 'fs';
+     * import { executionAsyncId, executionAsyncResource } from 'async_hooks';
      *
      * console.log(executionAsyncId(), executionAsyncResource());  // 1 {}
      * open(new URL(import.meta.url), 'r', (err, fd) => {
@@ -72,11 +64,11 @@ declare module "async_hooks" {
      * use of a tracking `Map` to store the metadata:
      *
      * ```js
-     * import { createServer } from 'node:http';
+     * import { createServer } from 'http';
      * import {
      *   executionAsyncId,
      *   executionAsyncResource,
-     *   createHook,
+     *   createHook
      * } from 'async_hooks';
      * const sym = Symbol('state'); // Private symbol to avoid pollution
      *
@@ -86,7 +78,7 @@ declare module "async_hooks" {
      *     if (cr) {
      *       resource[sym] = cr[sym];
      *     }
-     *   },
+     *   }
      * }).enable();
      *
      * const server = createServer((req, res) => {
@@ -175,11 +167,11 @@ declare module "async_hooks" {
      * specifics of all functions that can be passed to `callbacks` is in the `Hook Callbacks` section.
      *
      * ```js
-     * import { createHook } from 'node:async_hooks';
+     * import { createHook } from 'async_hooks';
      *
      * const asyncHook = createHook({
      *   init(asyncId, type, triggerAsyncId, resource) { },
-     *   destroy(asyncId) { },
+     *   destroy(asyncId) { }
      * });
      * ```
      *
@@ -231,13 +223,13 @@ declare module "async_hooks" {
      * The following is an overview of the `AsyncResource` API.
      *
      * ```js
-     * import { AsyncResource, executionAsyncId } from 'node:async_hooks';
+     * import { AsyncResource, executionAsyncId } from 'async_hooks';
      *
      * // AsyncResource() is meant to be extended. Instantiating a
      * // new AsyncResource() also triggers init. If triggerAsyncId is omitted then
      * // async_hook.executionAsyncId() is used.
      * const asyncResource = new AsyncResource(
-     *   type, { triggerAsyncId: executionAsyncId(), requireManualDestroy: false },
+     *   type, { triggerAsyncId: executionAsyncId(), requireManualDestroy: false }
      * );
      *
      * // Run a function in the execution context of the resource. This will
@@ -266,11 +258,14 @@ declare module "async_hooks" {
          * @param type The type of async event.
          * @param triggerAsyncId The ID of the execution context that created
          *   this async event (default: `executionAsyncId()`), or an
-         *   AsyncResourceOptions object (since v9.3.0)
+         *   AsyncResourceOptions object (since 9.3)
          */
         constructor(type: string, triggerAsyncId?: number | AsyncResourceOptions);
         /**
          * Binds the given function to the current execution context.
+         *
+         * The returned function will have an `asyncResource` property referencing
+         * the `AsyncResource` to which the function is bound.
          * @since v14.8.0, v12.19.0
          * @param fn The function to bind to the current execution context.
          * @param type An optional name to associate with the underlying `AsyncResource`.
@@ -278,14 +273,23 @@ declare module "async_hooks" {
         static bind<Func extends (this: ThisArg, ...args: any[]) => any, ThisArg>(
             fn: Func,
             type?: string,
-            thisArg?: ThisArg,
-        ): Func;
+            thisArg?: ThisArg
+        ): Func & {
+            asyncResource: AsyncResource;
+        };
         /**
          * Binds the given function to execute to this `AsyncResource`'s scope.
+         *
+         * The returned function will have an `asyncResource` property referencing
+         * the `AsyncResource` to which the function is bound.
          * @since v14.8.0, v12.19.0
          * @param fn The function to bind to the current `AsyncResource`.
          */
-        bind<Func extends (...args: any[]) => any>(fn: Func): Func;
+        bind<Func extends (...args: any[]) => any>(
+            fn: Func
+        ): Func & {
+            asyncResource: AsyncResource;
+        };
         /**
          * Call the provided function with the provided arguments in the execution context
          * of the async resource. This will establish the context, trigger the AsyncHooks
@@ -296,11 +300,7 @@ declare module "async_hooks" {
          * @param thisArg The receiver to be used for the function call.
          * @param args Optional arguments to pass to the function.
          */
-        runInAsyncScope<This, Result>(
-            fn: (this: This, ...args: any[]) => Result,
-            thisArg?: This,
-            ...args: any[]
-        ): Result;
+        runInAsyncScope<This, Result>(fn: (this: This, ...args: any[]) => Result, thisArg?: This, ...args: any[]): Result;
         /**
          * Call all `destroy` hooks. This should only ever be called once. An error will
          * be thrown if it is called more than once. This **must** be manually called. If
@@ -314,6 +314,7 @@ declare module "async_hooks" {
          */
         asyncId(): number;
         /**
+         *
          * @return The same `triggerAsyncId` that is passed to the `AsyncResource` constructor.
          */
         triggerAsyncId(): number;
@@ -321,17 +322,17 @@ declare module "async_hooks" {
     /**
      * This class creates stores that stay coherent through asynchronous operations.
      *
-     * While you can create your own implementation on top of the `node:async_hooks`module, `AsyncLocalStorage` should be preferred as it is a performant and memory
-     * safe implementation that involves significant optimizations that are non-obvious
-     * to implement.
+     * While you can create your own implementation on top of the `async_hooks` module,`AsyncLocalStorage` should be preferred as it is a performant and memory safe
+     * implementation that involves significant optimizations that are non-obvious to
+     * implement.
      *
      * The following example uses `AsyncLocalStorage` to build a simple logger
      * that assigns IDs to incoming HTTP requests and includes them in messages
      * logged within each request.
      *
      * ```js
-     * import http from 'node:http';
-     * import { AsyncLocalStorage } from 'node:async_hooks';
+     * import http from 'http';
+     * import { AsyncLocalStorage } from 'async_hooks';
      *
      * const asyncLocalStorage = new AsyncLocalStorage();
      *
@@ -363,48 +364,10 @@ declare module "async_hooks" {
      *
      * Each instance of `AsyncLocalStorage` maintains an independent storage context.
      * Multiple instances can safely exist simultaneously without risk of interfering
-     * with each other's data.
+     * with each other data.
      * @since v13.10.0, v12.17.0
      */
     class AsyncLocalStorage<T> {
-        /**
-         * Binds the given function to the current execution context.
-         * @since v19.8.0
-         * @experimental
-         * @param fn The function to bind to the current execution context.
-         * @return A new function that calls `fn` within the captured execution context.
-         */
-        static bind<Func extends (...args: any[]) => any>(fn: Func): Func;
-        /**
-         * Captures the current execution context and returns a function that accepts a
-         * function as an argument. Whenever the returned function is called, it
-         * calls the function passed to it within the captured context.
-         *
-         * ```js
-         * const asyncLocalStorage = new AsyncLocalStorage();
-         * const runInAsyncScope = asyncLocalStorage.run(123, () => AsyncLocalStorage.snapshot());
-         * const result = asyncLocalStorage.run(321, () => runInAsyncScope(() => asyncLocalStorage.getStore()));
-         * console.log(result);  // returns 123
-         * ```
-         *
-         * AsyncLocalStorage.snapshot() can replace the use of AsyncResource for simple
-         * async context tracking purposes, for example:
-         *
-         * ```js
-         * class Foo {
-         *   #runInAsyncScope = AsyncLocalStorage.snapshot();
-         *
-         *   get() { return this.#runInAsyncScope(() => asyncLocalStorage.getStore()); }
-         * }
-         *
-         * const foo = asyncLocalStorage.run(123, () => new Foo());
-         * console.log(asyncLocalStorage.run(321, () => foo.get())); // returns 123
-         * ```
-         * @since v19.8.0
-         * @experimental
-         * @return A new function with the signature `(fn: (...args) : R, ...args) : R`.
-         */
-        static snapshot(): <R, TArgs extends any[]>(fn: (...args: TArgs) => R, ...args: TArgs) => R;
         /**
          * Disables the instance of `AsyncLocalStorage`. All subsequent calls
          * to `asyncLocalStorage.getStore()` will return `undefined` until`asyncLocalStorage.run()` or `asyncLocalStorage.enterWith()` is called again.
@@ -432,9 +395,8 @@ declare module "async_hooks" {
         getStore(): T | undefined;
         /**
          * Runs a function synchronously within a context and returns its
-         * return value. The store is not accessible outside of the callback function.
-         * The store is accessible to any asynchronous operations created within the
-         * callback.
+         * return value. The store is not accessible outside of the callback function or
+         * the asynchronous operations created within the callback.
          *
          * The optional `args` are passed to the callback function.
          *
@@ -448,9 +410,6 @@ declare module "async_hooks" {
          * try {
          *   asyncLocalStorage.run(store, () => {
          *     asyncLocalStorage.getStore(); // Returns the store object
-         *     setTimeout(() => {
-         *       asyncLocalStorage.getStore(); // Returns the store object
-         *     }, 200);
          *     throw new Error();
          *   });
          * } catch (e) {
@@ -460,7 +419,6 @@ declare module "async_hooks" {
          * ```
          * @since v13.10.0, v12.17.0
          */
-        run<R>(store: T, callback: () => R): R;
         run<R, TArgs extends any[]>(store: T, callback: (...args: TArgs) => R, ...args: TArgs): R;
         /**
          * Runs a function synchronously outside of a context and returns its
@@ -534,6 +492,6 @@ declare module "async_hooks" {
         enterWith(store: T): void;
     }
 }
-declare module "node:async_hooks" {
-    export * from "async_hooks";
+declare module 'node:async_hooks' {
+    export * from 'async_hooks';
 }

node_modules/@types/node/cluster.d.ts

@@ -1,19 +1,18 @@
 /**
- * Clusters of Node.js processes can be used to run multiple instances of Node.js
- * that can distribute workloads among their application threads. When process
- * isolation is not needed, use the `worker_threads` module instead, which
- * allows running multiple application threads within a single Node.js instance.
+ * A single instance of Node.js runs in a single thread. To take advantage of
+ * multi-core systems, the user will sometimes want to launch a cluster of Node.js
+ * processes to handle the load.
  *
  * The cluster module allows easy creation of child processes that all share
  * server ports.
  *
  * ```js
- * import cluster from 'node:cluster';
- * import http from 'node:http';
- * import { availableParallelism } from 'node:os';
- * import process from 'node:process';
+ * import cluster from 'cluster';
+ * import http from 'http';
+ * import { cpus } from 'os';
+ * import process from 'process';
  *
- * const numCPUs = availableParallelism();
+ * const numCPUs = cpus().length;
  *
  * if (cluster.isPrimary) {
  *   console.log(`Primary ${process.pid} is running`);
@@ -50,13 +49,12 @@
  * ```
  *
  * On Windows, it is not yet possible to set up a named pipe server in a worker.
- * @see [source](https://github.com/nodejs/node/blob/v20.2.0/lib/cluster.js)
+ * @see [source](https://github.com/nodejs/node/blob/v16.9.0/lib/cluster.js)
  */
-declare module "cluster" {
-    import * as child from "node:child_process";
-    import EventEmitter = require("node:events");
-    import * as net from "node:net";
-    type SerializationType = "json" | "advanced";
+declare module 'cluster' {
+    import * as child from 'node:child_process';
+    import EventEmitter = require('node:events');
+    import * as net from 'node:net';
     export interface ClusterSettings {
         execArgv?: string[] | undefined; // default: process.execArgv
         exec?: string | undefined;
@@ -66,14 +64,11 @@ declare module "cluster" {
         uid?: number | undefined;
         gid?: number | undefined;
         inspectPort?: number | (() => number) | undefined;
-        serialization?: SerializationType | undefined;
-        cwd?: string | undefined;
-        windowsHide?: boolean | undefined;
     }
     export interface Address {
         address: string;
         port: number;
-        addressType: number | "udp4" | "udp6"; // 4, 6, -1, "udp4", "udp6"
+        addressType: number | 'udp4' | 'udp6'; // 4, 6, -1, "udp4", "udp6"
     }
     /**
      * A `Worker` object contains all public information and method about a worker.
@@ -104,9 +99,9 @@ declare module "cluster" {
         /**
          * Send a message to a worker or primary, optionally with a handle.
          *
-         * In the primary, this sends a message to a specific worker. It is identical to `ChildProcess.send()`.
+         * In the primary this sends a message to a specific worker. It is identical to `ChildProcess.send()`.
          *
-         * In a worker, this sends a message to the primary. It is identical to`process.send()`.
+         * In a worker this sends a message to the primary. It is identical to`process.send()`.
          *
          * This example will echo back all messages from the primary:
          *
@@ -125,25 +120,22 @@ declare module "cluster" {
          * @param options The `options` argument, if present, is an object used to parameterize the sending of certain types of handles. `options` supports the following properties:
          */
         send(message: child.Serializable, callback?: (error: Error | null) => void): boolean;
-        send(
-            message: child.Serializable,
-            sendHandle: child.SendHandle,
-            callback?: (error: Error | null) => void,
-        ): boolean;
-        send(
-            message: child.Serializable,
-            sendHandle: child.SendHandle,
-            options?: child.MessageOptions,
-            callback?: (error: Error | null) => void,
-        ): boolean;
+        send(message: child.Serializable, sendHandle: child.SendHandle, callback?: (error: Error | null) => void): boolean;
+        send(message: child.Serializable, sendHandle: child.SendHandle, options?: child.MessageOptions, callback?: (error: Error | null) => void): boolean;
         /**
-         * This function will kill the worker. In the primary worker, it does this by
-         * disconnecting the `worker.process`, and once disconnected, killing with`signal`. In the worker, it does it by killing the process with `signal`.
+         * This function will kill the worker. In the primary, it does this
+         * by disconnecting the `worker.process`, and once disconnected, killing
+         * with `signal`. In the worker, it does it by disconnecting the channel,
+         * and then exiting with code `0`.
          *
-         * The `kill()` function kills the worker process without waiting for a graceful
-         * disconnect, it has the same behavior as `worker.process.kill()`.
+         * Because `kill()` attempts to gracefully disconnect the worker process, it is
+         * susceptible to waiting indefinitely for the disconnect to complete. For example,
+         * if the worker enters an infinite loop, a graceful disconnect will never occur.
+         * If the graceful disconnect behavior is not needed, use `worker.process.kill()`.
          *
-         * This method is aliased as `worker.destroy()` for backwards compatibility.
+         * Causes `.exitedAfterDisconnect` to be set.
+         *
+         * This method is aliased as `worker.destroy()` for backward compatibility.
          *
          * In a worker, `process.kill()` exists, but it is not this function;
          * it is `kill()`.
@@ -196,7 +188,7 @@ declare module "cluster" {
          *   });
          *
          * } else if (cluster.isWorker) {
-         *   const net = require('node:net');
+         *   const net = require('net');
          *   const server = net.createServer((socket) => {
          *     // Connections never end
          *   });
@@ -226,12 +218,12 @@ declare module "cluster" {
          * because of exiting or being signaled). Otherwise, it returns `false`.
          *
          * ```js
-         * import cluster from 'node:cluster';
-         * import http from 'node:http';
-         * import { availableParallelism } from 'node:os';
-         * import process from 'node:process';
+         * import cluster from 'cluster';
+         * import http from 'http';
+         * import { cpus } from 'os';
+         * import process from 'process';
          *
-         * const numCPUs = availableParallelism();
+         * const numCPUs = cpus().length;
          *
          * if (cluster.isPrimary) {
          *   console.log(`Primary ${process.pid} is running`);
@@ -261,8 +253,7 @@ declare module "cluster" {
          */
         isDead(): boolean;
         /**
-         * This property is `true` if the worker exited due to `.disconnect()`.
-         * If the worker exited any other way, it is `false`. If the
+         * This property is `true` if the worker exited due to `.kill()` or`.disconnect()`. If the worker exited any other way, it is `false`. If the
          * worker has not exited, it is `undefined`.
          *
          * The boolean `worker.exitedAfterDisconnect` allows distinguishing between
@@ -292,47 +283,47 @@ declare module "cluster" {
          *   6. online
          */
         addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "disconnect", listener: () => void): this;
-        addListener(event: "error", listener: (error: Error) => void): this;
-        addListener(event: "exit", listener: (code: number, signal: string) => void): this;
-        addListener(event: "listening", listener: (address: Address) => void): this;
-        addListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
-        addListener(event: "online", listener: () => void): this;
+        addListener(event: 'disconnect', listener: () => void): this;
+        addListener(event: 'error', listener: (error: Error) => void): this;
+        addListener(event: 'exit', listener: (code: number, signal: string) => void): this;
+        addListener(event: 'listening', listener: (address: Address) => void): this;
+        addListener(event: 'message', listener: (message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
+        addListener(event: 'online', listener: () => void): this;
         emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "disconnect"): boolean;
-        emit(event: "error", error: Error): boolean;
-        emit(event: "exit", code: number, signal: string): boolean;
-        emit(event: "listening", address: Address): boolean;
-        emit(event: "message", message: any, handle: net.Socket | net.Server): boolean;
-        emit(event: "online"): boolean;
+        emit(event: 'disconnect'): boolean;
+        emit(event: 'error', error: Error): boolean;
+        emit(event: 'exit', code: number, signal: string): boolean;
+        emit(event: 'listening', address: Address): boolean;
+        emit(event: 'message', message: any, handle: net.Socket | net.Server): boolean;
+        emit(event: 'online'): boolean;
         on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "disconnect", listener: () => void): this;
-        on(event: "error", listener: (error: Error) => void): this;
-        on(event: "exit", listener: (code: number, signal: string) => void): this;
-        on(event: "listening", listener: (address: Address) => void): this;
-        on(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
-        on(event: "online", listener: () => void): this;
+        on(event: 'disconnect', listener: () => void): this;
+        on(event: 'error', listener: (error: Error) => void): this;
+        on(event: 'exit', listener: (code: number, signal: string) => void): this;
+        on(event: 'listening', listener: (address: Address) => void): this;
+        on(event: 'message', listener: (message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
+        on(event: 'online', listener: () => void): this;
         once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "disconnect", listener: () => void): this;
-        once(event: "error", listener: (error: Error) => void): this;
-        once(event: "exit", listener: (code: number, signal: string) => void): this;
-        once(event: "listening", listener: (address: Address) => void): this;
-        once(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
-        once(event: "online", listener: () => void): this;
+        once(event: 'disconnect', listener: () => void): this;
+        once(event: 'error', listener: (error: Error) => void): this;
+        once(event: 'exit', listener: (code: number, signal: string) => void): this;
+        once(event: 'listening', listener: (address: Address) => void): this;
+        once(event: 'message', listener: (message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
+        once(event: 'online', listener: () => void): this;
         prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "disconnect", listener: () => void): this;
-        prependListener(event: "error", listener: (error: Error) => void): this;
-        prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
-        prependListener(event: "listening", listener: (address: Address) => void): this;
-        prependListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
-        prependListener(event: "online", listener: () => void): this;
+        prependListener(event: 'disconnect', listener: () => void): this;
+        prependListener(event: 'error', listener: (error: Error) => void): this;
+        prependListener(event: 'exit', listener: (code: number, signal: string) => void): this;
+        prependListener(event: 'listening', listener: (address: Address) => void): this;
+        prependListener(event: 'message', listener: (message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
+        prependListener(event: 'online', listener: () => void): this;
         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "disconnect", listener: () => void): this;
-        prependOnceListener(event: "error", listener: (error: Error) => void): this;
-        prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
-        prependOnceListener(event: "listening", listener: (address: Address) => void): this;
-        prependOnceListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
-        prependOnceListener(event: "online", listener: () => void): this;
+        prependOnceListener(event: 'disconnect', listener: () => void): this;
+        prependOnceListener(event: 'error', listener: (error: Error) => void): this;
+        prependOnceListener(event: 'exit', listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: 'listening', listener: (address: Address) => void): this;
+        prependOnceListener(event: 'message', listener: (message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
+        prependOnceListener(event: 'online', listener: () => void): this;
     }
     export interface Cluster extends EventEmitter {
         disconnect(callback?: () => void): void;
@@ -364,69 +355,60 @@ declare module "cluster" {
          *   7. setup
          */
         addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "disconnect", listener: (worker: Worker) => void): this;
-        addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-        addListener(event: "fork", listener: (worker: Worker) => void): this;
-        addListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-        addListener(
-            event: "message",
-            listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void,
-        ): this; // the handle is a net.Socket or net.Server object, or undefined.
-        addListener(event: "online", listener: (worker: Worker) => void): this;
-        addListener(event: "setup", listener: (settings: ClusterSettings) => void): this;
+        addListener(event: 'disconnect', listener: (worker: Worker) => void): this;
+        addListener(event: 'exit', listener: (worker: Worker, code: number, signal: string) => void): this;
+        addListener(event: 'fork', listener: (worker: Worker) => void): this;
+        addListener(event: 'listening', listener: (worker: Worker, address: Address) => void): this;
+        addListener(event: 'message', listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
+        addListener(event: 'online', listener: (worker: Worker) => void): this;
+        addListener(event: 'setup', listener: (settings: ClusterSettings) => void): this;
         emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "disconnect", worker: Worker): boolean;
-        emit(event: "exit", worker: Worker, code: number, signal: string): boolean;
-        emit(event: "fork", worker: Worker): boolean;
-        emit(event: "listening", worker: Worker, address: Address): boolean;
-        emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
-        emit(event: "online", worker: Worker): boolean;
-        emit(event: "setup", settings: ClusterSettings): boolean;
+        emit(event: 'disconnect', worker: Worker): boolean;
+        emit(event: 'exit', worker: Worker, code: number, signal: string): boolean;
+        emit(event: 'fork', worker: Worker): boolean;
+        emit(event: 'listening', worker: Worker, address: Address): boolean;
+        emit(event: 'message', worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
+        emit(event: 'online', worker: Worker): boolean;
+        emit(event: 'setup', settings: ClusterSettings): boolean;
         on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "disconnect", listener: (worker: Worker) => void): this;
-        on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-        on(event: "fork", listener: (worker: Worker) => void): this;
-        on(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-        on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
-        on(event: "online", listener: (worker: Worker) => void): this;
-        on(event: "setup", listener: (settings: ClusterSettings) => void): this;
+        on(event: 'disconnect', listener: (worker: Worker) => void): this;
+        on(event: 'exit', listener: (worker: Worker, code: number, signal: string) => void): this;
+        on(event: 'fork', listener: (worker: Worker) => void): this;
+        on(event: 'listening', listener: (worker: Worker, address: Address) => void): this;
+        on(event: 'message', listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
+        on(event: 'online', listener: (worker: Worker) => void): this;
+        on(event: 'setup', listener: (settings: ClusterSettings) => void): this;
         once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "disconnect", listener: (worker: Worker) => void): this;
-        once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-        once(event: "fork", listener: (worker: Worker) => void): this;
-        once(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-        once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
-        once(event: "online", listener: (worker: Worker) => void): this;
-        once(event: "setup", listener: (settings: ClusterSettings) => void): this;
+        once(event: 'disconnect', listener: (worker: Worker) => void): this;
+        once(event: 'exit', listener: (worker: Worker, code: number, signal: string) => void): this;
+        once(event: 'fork', listener: (worker: Worker) => void): this;
+        once(event: 'listening', listener: (worker: Worker, address: Address) => void): this;
+        once(event: 'message', listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined.
+        once(event: 'online', listener: (worker: Worker) => void): this;
+        once(event: 'setup', listener: (settings: ClusterSettings) => void): this;
         prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "disconnect", listener: (worker: Worker) => void): this;
-        prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-        prependListener(event: "fork", listener: (worker: Worker) => void): this;
-        prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        prependListener(event: 'disconnect', listener: (worker: Worker) => void): this;
+        prependListener(event: 'exit', listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependListener(event: 'fork', listener: (worker: Worker) => void): this;
+        prependListener(event: 'listening', listener: (worker: Worker, address: Address) => void): this;
         // the handle is a net.Socket or net.Server object, or undefined.
-        prependListener(
-            event: "message",
-            listener: (worker: Worker, message: any, handle?: net.Socket | net.Server) => void,
-        ): this;
-        prependListener(event: "online", listener: (worker: Worker) => void): this;
-        prependListener(event: "setup", listener: (settings: ClusterSettings) => void): this;
+        prependListener(event: 'message', listener: (worker: Worker, message: any, handle?: net.Socket | net.Server) => void): this;
+        prependListener(event: 'online', listener: (worker: Worker) => void): this;
+        prependListener(event: 'setup', listener: (settings: ClusterSettings) => void): this;
         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): this;
-        prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-        prependOnceListener(event: "fork", listener: (worker: Worker) => void): this;
-        prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        prependOnceListener(event: 'disconnect', listener: (worker: Worker) => void): this;
+        prependOnceListener(event: 'exit', listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependOnceListener(event: 'fork', listener: (worker: Worker) => void): this;
+        prependOnceListener(event: 'listening', listener: (worker: Worker, address: Address) => void): this;
         // the handle is a net.Socket or net.Server object, or undefined.
-        prependOnceListener(
-            event: "message",
-            listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void,
-        ): this;
-        prependOnceListener(event: "online", listener: (worker: Worker) => void): this;
-        prependOnceListener(event: "setup", listener: (settings: ClusterSettings) => void): this;
+        prependOnceListener(event: 'message', listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;
+        prependOnceListener(event: 'online', listener: (worker: Worker) => void): this;
+        prependOnceListener(event: 'setup', listener: (settings: ClusterSettings) => void): this;
     }
     const cluster: Cluster;
     export default cluster;
 }
-declare module "node:cluster" {
-    export * from "cluster";
-    export { default as default } from "cluster";
+declare module 'node:cluster' {
+    export * from 'cluster';
+    export { default as default } from 'cluster';
 }

node_modules/@types/node/console.d.ts

@@ -1,11 +1,11 @@
 /**
- * The `node:console` module provides a simple debugging console that is similar to
- * the JavaScript console mechanism provided by web browsers.
+ * The `console` module provides a simple debugging console that is similar to the
+ * JavaScript console mechanism provided by web browsers.
  *
  * The module exports two specific components:
  *
- * * A `Console` class with methods such as `console.log()`, `console.error()`, and`console.warn()` that can be used to write to any Node.js stream.
- * * A global `console` instance configured to write to `process.stdout` and `process.stderr`. The global `console` can be used without calling`require('node:console')`.
+ * * A `Console` class with methods such as `console.log()`, `console.error()` and`console.warn()` that can be used to write to any Node.js stream.
+ * * A global `console` instance configured to write to `process.stdout` and `process.stderr`. The global `console` can be used without calling`require('console')`.
  *
  * _**Warning**_: The global console object's methods are neither consistently
  * synchronous like the browser APIs they resemble, nor are they consistently
@@ -53,14 +53,14 @@
  * myConsole.warn(`Danger ${name}! Danger!`);
  * // Prints: Danger Will Robinson! Danger!, to err
  * ```
- * @see [source](https://github.com/nodejs/node/blob/v20.2.0/lib/console.js)
+ * @see [source](https://github.com/nodejs/node/blob/v16.9.0/lib/console.js)
  */
-declare module "console" {
-    import console = require("node:console");
+declare module 'console' {
+    import console = require('node:console');
     export = console;
 }
-declare module "node:console" {
-    import { InspectOptions } from "node:util";
+declare module 'node:console' {
+    import { InspectOptions } from 'node:util';
     global {
         // This needs to be global to avoid TS2403 in case lib.dom.d.ts is present in the same build
         interface Console {
@@ -123,7 +123,7 @@ declare module "node:console" {
              * >
              * ```
              * @since v8.3.0
-             * @param [label='default'] The display label for the counter.
+             * @param label The display label for the counter.
              */
             count(label?: string): void;
             /**
@@ -141,7 +141,7 @@ declare module "node:console" {
              * >
              * ```
              * @since v8.3.0
-             * @param [label='default'] The display label for the counter.
+             * @param label The display label for the counter.
              */
             countReset(label?: string): void;
             /**
@@ -221,7 +221,7 @@ declare module "node:console" {
             log(message?: any, ...optionalParams: any[]): void;
             /**
              * Try to construct a table with the columns of the properties of `tabularData`(or use `properties`) and rows of `tabularData` and log it. Falls back to just
-             * logging the argument if it can't be parsed as tabular.
+             * logging the argument if it can’t be parsed as tabular.
              *
              * ```js
              * // These can't be parsed as tabular data
@@ -257,7 +257,6 @@ declare module "node:console" {
              * suitable time units to `stdout`. For example, if the elapsed
              * time is 3869ms, `console.timeEnd()` displays "3.869s".
              * @since v0.1.104
-             * @param [label='default']
              */
             time(label?: string): void;
             /**
@@ -265,13 +264,12 @@ declare module "node:console" {
              * prints the result to `stdout`:
              *
              * ```js
-             * console.time('bunch-of-stuff');
-             * // Do a bunch of stuff.
-             * console.timeEnd('bunch-of-stuff');
-             * // Prints: bunch-of-stuff: 225.438ms
+             * console.time('100-elements');
+             * for (let i = 0; i < 100; i++) {}
+             * console.timeEnd('100-elements');
+             * // prints 100-elements: 225.438ms
              * ```
              * @since v0.1.104
-             * @param [label='default']
              */
             timeEnd(label?: string): void;
             /**
@@ -287,7 +285,6 @@ declare module "node:console" {
              * console.timeEnd('process');
              * ```
              * @since v10.7.0
-             * @param [label='default']
              */
             timeLog(label?: string, ...data: any[]): void;
             /**
@@ -395,7 +392,7 @@ declare module "node:console" {
                 stdout: NodeJS.WritableStream;
                 stderr?: NodeJS.WritableStream | undefined;
                 ignoreErrors?: boolean | undefined;
-                colorMode?: boolean | "auto" | undefined;
+                colorMode?: boolean | 'auto' | undefined;
                 inspectOptions?: InspectOptions | undefined;
                 /**
                  * Set group indentation
@@ -405,8 +402,8 @@ declare module "node:console" {
             }
             interface ConsoleConstructor {
                 prototype: Console;
-                new(stdout: NodeJS.WritableStream, stderr?: NodeJS.WritableStream, ignoreErrors?: boolean): Console;
-                new(options: ConsoleConstructorOptions): Console;
+                new (stdout: NodeJS.WritableStream, stderr?: NodeJS.WritableStream, ignoreErrors?: boolean): Console;
+                new (options: ConsoleConstructorOptions): Console;
             }
         }
         var console: Console;

node_modules/@types/node/constants.d.ts

@@ -1,19 +1,18 @@
 /** @deprecated since v6.3.0 - use constants property exposed by the relevant module instead. */
-declare module "constants" {
-    import { constants as osConstants, SignalConstants } from "node:os";
-    import { constants as cryptoConstants } from "node:crypto";
-    import { constants as fsConstants } from "node:fs";
+declare module 'constants' {
+    import { constants as osConstants, SignalConstants } from 'node:os';
+    import { constants as cryptoConstants } from 'node:crypto';
+    import { constants as fsConstants } from 'node:fs';
 
-    const exp:
-        & typeof osConstants.errno
-        & typeof osConstants.priority
-        & SignalConstants
-        & typeof cryptoConstants
-        & typeof fsConstants;
+    const exp: typeof osConstants.errno &
+        typeof osConstants.priority &
+        SignalConstants &
+        typeof cryptoConstants &
+        typeof fsConstants;
     export = exp;
 }
 
-declare module "node:constants" {
-    import constants = require("constants");
+declare module 'node:constants' {
+    import constants = require('constants');
     export = constants;
 }

node_modules/@types/node/dgram.d.ts

@@ -1,13 +1,13 @@
 /**
- * The `node:dgram` module provides an implementation of UDP datagram sockets.
+ * The `dgram` module provides an implementation of UDP datagram sockets.
  *
  * ```js
- * import dgram from 'node:dgram';
+ * import dgram from 'dgram';
  *
  * const server = dgram.createSocket('udp4');
  *
  * server.on('error', (err) => {
- *   console.error(`server error:\n${err.stack}`);
+ *   console.log(`server error:\n${err.stack}`);
  *   server.close();
  * });
  *
@@ -23,15 +23,15 @@
  * server.bind(41234);
  * // Prints: server listening 0.0.0.0:41234
  * ```
- * @see [source](https://github.com/nodejs/node/blob/v20.2.0/lib/dgram.js)
+ * @see [source](https://github.com/nodejs/node/blob/v16.9.0/lib/dgram.js)
  */
-declare module "dgram" {
-    import { AddressInfo } from "node:net";
-    import * as dns from "node:dns";
-    import { Abortable, EventEmitter } from "node:events";
+declare module 'dgram' {
+    import { AddressInfo } from 'node:net';
+    import * as dns from 'node:dns';
+    import { EventEmitter, Abortable } from 'node:events';
     interface RemoteInfo {
         address: string;
-        family: "IPv4" | "IPv6";
+        family: 'IPv4' | 'IPv6';
         port: number;
         size: number;
     }
@@ -41,7 +41,7 @@ declare module "dgram" {
         exclusive?: boolean | undefined;
         fd?: number | undefined;
     }
-    type SocketType = "udp4" | "udp6";
+    type SocketType = 'udp4' | 'udp6';
     interface SocketOptions extends Abortable {
         type: SocketType;
         reuseAddr?: boolean | undefined;
@@ -51,13 +51,7 @@ declare module "dgram" {
         ipv6Only?: boolean | undefined;
         recvBufferSize?: number | undefined;
         sendBufferSize?: number | undefined;
-        lookup?:
-            | ((
-                hostname: string,
-                options: dns.LookupOneOptions,
-                callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void,
-            ) => void)
-            | undefined;
+        lookup?: ((hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void) => void) | undefined;
     }
     /**
      * Creates a `dgram.Socket` object. Once the socket is created, calling `socket.bind()` will instruct the socket to begin listening for datagram
@@ -104,8 +98,8 @@ declare module "dgram" {
          * When sharing a UDP socket across multiple `cluster` workers, the`socket.addMembership()` function must be called only once or an`EADDRINUSE` error will occur:
          *
          * ```js
-         * import cluster from 'node:cluster';
-         * import dgram from 'node:dgram';
+         * import cluster from 'cluster';
+         * import dgram from 'dgram';
          *
          * if (cluster.isPrimary) {
          *   cluster.fork(); // Works ok.
@@ -122,7 +116,7 @@ declare module "dgram" {
         addMembership(multicastAddress: string, multicastInterface?: string): void;
         /**
          * Returns an object containing the address information for a socket.
-         * For UDP sockets, this object will contain `address`, `family`, and `port`properties.
+         * For UDP sockets, this object will contain `address`, `family` and `port`properties.
          *
          * This method throws `EBADF` if called on an unbound socket.
          * @since v0.1.99
@@ -148,12 +142,12 @@ declare module "dgram" {
          * Example of a UDP server listening on port 41234:
          *
          * ```js
-         * import dgram from 'node:dgram';
+         * import dgram from 'dgram';
          *
          * const server = dgram.createSocket('udp4');
          *
          * server.on('error', (err) => {
-         *   console.error(`server error:\n${err.stack}`);
+         *   console.log(`server error:\n${err.stack}`);
          *   server.close();
          * });
          *
@@ -266,7 +260,7 @@ declare module "dgram" {
          *
          * The `address` argument is a string. If the value of `address` is a host name,
          * DNS will be used to resolve the address of the host. If `address` is not
-         * provided or otherwise nullish, `'127.0.0.1'` (for `udp4` sockets) or `'::1'`(for `udp6` sockets) will be used by default.
+         * provided or otherwise falsy, `'127.0.0.1'` (for `udp4` sockets) or `'::1'`(for `udp6` sockets) will be used by default.
          *
          * If the socket has not been previously bound with a call to `bind`, the socket
          * is assigned a random port number and is bound to the "all interfaces" address
@@ -290,8 +284,8 @@ declare module "dgram" {
          * Example of sending a UDP packet to a port on `localhost`;
          *
          * ```js
-         * import dgram from 'node:dgram';
-         * import { Buffer } from 'node:buffer';
+         * import dgram from 'dgram';
+         * import { Buffer } from 'buffer';
          *
          * const message = Buffer.from('Some bytes');
          * const client = dgram.createSocket('udp4');
@@ -303,8 +297,8 @@ declare module "dgram" {
          * Example of sending a UDP packet composed of multiple buffers to a port on`127.0.0.1`;
          *
          * ```js
-         * import dgram from 'node:dgram';
-         * import { Buffer } from 'node:buffer';
+         * import dgram from 'dgram';
+         * import { Buffer } from 'buffer';
          *
          * const buf1 = Buffer.from('Some ');
          * const buf2 = Buffer.from('bytes');
@@ -322,8 +316,8 @@ declare module "dgram" {
          * Example of sending a UDP packet using a socket connected to a port on`localhost`:
          *
          * ```js
-         * import dgram from 'node:dgram';
-         * import { Buffer } from 'node:buffer';
+         * import dgram from 'dgram';
+         * import { Buffer } from 'buffer';
          *
          * const message = Buffer.from('Some bytes');
          * const client = dgram.createSocket('udp4');
@@ -341,42 +335,12 @@ declare module "dgram" {
          * @param address Destination host name or IP address.
          * @param callback Called when the message has been sent.
          */
-        send(
-            msg: string | Uint8Array | ReadonlyArray<any>,
-            port?: number,
-            address?: string,
-            callback?: (error: Error | null, bytes: number) => void,
-        ): void;
-        send(
-            msg: string | Uint8Array | ReadonlyArray<any>,
-            port?: number,
-            callback?: (error: Error | null, bytes: number) => void,
-        ): void;
-        send(
-            msg: string | Uint8Array | ReadonlyArray<any>,
-            callback?: (error: Error | null, bytes: number) => void,
-        ): void;
-        send(
-            msg: string | Uint8Array,
-            offset: number,
-            length: number,
-            port?: number,
-            address?: string,
-            callback?: (error: Error | null, bytes: number) => void,
-        ): void;
-        send(
-            msg: string | Uint8Array,
-            offset: number,
-            length: number,
-            port?: number,
-            callback?: (error: Error | null, bytes: number) => void,
-        ): void;
-        send(
-            msg: string | Uint8Array,
-            offset: number,
-            length: number,
-            callback?: (error: Error | null, bytes: number) => void,
-        ): void;
+        send(msg: string | Uint8Array | ReadonlyArray<any>, port?: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: string | Uint8Array | ReadonlyArray<any>, port?: number, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: string | Uint8Array | ReadonlyArray<any>, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: string | Uint8Array, offset: number, length: number, port?: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: string | Uint8Array, offset: number, length: number, port?: number, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: string | Uint8Array, offset: number, length: number, callback?: (error: Error | null, bytes: number) => void): void;
         /**
          * Sets or clears the `SO_BROADCAST` socket option. When set to `true`, UDP
          * packets may be sent to a local interface's broadcast address.
@@ -487,7 +451,7 @@ declare module "dgram" {
          * TTL. If the TTL is decremented to 0 by a router, it will not be forwarded.
          * Changing TTL values is typically done for network probes or when multicasting.
          *
-         * The `ttl` argument may be between 1 and 255\. The default on most systems
+         * The `ttl` argument may be between between 1 and 255\. The default on most systems
          * is 64.
          *
          * This method throws `EBADF` if called on an unbound socket.
@@ -539,48 +503,43 @@ declare module "dgram" {
          * 5. message
          */
         addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "close", listener: () => void): this;
-        addListener(event: "connect", listener: () => void): this;
-        addListener(event: "error", listener: (err: Error) => void): this;
-        addListener(event: "listening", listener: () => void): this;
-        addListener(event: "message", listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
+        addListener(event: 'close', listener: () => void): this;
+        addListener(event: 'connect', listener: () => void): this;
+        addListener(event: 'error', listener: (err: Error) => void): this;
+        addListener(event: 'listening', listener: () => void): this;
+        addListener(event: 'message', listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
         emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "close"): boolean;
-        emit(event: "connect"): boolean;
-        emit(event: "error", err: Error): boolean;
-        emit(event: "listening"): boolean;
-        emit(event: "message", msg: Buffer, rinfo: RemoteInfo): boolean;
+        emit(event: 'close'): boolean;
+        emit(event: 'connect'): boolean;
+        emit(event: 'error', err: Error): boolean;
+        emit(event: 'listening'): boolean;
+        emit(event: 'message', msg: Buffer, rinfo: RemoteInfo): boolean;
         on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "close", listener: () => void): this;
-        on(event: "connect", listener: () => void): this;
-        on(event: "error", listener: (err: Error) => void): this;
-        on(event: "listening", listener: () => void): this;
-        on(event: "message", listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
+        on(event: 'close', listener: () => void): this;
+        on(event: 'connect', listener: () => void): this;
+        on(event: 'error', listener: (err: Error) => void): this;
+        on(event: 'listening', listener: () => void): this;
+        on(event: 'message', listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
         once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "close", listener: () => void): this;
-        once(event: "connect", listener: () => void): this;
-        once(event: "error", listener: (err: Error) => void): this;
-        once(event: "listening", listener: () => void): this;
-        once(event: "message", listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
+        once(event: 'close', listener: () => void): this;
+        once(event: 'connect', listener: () => void): this;
+        once(event: 'error', listener: (err: Error) => void): this;
+        once(event: 'listening', listener: () => void): this;
+        once(event: 'message', listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
         prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "close", listener: () => void): this;
-        prependListener(event: "connect", listener: () => void): this;
-        prependListener(event: "error", listener: (err: Error) => void): this;
-        prependListener(event: "listening", listener: () => void): this;
-        prependListener(event: "message", listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
+        prependListener(event: 'close', listener: () => void): this;
+        prependListener(event: 'connect', listener: () => void): this;
+        prependListener(event: 'error', listener: (err: Error) => void): this;
+        prependListener(event: 'listening', listener: () => void): this;
+        prependListener(event: 'message', listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "close", listener: () => void): this;
-        prependOnceListener(event: "connect", listener: () => void): this;
-        prependOnceListener(event: "error", listener: (err: Error) => void): this;
-        prependOnceListener(event: "listening", listener: () => void): this;
-        prependOnceListener(event: "message", listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
-        /**
-         * Calls `socket.close()` and returns a promise that fulfills when the socket has closed.
-         * @since v20.5.0
-         */
-        [Symbol.asyncDispose](): Promise<void>;
+        prependOnceListener(event: 'close', listener: () => void): this;
+        prependOnceListener(event: 'connect', listener: () => void): this;
+        prependOnceListener(event: 'error', listener: (err: Error) => void): this;
+        prependOnceListener(event: 'listening', listener: () => void): this;
+        prependOnceListener(event: 'message', listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
     }
 }
-declare module "node:dgram" {
-    export * from "dgram";
+declare module 'node:dgram' {
+    export * from 'dgram';
 }

node_modules/@types/node/diagnostics_channel.d.ts

@@ -1,11 +1,11 @@
 /**
- * The `node:diagnostics_channel` module provides an API to create named channels
+ * The `diagnostics_channel` module provides an API to create named channels
  * to report arbitrary message data for diagnostics purposes.
  *
  * It can be accessed using:
  *
  * ```js
- * import diagnostics_channel from 'node:diagnostics_channel';
+ * import diagnostics_channel from 'diagnostics_channel';
  * ```
  *
  * It is intended that a module writer wanting to report diagnostics messages
@@ -19,10 +19,10 @@
  * channels are used along with the shape of the message data. Channel names
  * should generally include the module name to avoid collisions with data from
  * other modules.
- * @since v15.1.0, v14.17.0
- * @see [source](https://github.com/nodejs/node/blob/v20.2.0/lib/diagnostics_channel.js)
+ * @experimental
+ * @see [source](https://github.com/nodejs/node/blob/v16.9.0/lib/diagnostics_channel.js)
  */
-declare module "diagnostics_channel" {
+declare module 'diagnostics_channel' {
     /**
      * Check if there are active subscribers to the named channel. This is helpful if
      * the message you want to send might be expensive to prepare.
@@ -31,7 +31,7 @@ declare module "diagnostics_channel" {
      * performance-sensitive code.
      *
      * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
+     * import diagnostics_channel from 'diagnostics_channel';
      *
      * if (diagnostics_channel.hasSubscribers('my-channel')) {
      *   // There are subscribers, prepare and publish message
@@ -41,14 +41,14 @@ declare module "diagnostics_channel" {
      * @param name The channel name
      * @return If there are active subscribers
      */
-    function hasSubscribers(name: string | symbol): boolean;
+    function hasSubscribers(name: string): boolean;
     /**
-     * This is the primary entry-point for anyone wanting to publish to a named
+     * This is the primary entry-point for anyone wanting to interact with a named
      * channel. It produces a channel object which is optimized to reduce overhead at
      * publish time as much as possible.
      *
      * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
+     * import diagnostics_channel from 'diagnostics_channel';
      *
      * const channel = diagnostics_channel.channel('my-channel');
      * ```
@@ -56,48 +56,11 @@ declare module "diagnostics_channel" {
      * @param name The channel name
      * @return The named channel object
      */
-    function channel(name: string | symbol): Channel;
-    type ChannelListener = (message: unknown, name: string | symbol) => void;
-    /**
-     * Register a message handler to subscribe to this channel. This message handler
-     * will be run synchronously whenever a message is published to the channel. Any
-     * errors thrown in the message handler will trigger an `'uncaughtException'`.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     *
-     * diagnostics_channel.subscribe('my-channel', (message, name) => {
-     *   // Received data
-     * });
-     * ```
-     * @since v18.7.0, v16.17.0
-     * @param name The channel name
-     * @param onMessage The handler to receive channel messages
-     */
-    function subscribe(name: string | symbol, onMessage: ChannelListener): void;
-    /**
-     * Remove a message handler previously registered to this channel with {@link subscribe}.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     *
-     * function onMessage(message, name) {
-     *   // Received data
-     * }
-     *
-     * diagnostics_channel.subscribe('my-channel', onMessage);
-     *
-     * diagnostics_channel.unsubscribe('my-channel', onMessage);
-     * ```
-     * @since v18.7.0, v16.17.0
-     * @param name The channel name
-     * @param onMessage The previous subscribed handler to remove
-     * @return `true` if the handler was found, `false` otherwise.
-     */
-    function unsubscribe(name: string | symbol, onMessage: ChannelListener): boolean;
+    function channel(name: string): Channel;
+    type ChannelListener = (name: string, message: unknown) => void;
     /**
      * The class `Channel` represents an individual named channel within the data
-     * pipeline. It is used to track subscribers and to publish messages when there
+     * pipeline. It is use to track subscribers and to publish messages when there
      * are subscribers present. It exists as a separate object to avoid channel
      * lookups at publish time, enabling very fast publish speeds and allowing
      * for heavy use while incurring very minimal cost. Channels are created with {@link channel}, constructing a channel directly
@@ -105,7 +68,7 @@ declare module "diagnostics_channel" {
      * @since v15.1.0, v14.17.0
      */
     class Channel {
-        readonly name: string | symbol;
+        readonly name: string;
         /**
          * Check if there are active subscribers to this channel. This is helpful if
          * the message you want to send might be expensive to prepare.
@@ -114,7 +77,7 @@ declare module "diagnostics_channel" {
          * performance-sensitive code.
          *
          * ```js
-         * import diagnostics_channel from 'node:diagnostics_channel';
+         * import diagnostics_channel from 'diagnostics_channel';
          *
          * const channel = diagnostics_channel.channel('my-channel');
          *
@@ -125,31 +88,14 @@ declare module "diagnostics_channel" {
          * @since v15.1.0, v14.17.0
          */
         readonly hasSubscribers: boolean;
-        private constructor(name: string | symbol);
-        /**
-         * Publish a message to any subscribers to the channel. This will trigger
-         * message handlers synchronously so they will execute within the same context.
-         *
-         * ```js
-         * import diagnostics_channel from 'node:diagnostics_channel';
-         *
-         * const channel = diagnostics_channel.channel('my-channel');
-         *
-         * channel.publish({
-         *   some: 'message',
-         * });
-         * ```
-         * @since v15.1.0, v14.17.0
-         * @param message The message to send to the channel subscribers
-         */
-        publish(message: unknown): void;
+        private constructor(name: string);
         /**
          * Register a message handler to subscribe to this channel. This message handler
          * will be run synchronously whenever a message is published to the channel. Any
          * errors thrown in the message handler will trigger an `'uncaughtException'`.
          *
          * ```js
-         * import diagnostics_channel from 'node:diagnostics_channel';
+         * import diagnostics_channel from 'diagnostics_channel';
          *
          * const channel = diagnostics_channel.channel('my-channel');
          *
@@ -158,7 +104,6 @@ declare module "diagnostics_channel" {
          * });
          * ```
          * @since v15.1.0, v14.17.0
-         * @deprecated Since v18.7.0,v16.17.0 - Use {@link subscribe(name, onMessage)}
          * @param onMessage The handler to receive channel messages
          */
         subscribe(onMessage: ChannelListener): void;
@@ -166,7 +111,7 @@ declare module "diagnostics_channel" {
          * Remove a message handler previously registered to this channel with `channel.subscribe(onMessage)`.
          *
          * ```js
-         * import diagnostics_channel from 'node:diagnostics_channel';
+         * import diagnostics_channel from 'diagnostics_channel';
          *
          * const channel = diagnostics_channel.channel('my-channel');
          *
@@ -179,13 +124,11 @@ declare module "diagnostics_channel" {
          * channel.unsubscribe(onMessage);
          * ```
          * @since v15.1.0, v14.17.0
-         * @deprecated Since v18.7.0,v16.17.0 - Use {@link unsubscribe(name, onMessage)}
          * @param onMessage The previous subscribed handler to remove
-         * @return `true` if the handler was found, `false` otherwise.
          */
         unsubscribe(onMessage: ChannelListener): void;
     }
 }
-declare module "node:diagnostics_channel" {
-    export * from "diagnostics_channel";
+declare module 'node:diagnostics_channel' {
+    export * from 'diagnostics_channel';
 }

node_modules/@types/node/dns.d.ts

@@ -1,5 +1,5 @@
 /**
- * The `node:dns` module enables name resolution. For example, use it to look up IP
+ * The `dns` module enables name resolution. For example, use it to look up IP
  * addresses of host names.
  *
  * Although named for the [Domain Name System (DNS)](https://en.wikipedia.org/wiki/Domain_Name_System), it does not always use the
@@ -9,7 +9,7 @@
  * system do, use {@link lookup}.
  *
  * ```js
- * const dns = require('node:dns');
+ * const dns = require('dns');
  *
  * dns.lookup('example.org', (err, address, family) => {
  *   console.log('address: %j family: IPv%s', address, family);
@@ -17,13 +17,13 @@
  * // address: "93.184.216.34" family: IPv4
  * ```
  *
- * All other functions in the `node:dns` module connect to an actual DNS server to
+ * All other functions in the `dns` module connect to an actual DNS server to
  * perform name resolution. They will always use the network to perform DNS
  * queries. These functions do not use the same set of configuration files used by {@link lookup} (e.g. `/etc/hosts`). Use these functions to always perform
  * DNS queries, bypassing other name-resolution facilities.
  *
  * ```js
- * const dns = require('node:dns');
+ * const dns = require('dns');
  *
  * dns.resolve4('archive.org', (err, addresses) => {
  *   if (err) throw err;
@@ -42,10 +42,10 @@
  * ```
  *
  * See the `Implementation considerations section` for more information.
- * @see [source](https://github.com/nodejs/node/blob/v20.2.0/lib/dns.js)
+ * @see [source](https://github.com/nodejs/node/blob/v16.9.0/lib/dns.js)
  */
-declare module "dns" {
-    import * as dnsPromises from "node:dns/promises";
+declare module 'dns' {
+    import * as dnsPromises from 'node:dns/promises';
     // Supported getaddrinfo flags.
     export const ADDRCONFIG: number;
     export const V4MAPPED: number;
@@ -58,9 +58,6 @@ declare module "dns" {
         family?: number | undefined;
         hints?: number | undefined;
         all?: boolean | undefined;
-        /**
-         * @default true
-         */
         verbatim?: boolean | undefined;
     }
     export interface LookupOneOptions extends LookupOptions {
@@ -76,8 +73,8 @@ declare module "dns" {
     /**
      * Resolves a host name (e.g. `'nodejs.org'`) into the first found A (IPv4) or
      * AAAA (IPv6) record. All `option` properties are optional. If `options` is an
-     * integer, then it must be `4` or `6` – if `options` is `0` or not provided, then
-     * IPv4 and IPv6 addresses are both returned if found.
+     * integer, then it must be `4` or `6` – if `options` is not provided, then IPv4
+     * and IPv6 addresses are both returned if found.
      *
      * With the `all` option set to `true`, the arguments for `callback` change to`(err, addresses)`, with `addresses` being an array of objects with the
      * properties `address` and `family`.
@@ -89,14 +86,14 @@ declare module "dns" {
      *
      * `dns.lookup()` does not necessarily have anything to do with the DNS protocol.
      * The implementation uses an operating system facility that can associate names
-     * with addresses and vice versa. This implementation can have subtle but
+     * with addresses, and vice versa. This implementation can have subtle but
      * important consequences on the behavior of any Node.js program. Please take some
      * time to consult the `Implementation considerations section` before using`dns.lookup()`.
      *
      * Example usage:
      *
      * ```js
-     * const dns = require('node:dns');
+     * const dns = require('dns');
      * const options = {
      *   family: 6,
      *   hints: dns.ADDRCONFIG | dns.V4MAPPED,
@@ -115,30 +112,11 @@ declare module "dns" {
      * If this method is invoked as its `util.promisify()` ed version, and `all`is not set to `true`, it returns a `Promise` for an `Object` with `address` and`family` properties.
      * @since v0.1.90
      */
-    export function lookup(
-        hostname: string,
-        family: number,
-        callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void,
-    ): void;
-    export function lookup(
-        hostname: string,
-        options: LookupOneOptions,
-        callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void,
-    ): void;
-    export function lookup(
-        hostname: string,
-        options: LookupAllOptions,
-        callback: (err: NodeJS.ErrnoException | null, addresses: LookupAddress[]) => void,
-    ): void;
-    export function lookup(
-        hostname: string,
-        options: LookupOptions,
-        callback: (err: NodeJS.ErrnoException | null, address: string | LookupAddress[], family: number) => void,
-    ): void;
-    export function lookup(
-        hostname: string,
-        callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void,
-    ): void;
+    export function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
+    export function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
+    export function lookup(hostname: string, options: LookupAllOptions, callback: (err: NodeJS.ErrnoException | null, addresses: LookupAddress[]) => void): void;
+    export function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException | null, address: string | LookupAddress[], family: number) => void): void;
+    export function lookup(hostname: string, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
     export namespace lookup {
         function __promisify__(hostname: string, options: LookupAllOptions): Promise<LookupAddress[]>;
         function __promisify__(hostname: string, options?: LookupOneOptions | number): Promise<LookupAddress>;
@@ -154,7 +132,7 @@ declare module "dns" {
      * On an error, `err` is an `Error` object, where `err.code` is the error code.
      *
      * ```js
-     * const dns = require('node:dns');
+     * const dns = require('dns');
      * dns.lookupService('127.0.0.1', 22, (err, hostname, service) => {
      *   console.log(hostname, service);
      *   // Prints: localhost ssh
@@ -164,15 +142,11 @@ declare module "dns" {
      * If this method is invoked as its `util.promisify()` ed version, it returns a`Promise` for an `Object` with `hostname` and `service` properties.
      * @since v0.11.14
      */
-    export function lookupService(
-        address: string,
-        port: number,
-        callback: (err: NodeJS.ErrnoException | null, hostname: string, service: string) => void,
-    ): void;
+    export function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException | null, hostname: string, service: string) => void): void;
     export namespace lookupService {
         function __promisify__(
             address: string,
-            port: number,
+            port: number
         ): Promise<{
             hostname: string;
             service: string;
@@ -191,13 +165,13 @@ declare module "dns" {
     /** @deprecated Use `AnyARecord` or `AnyAaaaRecord` instead. */
     export type AnyRecordWithTtl = AnyARecord | AnyAaaaRecord;
     export interface AnyARecord extends RecordWithTtl {
-        type: "A";
+        type: 'A';
     }
     export interface AnyAaaaRecord extends RecordWithTtl {
-        type: "AAAA";
+        type: 'AAAA';
     }
     export interface CaaRecord {
-        critical: number;
+        critial: number;
         issue?: string | undefined;
         issuewild?: string | undefined;
         iodef?: string | undefined;
@@ -209,7 +183,7 @@ declare module "dns" {
         exchange: string;
     }
     export interface AnyMxRecord extends MxRecord {
-        type: "MX";
+        type: 'MX';
     }
     export interface NaptrRecord {
         flags: string;
@@ -220,7 +194,7 @@ declare module "dns" {
         preference: number;
     }
     export interface AnyNaptrRecord extends NaptrRecord {
-        type: "NAPTR";
+        type: 'NAPTR';
     }
     export interface SoaRecord {
         nsname: string;
@@ -232,7 +206,7 @@ declare module "dns" {
         minttl: number;
     }
     export interface AnySoaRecord extends SoaRecord {
-        type: "SOA";
+        type: 'SOA';
     }
     export interface SrvRecord {
         priority: number;
@@ -241,35 +215,25 @@ declare module "dns" {
         name: string;
     }
     export interface AnySrvRecord extends SrvRecord {
-        type: "SRV";
+        type: 'SRV';
     }
     export interface AnyTxtRecord {
-        type: "TXT";
+        type: 'TXT';
         entries: string[];
     }
     export interface AnyNsRecord {
-        type: "NS";
+        type: 'NS';
         value: string;
     }
     export interface AnyPtrRecord {
-        type: "PTR";
+        type: 'PTR';
         value: string;
     }
     export interface AnyCnameRecord {
-        type: "CNAME";
+        type: 'CNAME';
         value: string;
     }
-    export type AnyRecord =
-        | AnyARecord
-        | AnyAaaaRecord
-        | AnyCnameRecord
-        | AnyMxRecord
-        | AnyNaptrRecord
-        | AnyNsRecord
-        | AnyPtrRecord
-        | AnySoaRecord
-        | AnySrvRecord
-        | AnyTxtRecord;
+    export type AnyRecord = AnyARecord | AnyAaaaRecord | AnyCnameRecord | AnyMxRecord | AnyNaptrRecord | AnyNsRecord | AnyPtrRecord | AnySoaRecord | AnySrvRecord | AnyTxtRecord;
     /**
      * Uses the DNS protocol to resolve a host name (e.g. `'nodejs.org'`) into an array
      * of the resource records. The `callback` function has arguments`(err, records)`. When successful, `records` will be an array of resource
@@ -282,85 +246,32 @@ declare module "dns" {
      * @param hostname Host name to resolve.
      * @param [rrtype='A'] Resource record type.
      */
-    export function resolve(
-        hostname: string,
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void,
-    ): void;
-    export function resolve(
-        hostname: string,
-        rrtype: "A",
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void,
-    ): void;
-    export function resolve(
-        hostname: string,
-        rrtype: "AAAA",
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void,
-    ): void;
-    export function resolve(
-        hostname: string,
-        rrtype: "ANY",
-        callback: (err: NodeJS.ErrnoException | null, addresses: AnyRecord[]) => void,
-    ): void;
-    export function resolve(
-        hostname: string,
-        rrtype: "CNAME",
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void,
-    ): void;
-    export function resolve(
-        hostname: string,
-        rrtype: "MX",
-        callback: (err: NodeJS.ErrnoException | null, addresses: MxRecord[]) => void,
-    ): void;
-    export function resolve(
-        hostname: string,
-        rrtype: "NAPTR",
-        callback: (err: NodeJS.ErrnoException | null, addresses: NaptrRecord[]) => void,
-    ): void;
-    export function resolve(
-        hostname: string,
-        rrtype: "NS",
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void,
-    ): void;
-    export function resolve(
-        hostname: string,
-        rrtype: "PTR",
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void,
-    ): void;
-    export function resolve(
-        hostname: string,
-        rrtype: "SOA",
-        callback: (err: NodeJS.ErrnoException | null, addresses: SoaRecord) => void,
-    ): void;
-    export function resolve(
-        hostname: string,
-        rrtype: "SRV",
-        callback: (err: NodeJS.ErrnoException | null, addresses: SrvRecord[]) => void,
-    ): void;
-    export function resolve(
-        hostname: string,
-        rrtype: "TXT",
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[][]) => void,
-    ): void;
+    export function resolve(hostname: string, callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: 'A', callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: 'AAAA', callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: 'ANY', callback: (err: NodeJS.ErrnoException | null, addresses: AnyRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: 'CNAME', callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: 'MX', callback: (err: NodeJS.ErrnoException | null, addresses: MxRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: 'NAPTR', callback: (err: NodeJS.ErrnoException | null, addresses: NaptrRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: 'NS', callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: 'PTR', callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: 'SOA', callback: (err: NodeJS.ErrnoException | null, addresses: SoaRecord) => void): void;
+    export function resolve(hostname: string, rrtype: 'SRV', callback: (err: NodeJS.ErrnoException | null, addresses: SrvRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: 'TXT', callback: (err: NodeJS.ErrnoException | null, addresses: string[][]) => void): void;
     export function resolve(
         hostname: string,
         rrtype: string,
-        callback: (
-            err: NodeJS.ErrnoException | null,
-            addresses: string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[],
-        ) => void,
+        callback: (err: NodeJS.ErrnoException | null, addresses: string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[]) => void
     ): void;
     export namespace resolve {
-        function __promisify__(hostname: string, rrtype?: "A" | "AAAA" | "CNAME" | "NS" | "PTR"): Promise<string[]>;
-        function __promisify__(hostname: string, rrtype: "ANY"): Promise<AnyRecord[]>;
-        function __promisify__(hostname: string, rrtype: "MX"): Promise<MxRecord[]>;
-        function __promisify__(hostname: string, rrtype: "NAPTR"): Promise<NaptrRecord[]>;
-        function __promisify__(hostname: string, rrtype: "SOA"): Promise<SoaRecord>;
-        function __promisify__(hostname: string, rrtype: "SRV"): Promise<SrvRecord[]>;
-        function __promisify__(hostname: string, rrtype: "TXT"): Promise<string[][]>;
-        function __promisify__(
-            hostname: string,
-            rrtype: string,
-        ): Promise<string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[]>;
+        function __promisify__(hostname: string, rrtype?: 'A' | 'AAAA' | 'CNAME' | 'NS' | 'PTR'): Promise<string[]>;
+        function __promisify__(hostname: string, rrtype: 'ANY'): Promise<AnyRecord[]>;
+        function __promisify__(hostname: string, rrtype: 'MX'): Promise<MxRecord[]>;
+        function __promisify__(hostname: string, rrtype: 'NAPTR'): Promise<NaptrRecord[]>;
+        function __promisify__(hostname: string, rrtype: 'SOA'): Promise<SoaRecord>;
+        function __promisify__(hostname: string, rrtype: 'SRV'): Promise<SrvRecord[]>;
+        function __promisify__(hostname: string, rrtype: 'TXT'): Promise<string[][]>;
+        function __promisify__(hostname: string, rrtype: string): Promise<string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[]>;
     }
     /**
      * Uses the DNS protocol to resolve a IPv4 addresses (`A` records) for the`hostname`. The `addresses` argument passed to the `callback` function
@@ -368,45 +279,23 @@ declare module "dns" {
      * @since v0.1.16
      * @param hostname Host name to resolve.
      */
-    export function resolve4(
-        hostname: string,
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void,
-    ): void;
-    export function resolve4(
-        hostname: string,
-        options: ResolveWithTtlOptions,
-        callback: (err: NodeJS.ErrnoException | null, addresses: RecordWithTtl[]) => void,
-    ): void;
-    export function resolve4(
-        hostname: string,
-        options: ResolveOptions,
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[] | RecordWithTtl[]) => void,
-    ): void;
+    export function resolve4(hostname: string, callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void): void;
+    export function resolve4(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException | null, addresses: RecordWithTtl[]) => void): void;
+    export function resolve4(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException | null, addresses: string[] | RecordWithTtl[]) => void): void;
     export namespace resolve4 {
         function __promisify__(hostname: string): Promise<string[]>;
         function __promisify__(hostname: string, options: ResolveWithTtlOptions): Promise<RecordWithTtl[]>;
         function __promisify__(hostname: string, options?: ResolveOptions): Promise<string[] | RecordWithTtl[]>;
     }
     /**
-     * Uses the DNS protocol to resolve IPv6 addresses (`AAAA` records) for the`hostname`. The `addresses` argument passed to the `callback` function
+     * Uses the DNS protocol to resolve a IPv6 addresses (`AAAA` records) for the`hostname`. The `addresses` argument passed to the `callback` function
      * will contain an array of IPv6 addresses.
      * @since v0.1.16
      * @param hostname Host name to resolve.
      */
-    export function resolve6(
-        hostname: string,
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void,
-    ): void;
-    export function resolve6(
-        hostname: string,
-        options: ResolveWithTtlOptions,
-        callback: (err: NodeJS.ErrnoException | null, addresses: RecordWithTtl[]) => void,
-    ): void;
-    export function resolve6(
-        hostname: string,
-        options: ResolveOptions,
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[] | RecordWithTtl[]) => void,
-    ): void;
+    export function resolve6(hostname: string, callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void): void;
+    export function resolve6(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException | null, addresses: RecordWithTtl[]) => void): void;
+    export function resolve6(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException | null, addresses: string[] | RecordWithTtl[]) => void): void;
     export namespace resolve6 {
         function __promisify__(hostname: string): Promise<string[]>;
         function __promisify__(hostname: string, options: ResolveWithTtlOptions): Promise<RecordWithTtl[]>;
@@ -417,10 +306,7 @@ declare module "dns" {
      * will contain an array of canonical name records available for the `hostname`(e.g. `['bar.example.com']`).
      * @since v0.3.2
      */
-    export function resolveCname(
-        hostname: string,
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void,
-    ): void;
+    export function resolveCname(hostname: string, callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void): void;
     export namespace resolveCname {
         function __promisify__(hostname: string): Promise<string[]>;
     }
@@ -428,12 +314,9 @@ declare module "dns" {
      * Uses the DNS protocol to resolve `CAA` records for the `hostname`. The`addresses` argument passed to the `callback` function
      * will contain an array of certification authority authorization records
      * available for the `hostname` (e.g. `[{critical: 0, iodef: 'mailto:pki@example.com'}, {critical: 128, issue: 'pki.example.com'}]`).
-     * @since v15.0.0, v14.17.0
+     * @since v15.0.0
      */
-    export function resolveCaa(
-        hostname: string,
-        callback: (err: NodeJS.ErrnoException | null, records: CaaRecord[]) => void,
-    ): void;
+    export function resolveCaa(hostname: string, callback: (err: NodeJS.ErrnoException | null, records: CaaRecord[]) => void): void;
     export namespace resolveCaa {
         function __promisify__(hostname: string): Promise<CaaRecord[]>;
     }
@@ -442,15 +325,12 @@ declare module "dns" {
      * contain an array of objects containing both a `priority` and `exchange`property (e.g. `[{priority: 10, exchange: 'mx.example.com'}, ...]`).
      * @since v0.1.27
      */
-    export function resolveMx(
-        hostname: string,
-        callback: (err: NodeJS.ErrnoException | null, addresses: MxRecord[]) => void,
-    ): void;
+    export function resolveMx(hostname: string, callback: (err: NodeJS.ErrnoException | null, addresses: MxRecord[]) => void): void;
     export namespace resolveMx {
         function __promisify__(hostname: string): Promise<MxRecord[]>;
     }
     /**
-     * Uses the DNS protocol to resolve regular expression-based records (`NAPTR`records) for the `hostname`. The `addresses` argument passed to the `callback`function will contain an array of
+     * Uses the DNS protocol to resolve regular expression based records (`NAPTR`records) for the `hostname`. The `addresses` argument passed to the `callback`function will contain an array of
      * objects with the following properties:
      *
      * * `flags`
@@ -472,10 +352,7 @@ declare module "dns" {
      * ```
      * @since v0.9.12
      */
-    export function resolveNaptr(
-        hostname: string,
-        callback: (err: NodeJS.ErrnoException | null, addresses: NaptrRecord[]) => void,
-    ): void;
+    export function resolveNaptr(hostname: string, callback: (err: NodeJS.ErrnoException | null, addresses: NaptrRecord[]) => void): void;
     export namespace resolveNaptr {
         function __promisify__(hostname: string): Promise<NaptrRecord[]>;
     }
@@ -484,10 +361,7 @@ declare module "dns" {
      * contain an array of name server records available for `hostname`(e.g. `['ns1.example.com', 'ns2.example.com']`).
      * @since v0.1.90
      */
-    export function resolveNs(
-        hostname: string,
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void,
-    ): void;
+    export function resolveNs(hostname: string, callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void): void;
     export namespace resolveNs {
         function __promisify__(hostname: string): Promise<string[]>;
     }
@@ -496,10 +370,7 @@ declare module "dns" {
      * be an array of strings containing the reply records.
      * @since v6.0.0
      */
-    export function resolvePtr(
-        hostname: string,
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void,
-    ): void;
+    export function resolvePtr(hostname: string, callback: (err: NodeJS.ErrnoException | null, addresses: string[]) => void): void;
     export namespace resolvePtr {
         function __promisify__(hostname: string): Promise<string[]>;
     }
@@ -529,10 +400,7 @@ declare module "dns" {
      * ```
      * @since v0.11.10
      */
-    export function resolveSoa(
-        hostname: string,
-        callback: (err: NodeJS.ErrnoException | null, address: SoaRecord) => void,
-    ): void;
+    export function resolveSoa(hostname: string, callback: (err: NodeJS.ErrnoException | null, address: SoaRecord) => void): void;
     export namespace resolveSoa {
         function __promisify__(hostname: string): Promise<SoaRecord>;
     }
@@ -555,10 +423,7 @@ declare module "dns" {
      * ```
      * @since v0.1.27
      */
-    export function resolveSrv(
-        hostname: string,
-        callback: (err: NodeJS.ErrnoException | null, addresses: SrvRecord[]) => void,
-    ): void;
+    export function resolveSrv(hostname: string, callback: (err: NodeJS.ErrnoException | null, addresses: SrvRecord[]) => void): void;
     export namespace resolveSrv {
         function __promisify__(hostname: string): Promise<SrvRecord[]>;
     }
@@ -569,10 +434,7 @@ declare module "dns" {
      * treated separately.
      * @since v0.1.27
      */
-    export function resolveTxt(
-        hostname: string,
-        callback: (err: NodeJS.ErrnoException | null, addresses: string[][]) => void,
-    ): void;
+    export function resolveTxt(hostname: string, callback: (err: NodeJS.ErrnoException | null, addresses: string[][]) => void): void;
     export namespace resolveTxt {
         function __promisify__(hostname: string): Promise<string[][]>;
     }
@@ -606,10 +468,7 @@ declare module "dns" {
      * DNS server operators may choose not to respond to `ANY`queries. It may be better to call individual methods like {@link resolve4},{@link resolveMx}, and so on. For more details, see [RFC
      * 8482](https://tools.ietf.org/html/rfc8482).
      */
-    export function resolveAny(
-        hostname: string,
-        callback: (err: NodeJS.ErrnoException | null, addresses: AnyRecord[]) => void,
-    ): void;
+    export function resolveAny(hostname: string, callback: (err: NodeJS.ErrnoException | null, addresses: AnyRecord[]) => void): void;
     export namespace resolveAny {
         function __promisify__(hostname: string): Promise<AnyRecord[]>;
     }
@@ -621,18 +480,7 @@ declare module "dns" {
      * one of the `DNS error codes`.
      * @since v0.1.16
      */
-    export function reverse(
-        ip: string,
-        callback: (err: NodeJS.ErrnoException | null, hostnames: string[]) => void,
-    ): void;
-    /**
-     * Get the default value for `verbatim` in {@link lookup} and `dnsPromises.lookup()`. The value could be:
-     *
-     * * `ipv4first`: for `verbatim` defaulting to `false`.
-     * * `verbatim`: for `verbatim` defaulting to `true`.
-     * @since v20.1.0
-     */
-    export function getDefaultResultOrder(): "ipv4first" | "verbatim";
+    export function reverse(ip: string, callback: (err: NodeJS.ErrnoException | null, hostnames: string[]) => void): void;
     /**
      * Sets the IP address and port of servers to be used when performing DNS
      * resolution. The `servers` argument is an array of [RFC 5952](https://tools.ietf.org/html/rfc5952#section-6) formatted
@@ -679,18 +527,16 @@ declare module "dns" {
      */
     export function getServers(): string[];
     /**
-     * Set the default value of `verbatim` in {@link lookup} and `dnsPromises.lookup()`. The value could be:
+     * Set the default value of `verbatim` in {@link lookup}. The value could be:
+     * - `ipv4first`: sets default `verbatim` `false`.
+     * - `verbatim`: sets default `verbatim` `true`.
      *
-     * * `ipv4first`: sets default `verbatim` `false`.
-     * * `verbatim`: sets default `verbatim` `true`.
-     *
-     * The default is `verbatim` and {@link setDefaultResultOrder} have higher
-     * priority than `--dns-result-order`. When using `worker threads`,{@link setDefaultResultOrder} from the main thread won't affect the default
-     * dns orders in workers.
-     * @since v16.4.0, v14.18.0
-     * @param order must be `'ipv4first'` or `'verbatim'`.
+     * The default is `ipv4first` and {@link setDefaultResultOrder} have higher priority than `--dns-result-order`.
+     * When using worker threads, {@link setDefaultResultOrder} from the main thread won't affect the default dns orders in workers.
+     * @since v14.18.0
+     * @param order must be 'ipv4first' or 'verbatim'.
      */
-    export function setDefaultResultOrder(order: "ipv4first" | "verbatim"): void;
+    export function setDefaultResultOrder(order: 'ipv4first' | 'verbatim'): void;
     // Error codes
     export const NODATA: string;
     export const FORMERR: string;
@@ -731,7 +577,7 @@ declare module "dns" {
      * other resolvers:
      *
      * ```js
-     * const { Resolver } = require('node:dns');
+     * const { Resolver } = require('dns');
      * const resolver = new Resolver();
      * resolver.setServers(['4.4.4.4']);
      *
@@ -741,7 +587,7 @@ declare module "dns" {
      * });
      * ```
      *
-     * The following methods from the `node:dns` module are available:
+     * The following methods from the `dns` module are available:
      *
      * * `resolver.getServers()`
      * * `resolver.resolve()`
@@ -774,7 +620,6 @@ declare module "dns" {
         resolve4: typeof resolve4;
         resolve6: typeof resolve6;
         resolveAny: typeof resolveAny;
-        resolveCaa: typeof resolveCaa;
         resolveCname: typeof resolveCname;
         resolveMx: typeof resolveMx;
         resolveNaptr: typeof resolveNaptr;
@@ -789,13 +634,13 @@ declare module "dns" {
          * This allows programs to specify outbound interfaces when used on multi-homed
          * systems.
          *
-         * If a v4 or v6 address is not specified, it is set to the default and the
+         * If a v4 or v6 address is not specified, it is set to the default, and the
          * operating system will choose a local address automatically.
          *
          * The resolver will use the v4 local address when making requests to IPv4 DNS
          * servers, and the v6 local address when making requests to IPv6 DNS servers.
          * The `rrtype` of resolution requests has no impact on the local address used.
-         * @since v15.1.0, v14.17.0
+         * @since v15.1.0
          * @param [ipv4='0.0.0.0'] A string representation of an IPv4 address.
          * @param [ipv6='::0'] A string representation of an IPv6 address.
          */
@@ -804,6 +649,6 @@ declare module "dns" {
     }
     export { dnsPromises as promises };
 }
-declare module "node:dns" {
-    export * from "dns";
+declare module 'node:dns' {
+    export * from 'dns';
 }

node_modules/@types/node/dns/promises.d.ts

@@ -1,26 +1,26 @@
 /**
  * The `dns.promises` API provides an alternative set of asynchronous DNS methods
  * that return `Promise` objects rather than using callbacks. The API is accessible
- * via `require('node:dns').promises` or `require('node:dns/promises')`.
+ * via `require('dns').promises` or `require('dns/promises')`.
  * @since v10.6.0
  */
-declare module "dns/promises" {
+declare module 'dns/promises' {
     import {
+        LookupAddress,
+        LookupOneOptions,
+        LookupAllOptions,
+        LookupOptions,
         AnyRecord,
         CaaRecord,
-        LookupAddress,
-        LookupAllOptions,
-        LookupOneOptions,
-        LookupOptions,
         MxRecord,
         NaptrRecord,
+        SoaRecord,
+        SrvRecord,
+        ResolveWithTtlOptions,
         RecordWithTtl,
         ResolveOptions,
         ResolverOptions,
-        ResolveWithTtlOptions,
-        SoaRecord,
-        SrvRecord,
-    } from "node:dns";
+    } from 'node:dns';
     /**
      * Returns an array of IP address strings, formatted according to [RFC 5952](https://tools.ietf.org/html/rfc5952#section-6),
      * that are currently configured for DNS resolution. A string will include a port
@@ -52,7 +52,7 @@ declare module "dns/promises" {
      *
      * `dnsPromises.lookup()` does not necessarily have anything to do with the DNS
      * protocol. The implementation uses an operating system facility that can
-     * associate names with addresses and vice versa. This implementation can have
+     * associate names with addresses, and vice versa. This implementation can have
      * subtle but important consequences on the behavior of any Node.js program. Please
      * take some time to consult the `Implementation considerations section` before
      * using `dnsPromises.lookup()`.
@@ -60,7 +60,7 @@ declare module "dns/promises" {
      * Example usage:
      *
      * ```js
-     * const dns = require('node:dns');
+     * const dns = require('dns');
      * const dnsPromises = dns.promises;
      * const options = {
      *   family: 6,
@@ -96,7 +96,7 @@ declare module "dns/promises" {
      * On error, the `Promise` is rejected with an `Error` object, where `err.code`is the error code.
      *
      * ```js
-     * const dnsPromises = require('node:dns').promises;
+     * const dnsPromises = require('dns').promises;
      * dnsPromises.lookupService('127.0.0.1', 22).then((result) => {
      *   console.log(result.hostname, result.service);
      *   // Prints: localhost ssh
@@ -106,7 +106,7 @@ declare module "dns/promises" {
      */
     function lookupService(
         address: string,
-        port: number,
+        port: number
     ): Promise<{
         hostname: string;
         service: string;
@@ -125,22 +125,19 @@ declare module "dns/promises" {
      * @param [rrtype='A'] Resource record type.
      */
     function resolve(hostname: string): Promise<string[]>;
-    function resolve(hostname: string, rrtype: "A"): Promise<string[]>;
-    function resolve(hostname: string, rrtype: "AAAA"): Promise<string[]>;
-    function resolve(hostname: string, rrtype: "ANY"): Promise<AnyRecord[]>;
-    function resolve(hostname: string, rrtype: "CAA"): Promise<CaaRecord[]>;
-    function resolve(hostname: string, rrtype: "CNAME"): Promise<string[]>;
-    function resolve(hostname: string, rrtype: "MX"): Promise<MxRecord[]>;
-    function resolve(hostname: string, rrtype: "NAPTR"): Promise<NaptrRecord[]>;
-    function resolve(hostname: string, rrtype: "NS"): Promise<string[]>;
-    function resolve(hostname: string, rrtype: "PTR"): Promise<string[]>;
-    function resolve(hostname: string, rrtype: "SOA"): Promise<SoaRecord>;
-    function resolve(hostname: string, rrtype: "SRV"): Promise<SrvRecord[]>;
-    function resolve(hostname: string, rrtype: "TXT"): Promise<string[][]>;
-    function resolve(
-        hostname: string,
-        rrtype: string,
-    ): Promise<string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[]>;
+    function resolve(hostname: string, rrtype: 'A'): Promise<string[]>;
+    function resolve(hostname: string, rrtype: 'AAAA'): Promise<string[]>;
+    function resolve(hostname: string, rrtype: 'ANY'): Promise<AnyRecord[]>;
+    function resolve(hostname: string, rrtype: 'CAA'): Promise<CaaRecord[]>;
+    function resolve(hostname: string, rrtype: 'CNAME'): Promise<string[]>;
+    function resolve(hostname: string, rrtype: 'MX'): Promise<MxRecord[]>;
+    function resolve(hostname: string, rrtype: 'NAPTR'): Promise<NaptrRecord[]>;
+    function resolve(hostname: string, rrtype: 'NS'): Promise<string[]>;
+    function resolve(hostname: string, rrtype: 'PTR'): Promise<string[]>;
+    function resolve(hostname: string, rrtype: 'SOA'): Promise<SoaRecord>;
+    function resolve(hostname: string, rrtype: 'SRV'): Promise<SrvRecord[]>;
+    function resolve(hostname: string, rrtype: 'TXT'): Promise<string[][]>;
+    function resolve(hostname: string, rrtype: string): Promise<string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[]>;
     /**
      * Uses the DNS protocol to resolve IPv4 addresses (`A` records) for the`hostname`. On success, the `Promise` is resolved with an array of IPv4
      * addresses (e.g. `['74.125.79.104', '74.125.79.105', '74.125.79.106']`).
@@ -192,7 +189,7 @@ declare module "dns/promises" {
      * Uses the DNS protocol to resolve `CAA` records for the `hostname`. On success,
      * the `Promise` is resolved with an array of objects containing available
      * certification authority authorization records available for the `hostname`(e.g. `[{critical: 0, iodef: 'mailto:pki@example.com'},{critical: 128, issue: 'pki.example.com'}]`).
-     * @since v15.0.0, v14.17.0
+     * @since v15.0.0
      */
     function resolveCaa(hostname: string): Promise<CaaRecord[]>;
     /**
@@ -209,7 +206,7 @@ declare module "dns/promises" {
      */
     function resolveMx(hostname: string): Promise<MxRecord[]>;
     /**
-     * Uses the DNS protocol to resolve regular expression-based records (`NAPTR`records) for the `hostname`. On success, the `Promise` is resolved with an array
+     * Uses the DNS protocol to resolve regular expression based records (`NAPTR`records) for the `hostname`. On success, the `Promise` is resolved with an array
      * of objects with the following properties:
      *
      * * `flags`
@@ -335,61 +332,16 @@ declare module "dns/promises" {
      */
     function setServers(servers: ReadonlyArray<string>): void;
     /**
-     * Set the default value of `verbatim` in `dns.lookup()` and `dnsPromises.lookup()`. The value could be:
+     * Set the default value of `verbatim` in {@link lookup}. The value could be:
+     * - `ipv4first`: sets default `verbatim` `false`.
+     * - `verbatim`: sets default `verbatim` `true`.
      *
-     * * `ipv4first`: sets default `verbatim` `false`.
-     * * `verbatim`: sets default `verbatim` `true`.
-     *
-     * The default is `verbatim` and `dnsPromises.setDefaultResultOrder()` have
-     * higher priority than `--dns-result-order`. When using `worker threads`,`dnsPromises.setDefaultResultOrder()` from the main thread won't affect the
-     * default dns orders in workers.
-     * @since v16.4.0, v14.18.0
-     * @param order must be `'ipv4first'` or `'verbatim'`.
-     */
-    function setDefaultResultOrder(order: "ipv4first" | "verbatim"): void;
-    /**
-     * An independent resolver for DNS requests.
-     *
-     * Creating a new resolver uses the default server settings. Setting
-     * the servers used for a resolver using `resolver.setServers()` does not affect
-     * other resolvers:
-     *
-     * ```js
-     * const { Resolver } = require('node:dns').promises;
-     * const resolver = new Resolver();
-     * resolver.setServers(['4.4.4.4']);
-     *
-     * // This request will use the server at 4.4.4.4, independent of global settings.
-     * resolver.resolve4('example.org').then((addresses) => {
-     *   // ...
-     * });
-     *
-     * // Alternatively, the same code can be written using async-await style.
-     * (async function() {
-     *   const addresses = await resolver.resolve4('example.org');
-     * })();
-     * ```
-     *
-     * The following methods from the `dnsPromises` API are available:
-     *
-     * * `resolver.getServers()`
-     * * `resolver.resolve()`
-     * * `resolver.resolve4()`
-     * * `resolver.resolve6()`
-     * * `resolver.resolveAny()`
-     * * `resolver.resolveCaa()`
-     * * `resolver.resolveCname()`
-     * * `resolver.resolveMx()`
-     * * `resolver.resolveNaptr()`
-     * * `resolver.resolveNs()`
-     * * `resolver.resolvePtr()`
-     * * `resolver.resolveSoa()`
-     * * `resolver.resolveSrv()`
-     * * `resolver.resolveTxt()`
-     * * `resolver.reverse()`
-     * * `resolver.setServers()`
-     * @since v10.6.0
+     * The default is `ipv4first` and {@link setDefaultResultOrder} have higher priority than `--dns-result-order`.
+     * When using worker threads, {@link setDefaultResultOrder} from the main thread won't affect the default dns orders in workers.
+     * @since v14.18.0
+     * @param order must be 'ipv4first' or 'verbatim'.
      */
+    function setDefaultResultOrder(order: 'ipv4first' | 'verbatim'): void;
     class Resolver {
         constructor(options?: ResolverOptions);
         cancel(): void;
@@ -398,7 +350,6 @@ declare module "dns/promises" {
         resolve4: typeof resolve4;
         resolve6: typeof resolve6;
         resolveAny: typeof resolveAny;
-        resolveCaa: typeof resolveCaa;
         resolveCname: typeof resolveCname;
         resolveMx: typeof resolveMx;
         resolveNaptr: typeof resolveNaptr;
@@ -412,6 +363,6 @@ declare module "dns/promises" {
         setServers: typeof setServers;
     }
 }
-declare module "node:dns/promises" {
-    export * from "dns/promises";
+declare module 'node:dns/promises' {
+    export * from 'dns/promises';
 }

node_modules/@types/node/dom-events.d.ts

@@ -1,122 +0,0 @@
-export {}; // Don't export anything!
-
-//// DOM-like Events
-// NB: The Event / EventTarget / EventListener implementations below were copied
-// from lib.dom.d.ts, then edited to reflect Node's documentation at
-// https://nodejs.org/api/events.html#class-eventtarget.
-// Please read that link to understand important implementation differences.
-
-// This conditional type will be the existing global Event in a browser, or
-// the copy below in a Node environment.
-type __Event = typeof globalThis extends { onmessage: any; Event: any } ? {}
-    : {
-        /** This is not used in Node.js and is provided purely for completeness. */
-        readonly bubbles: boolean;
-        /** Alias for event.stopPropagation(). This is not used in Node.js and is provided purely for completeness. */
-        cancelBubble: () => void;
-        /** True if the event was created with the cancelable option */
-        readonly cancelable: boolean;
-        /** This is not used in Node.js and is provided purely for completeness. */
-        readonly composed: boolean;
-        /** Returns an array containing the current EventTarget as the only entry or empty if the event is not being dispatched. This is not used in Node.js and is provided purely for completeness. */
-        composedPath(): [EventTarget?];
-        /** Alias for event.target. */
-        readonly currentTarget: EventTarget | null;
-        /** Is true if cancelable is true and event.preventDefault() has been called. */
-        readonly defaultPrevented: boolean;
-        /** This is not used in Node.js and is provided purely for completeness. */
-        readonly eventPhase: 0 | 2;
-        /** The `AbortSignal` "abort" event is emitted with `isTrusted` set to `true`. The value is `false` in all other cases. */
-        readonly isTrusted: boolean;
-        /** Sets the `defaultPrevented` property to `true` if `cancelable` is `true`. */
-        preventDefault(): void;
-        /** This is not used in Node.js and is provided purely for completeness. */
-        returnValue: boolean;
-        /** Alias for event.target. */
-        readonly srcElement: EventTarget | null;
-        /** Stops the invocation of event listeners after the current one completes. */
-        stopImmediatePropagation(): void;
-        /** This is not used in Node.js and is provided purely for completeness. */
-        stopPropagation(): void;
-        /** The `EventTarget` dispatching the event */
-        readonly target: EventTarget | null;
-        /** The millisecond timestamp when the Event object was created. */
-        readonly timeStamp: number;
-        /** Returns the type of event, e.g. "click", "hashchange", or "submit". */
-        readonly type: string;
-    };
-
-// See comment above explaining conditional type
-type __EventTarget = typeof globalThis extends { onmessage: any; EventTarget: any } ? {}
-    : {
-        /**
-         * Adds a new handler for the `type` event. Any given `listener` is added only once per `type` and per `capture` option value.
-         *
-         * If the `once` option is true, the `listener` is removed after the next time a `type` event is dispatched.
-         *
-         * The `capture` option is not used by Node.js in any functional way other than tracking registered event listeners per the `EventTarget` specification.
-         * Specifically, the `capture` option is used as part of the key when registering a `listener`.
-         * Any individual `listener` may be added once with `capture = false`, and once with `capture = true`.
-         */
-        addEventListener(
-            type: string,
-            listener: EventListener | EventListenerObject,
-            options?: AddEventListenerOptions | boolean,
-        ): void;
-        /** Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise. */
-        dispatchEvent(event: Event): boolean;
-        /** Removes the event listener in target's event listener list with the same type, callback, and options. */
-        removeEventListener(
-            type: string,
-            listener: EventListener | EventListenerObject,
-            options?: EventListenerOptions | boolean,
-        ): void;
-    };
-
-interface EventInit {
-    bubbles?: boolean;
-    cancelable?: boolean;
-    composed?: boolean;
-}
-
-interface EventListenerOptions {
-    /** Not directly used by Node.js. Added for API completeness. Default: `false`. */
-    capture?: boolean;
-}
-
-interface AddEventListenerOptions extends EventListenerOptions {
-    /** When `true`, the listener is automatically removed when it is first invoked. Default: `false`. */
-    once?: boolean;
-    /** When `true`, serves as a hint that the listener will not call the `Event` object's `preventDefault()` method. Default: false. */
-    passive?: boolean;
-}
-
-interface EventListener {
-    (evt: Event): void;
-}
-
-interface EventListenerObject {
-    handleEvent(object: Event): void;
-}
-
-import {} from "events"; // Make this an ambient declaration
-declare global {
-    /** An event which takes place in the DOM. */
-    interface Event extends __Event {}
-    var Event: typeof globalThis extends { onmessage: any; Event: infer T } ? T
-        : {
-            prototype: __Event;
-            new(type: string, eventInitDict?: EventInit): __Event;
-        };
-
-    /**
-     * EventTarget is a DOM interface implemented by objects that can
-     * receive events and may have listeners for them.
-     */
-    interface EventTarget extends __EventTarget {}
-    var EventTarget: typeof globalThis extends { onmessage: any; EventTarget: infer T } ? T
-        : {
-            prototype: __EventTarget;
-            new(): __EventTarget;
-        };
-}

node_modules/@types/node/domain.d.ts

@@ -1,7 +1,6 @@
 /**
  * **This module is pending deprecation.** Once a replacement API has been
- * finalized, this module will be fully deprecated. Most developers should
- * **not** have cause to use this module. Users who absolutely must have
+ * finalized, this module will be fully deprecated. Most developers should**not** have cause to use this module. Users who absolutely must have
  * the functionality that domains provide may rely on it for the time being
  * but should expect to have to migrate to a different solution
  * in the future.
@@ -12,10 +11,10 @@
  * will be notified, rather than losing the context of the error in the`process.on('uncaughtException')` handler, or causing the program to
  * exit immediately with an error code.
  * @deprecated Since v1.4.2 - Deprecated
- * @see [source](https://github.com/nodejs/node/blob/v20.2.0/lib/domain.js)
+ * @see [source](https://github.com/nodejs/node/blob/v16.9.0/lib/domain.js)
  */
-declare module "domain" {
-    import EventEmitter = require("node:events");
+declare module 'domain' {
+    import EventEmitter = require('node:events');
     /**
      * The `Domain` class encapsulates the functionality of routing errors and
      * uncaught exceptions to the active `Domain` object.
@@ -56,15 +55,15 @@ declare module "domain" {
         exit(): void;
         /**
          * Run the supplied function in the context of the domain, implicitly
-         * binding all event emitters, timers, and low-level requests that are
+         * binding all event emitters, timers, and lowlevel requests that are
          * created in that context. Optionally, arguments can be passed to
          * the function.
          *
          * This is the most basic way to use a domain.
          *
          * ```js
-         * const domain = require('node:domain');
-         * const fs = require('node:fs');
+         * const domain = require('domain');
+         * const fs = require('fs');
          * const d = domain.create();
          * d.on('error', (er) => {
          *   console.error('Caught error!', er);
@@ -165,6 +164,6 @@ declare module "domain" {
     }
     function create(): Domain;
 }
-declare module "node:domain" {
-    export * from "domain";
+declare module 'node:domain' {
+    export * from 'domain';
 }

node_modules/@types/node/events.d.ts

@@ -22,7 +22,7 @@
  * the `eventEmitter.emit()` method is used to trigger the event.
  *
  * ```js
- * import { EventEmitter } from 'node:events';
+ * const EventEmitter = require('events');
  *
  * class MyEmitter extends EventEmitter {}
  *
@@ -32,61 +32,25 @@
  * });
  * myEmitter.emit('event');
  * ```
- * @see [source](https://github.com/nodejs/node/blob/v20.2.0/lib/events.js)
+ * @see [source](https://github.com/nodejs/node/blob/v16.9.0/lib/events.js)
  */
-declare module "events" {
-    import { AsyncResource, AsyncResourceOptions } from "node:async_hooks";
-    // NOTE: This class is in the docs but is **not actually exported** by Node.
-    // If https://github.com/nodejs/node/issues/39903 gets resolved and Node
-    // actually starts exporting the class, uncomment below.
-    // import { EventListener, EventListenerObject } from '__dom-events';
-    // /** The NodeEventTarget is a Node.js-specific extension to EventTarget that emulates a subset of the EventEmitter API. */
-    // interface NodeEventTarget extends EventTarget {
-    //     /**
-    //      * Node.js-specific extension to the `EventTarget` class that emulates the equivalent `EventEmitter` API.
-    //      * The only difference between `addListener()` and `addEventListener()` is that addListener() will return a reference to the EventTarget.
-    //      */
-    //     addListener(type: string, listener: EventListener | EventListenerObject, options?: { once: boolean }): this;
-    //     /** Node.js-specific extension to the `EventTarget` class that returns an array of event `type` names for which event listeners are registered. */
-    //     eventNames(): string[];
-    //     /** Node.js-specific extension to the `EventTarget` class that returns the number of event listeners registered for the `type`. */
-    //     listenerCount(type: string): number;
-    //     /** Node.js-specific alias for `eventTarget.removeListener()`. */
-    //     off(type: string, listener: EventListener | EventListenerObject): this;
-    //     /** Node.js-specific alias for `eventTarget.addListener()`. */
-    //     on(type: string, listener: EventListener | EventListenerObject, options?: { once: boolean }): this;
-    //     /** Node.js-specific extension to the `EventTarget` class that adds a `once` listener for the given event `type`. This is equivalent to calling `on` with the `once` option set to `true`. */
-    //     once(type: string, listener: EventListener | EventListenerObject): this;
-    //     /**
-    //      * Node.js-specific extension to the `EventTarget` class.
-    //      * If `type` is specified, removes all registered listeners for `type`,
-    //      * otherwise removes all registered listeners.
-    //      */
-    //     removeAllListeners(type: string): this;
-    //     /**
-    //      * Node.js-specific extension to the `EventTarget` class that removes the listener for the given `type`.
-    //      * The only difference between `removeListener()` and `removeEventListener()` is that `removeListener()` will return a reference to the `EventTarget`.
-    //      */
-    //     removeListener(type: string, listener: EventListener | EventListenerObject): this;
-    // }
+declare module 'events' {
     interface EventEmitterOptions {
         /**
          * Enables automatic capturing of promise rejection.
          */
         captureRejections?: boolean | undefined;
     }
-    // Any EventTarget with a Node-style `once` function
-    interface _NodeEventTarget {
+    interface NodeEventTarget {
         once(eventName: string | symbol, listener: (...args: any[]) => void): this;
     }
-    // Any EventTarget with a DOM-style `addEventListener`
-    interface _DOMEventTarget {
+    interface DOMEventTarget {
         addEventListener(
             eventName: string,
             listener: (...args: any[]) => void,
             opts?: {
                 once: boolean;
-            },
+            }
         ): any;
     }
     interface StaticEventEmitterOptions {
@@ -94,10 +58,10 @@ declare module "events" {
     }
     interface EventEmitter extends NodeJS.EventEmitter {}
     /**
-     * The `EventEmitter` class is defined and exposed by the `node:events` module:
+     * The `EventEmitter` class is defined and exposed by the `events` module:
      *
      * ```js
-     * import { EventEmitter } from 'node:events';
+     * const EventEmitter = require('events');
      * ```
      *
      * All `EventEmitter`s emit the event `'newListener'` when new listeners are
@@ -108,9 +72,6 @@ declare module "events" {
      */
     class EventEmitter {
         constructor(options?: EventEmitterOptions);
-
-        [EventEmitter.captureRejectionSymbol]?(error: Error, event: string, ...args: any[]): void;
-
         /**
          * Creates a `Promise` that is fulfilled when the `EventEmitter` emits the given
          * event or that is rejected if the `EventEmitter` emits `'error'` while waiting.
@@ -121,28 +82,31 @@ declare module "events" {
          * semantics and does not listen to the `'error'` event.
          *
          * ```js
-         * import { once, EventEmitter } from 'node:events';
-         * import process from 'node:process';
+         * const { once, EventEmitter } = require('events');
          *
-         * const ee = new EventEmitter();
+         * async function run() {
+         *   const ee = new EventEmitter();
          *
-         * process.nextTick(() => {
-         *   ee.emit('myevent', 42);
-         * });
+         *   process.nextTick(() => {
+         *     ee.emit('myevent', 42);
+         *   });
          *
-         * const [value] = await once(ee, 'myevent');
-         * console.log(value);
+         *   const [value] = await once(ee, 'myevent');
+         *   console.log(value);
          *
-         * const err = new Error('kaboom');
-         * process.nextTick(() => {
-         *   ee.emit('error', err);
-         * });
+         *   const err = new Error('kaboom');
+         *   process.nextTick(() => {
+         *     ee.emit('error', err);
+         *   });
          *
-         * try {
-         *   await once(ee, 'myevent');
-         * } catch (err) {
-         *   console.error('error happened', err);
+         *   try {
+         *     await once(ee, 'myevent');
+         *   } catch (err) {
+         *     console.log('error happened', err);
+         *   }
          * }
+         *
+         * run();
          * ```
          *
          * The special handling of the `'error'` event is only used when `events.once()`is used to wait for another event. If `events.once()` is used to wait for the
@@ -150,13 +114,13 @@ declare module "events" {
          * special handling:
          *
          * ```js
-         * import { EventEmitter, once } from 'node:events';
+         * const { EventEmitter, once } = require('events');
          *
          * const ee = new EventEmitter();
          *
          * once(ee, 'error')
          *   .then(([err]) => console.log('ok', err.message))
-         *   .catch((err) => console.error('error', err.message));
+         *   .catch((err) => console.log('error', err.message));
          *
          * ee.emit('error', new Error('boom'));
          *
@@ -166,7 +130,7 @@ declare module "events" {
          * An `AbortSignal` can be used to cancel waiting for the event:
          *
          * ```js
-         * import { EventEmitter, once } from 'node:events';
+         * const { EventEmitter, once } = require('events');
          *
          * const ee = new EventEmitter();
          * const ac = new AbortController();
@@ -190,32 +154,29 @@ declare module "events" {
          * ```
          * @since v11.13.0, v10.16.0
          */
-        static once(
-            emitter: _NodeEventTarget,
-            eventName: string | symbol,
-            options?: StaticEventEmitterOptions,
-        ): Promise<any[]>;
-        static once(emitter: _DOMEventTarget, eventName: string, options?: StaticEventEmitterOptions): Promise<any[]>;
+        static once(emitter: NodeEventTarget, eventName: string | symbol, options?: StaticEventEmitterOptions): Promise<any[]>;
+        static once(emitter: DOMEventTarget, eventName: string, options?: StaticEventEmitterOptions): Promise<any[]>;
         /**
          * ```js
-         * import { on, EventEmitter } from 'node:events';
-         * import process from 'node:process';
+         * const { on, EventEmitter } = require('events');
          *
-         * const ee = new EventEmitter();
+         * (async () => {
+         *   const ee = new EventEmitter();
          *
-         * // Emit later on
-         * process.nextTick(() => {
-         *   ee.emit('foo', 'bar');
-         *   ee.emit('foo', 42);
-         * });
+         *   // Emit later on
+         *   process.nextTick(() => {
+         *     ee.emit('foo', 'bar');
+         *     ee.emit('foo', 42);
+         *   });
          *
-         * for await (const event of on(ee, 'foo')) {
-         *   // The execution of this inner block is synchronous and it
-         *   // processes one event at a time (even with await). Do not use
-         *   // if concurrent execution is required.
-         *   console.log(event); // prints ['bar'] [42]
-         * }
-         * // Unreachable here
+         *   for await (const event of on(ee, 'foo')) {
+         *     // The execution of this inner block is synchronous and it
+         *     // processes one event at a time (even with await). Do not use
+         *     // if concurrent execution is required.
+         *     console.log(event); // prints ['bar'] [42]
+         *   }
+         *   // Unreachable here
+         * })();
          * ```
          *
          * Returns an `AsyncIterator` that iterates `eventName` events. It will throw
@@ -226,9 +187,7 @@ declare module "events" {
          * An `AbortSignal` can be used to cancel waiting on events:
          *
          * ```js
-         * import { on, EventEmitter } from 'node:events';
-         * import process from 'node:process';
-         *
+         * const { on, EventEmitter } = require('events');
          * const ac = new AbortController();
          *
          * (async () => {
@@ -255,17 +214,12 @@ declare module "events" {
          * @param eventName The name of the event being listened for
          * @return that iterates `eventName` events emitted by the `emitter`
          */
-        static on(
-            emitter: NodeJS.EventEmitter,
-            eventName: string,
-            options?: StaticEventEmitterOptions,
-        ): AsyncIterableIterator<any>;
+        static on(emitter: NodeJS.EventEmitter, eventName: string, options?: StaticEventEmitterOptions): AsyncIterableIterator<any>;
         /**
          * A class method that returns the number of listeners for the given `eventName`registered on the given `emitter`.
          *
          * ```js
-         * import { EventEmitter, listenerCount } from 'node:events';
-         *
+         * const { EventEmitter, listenerCount } = require('events');
          * const myEmitter = new EventEmitter();
          * myEmitter.on('event', () => {});
          * myEmitter.on('event', () => {});
@@ -288,164 +242,43 @@ declare module "events" {
          * event target. This is useful for debugging and diagnostic purposes.
          *
          * ```js
-         * import { getEventListeners, EventEmitter } from 'node:events';
+         * const { getEventListeners, EventEmitter } = require('events');
          *
          * {
          *   const ee = new EventEmitter();
          *   const listener = () => console.log('Events are fun');
          *   ee.on('foo', listener);
-         *   console.log(getEventListeners(ee, 'foo')); // [ [Function: listener] ]
+         *   getEventListeners(ee, 'foo'); // [listener]
          * }
          * {
          *   const et = new EventTarget();
          *   const listener = () => console.log('Events are fun');
          *   et.addEventListener('foo', listener);
-         *   console.log(getEventListeners(et, 'foo')); // [ [Function: listener] ]
+         *   getEventListeners(et, 'foo'); // [listener]
          * }
          * ```
-         * @since v15.2.0, v14.17.0
+         * @since v15.2.0
          */
-        static getEventListeners(emitter: _DOMEventTarget | NodeJS.EventEmitter, name: string | symbol): Function[];
+        static getEventListeners(emitter: DOMEventTarget | NodeJS.EventEmitter, name: string | symbol): Function[];
         /**
-         * Returns the currently set max amount of listeners.
+         * This symbol shall be used to install a listener for only monitoring `'error'`
+         * events. Listeners installed using this symbol are called before the regular
+         * `'error'` listeners are called.
          *
-         * For `EventEmitter`s this behaves exactly the same as calling `.getMaxListeners` on
-         * the emitter.
-         *
-         * For `EventTarget`s this is the only way to get the max event listeners for the
-         * event target. If the number of event handlers on a single EventTarget exceeds
-         * the max set, the EventTarget will print a warning.
-         *
-         * ```js
-         * import { getMaxListeners, setMaxListeners, EventEmitter } from 'node:events';
-         *
-         * {
-         *   const ee = new EventEmitter();
-         *   console.log(getMaxListeners(ee)); // 10
-         *   setMaxListeners(11, ee);
-         *   console.log(getMaxListeners(ee)); // 11
-         * }
-         * {
-         *   const et = new EventTarget();
-         *   console.log(getMaxListeners(et)); // 10
-         *   setMaxListeners(11, et);
-         *   console.log(getMaxListeners(et)); // 11
-         * }
-         * ```
-         * @since v19.9.0
-         */
-        static getMaxListeners(emitter: _DOMEventTarget | NodeJS.EventEmitter): number;
-        /**
-         * ```js
-         * import { setMaxListeners, EventEmitter } from 'node:events';
-         *
-         * const target = new EventTarget();
-         * const emitter = new EventEmitter();
-         *
-         * setMaxListeners(5, target, emitter);
-         * ```
-         * @since v15.4.0
-         * @param n A non-negative number. The maximum number of listeners per `EventTarget` event.
-         * @param eventsTargets Zero or more {EventTarget} or {EventEmitter} instances. If none are specified, `n` is set as the default max for all newly created {EventTarget} and {EventEmitter}
-         * objects.
-         */
-        static setMaxListeners(n?: number, ...eventTargets: Array<_DOMEventTarget | NodeJS.EventEmitter>): void;
-        /**
-         * Listens once to the `abort` event on the provided `signal`.
-         *
-         * Listening to the `abort` event on abort signals is unsafe and may
-         * lead to resource leaks since another third party with the signal can
-         * call `e.stopImmediatePropagation()`. Unfortunately Node.js cannot change
-         * this since it would violate the web standard. Additionally, the original
-         * API makes it easy to forget to remove listeners.
-         *
-         * This API allows safely using `AbortSignal`s in Node.js APIs by solving these
-         * two issues by listening to the event such that `stopImmediatePropagation` does
-         * not prevent the listener from running.
-         *
-         * Returns a disposable so that it may be unsubscribed from more easily.
-         *
-         * ```js
-         * import { addAbortListener } from 'node:events';
-         *
-         * function example(signal) {
-         *   let disposable;
-         *   try {
-         *     signal.addEventListener('abort', (e) => e.stopImmediatePropagation());
-         *     disposable = addAbortListener(signal, (e) => {
-         *       // Do something when signal is aborted.
-         *     });
-         *   } finally {
-         *     disposable?.[Symbol.dispose]();
-         *   }
-         * }
-         * ```
-         * @since v20.5.0
-         * @experimental
-         * @return Disposable that removes the `abort` listener.
-         */
-        static addAbortListener(signal: AbortSignal, resource: (event: Event) => void): Disposable;
-        /**
-         * This symbol shall be used to install a listener for only monitoring `'error'`events. Listeners installed using this symbol are called before the regular`'error'` listeners are called.
-         *
-         * Installing a listener using this symbol does not change the behavior once an`'error'` event is emitted. Therefore, the process will still crash if no
+         * Installing a listener using this symbol does not change the behavior once an
+         * `'error'` event is emitted, therefore the process will still crash if no
          * regular `'error'` listener is installed.
-         * @since v13.6.0, v12.17.0
          */
         static readonly errorMonitor: unique symbol;
-        /**
-         * Value: `Symbol.for('nodejs.rejection')`
-         *
-         * See how to write a custom `rejection handler`.
-         * @since v13.4.0, v12.16.0
-         */
         static readonly captureRejectionSymbol: unique symbol;
         /**
-         * Value: [boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Boolean_type)
-         *
-         * Change the default `captureRejections` option on all new `EventEmitter` objects.
-         * @since v13.4.0, v12.16.0
+         * Sets or gets the default captureRejection value for all emitters.
          */
+        // TODO: These should be described using static getter/setter pairs:
         static captureRejections: boolean;
-        /**
-         * By default, a maximum of `10` listeners can be registered for any single
-         * event. This limit can be changed for individual `EventEmitter` instances
-         * using the `emitter.setMaxListeners(n)` method. To change the default
-         * for _all_`EventEmitter` instances, the `events.defaultMaxListeners`property can be used. If this value is not a positive number, a `RangeError`is thrown.
-         *
-         * Take caution when setting the `events.defaultMaxListeners` because the
-         * change affects _all_`EventEmitter` instances, including those created before
-         * the change is made. However, calling `emitter.setMaxListeners(n)` still has
-         * precedence over `events.defaultMaxListeners`.
-         *
-         * This is not a hard limit. The `EventEmitter` instance will allow
-         * more listeners to be added but will output a trace warning to stderr indicating
-         * that a "possible EventEmitter memory leak" has been detected. For any single`EventEmitter`, the `emitter.getMaxListeners()` and `emitter.setMaxListeners()`methods can be used to
-         * temporarily avoid this warning:
-         *
-         * ```js
-         * import { EventEmitter } from 'node:events';
-         * const emitter = new EventEmitter();
-         * emitter.setMaxListeners(emitter.getMaxListeners() + 1);
-         * emitter.once('event', () => {
-         *   // do stuff
-         *   emitter.setMaxListeners(Math.max(emitter.getMaxListeners() - 1, 0));
-         * });
-         * ```
-         *
-         * The `--trace-warnings` command-line flag can be used to display the
-         * stack trace for such warnings.
-         *
-         * The emitted warning can be inspected with `process.on('warning')` and will
-         * have the additional `emitter`, `type`, and `count` properties, referring to
-         * the event emitter instance, the event's name and the number of attached
-         * listeners, respectively.
-         * Its `name` property is set to `'MaxListenersExceededWarning'`.
-         * @since v0.11.2
-         */
         static defaultMaxListeners: number;
     }
-    import internal = require("node:events");
+    import internal = require('node:events');
     namespace EventEmitter {
         // Should just be `export { EventEmitter }`, but that doesn't work in TypeScript 3.4
         export { internal as EventEmitter };
@@ -455,54 +288,10 @@ declare module "events" {
              */
             signal?: AbortSignal | undefined;
         }
-
-        export interface EventEmitterReferencingAsyncResource extends AsyncResource {
-            readonly eventEmitter: EventEmitterAsyncResource;
-        }
-
-        export interface EventEmitterAsyncResourceOptions extends AsyncResourceOptions, EventEmitterOptions {
-            /**
-             * The type of async event, this is required when instantiating `EventEmitterAsyncResource`
-             * directly rather than as a child class.
-             * @default new.target.name if instantiated as a child class.
-             */
-            name?: string;
-        }
-
-        /**
-         * Integrates `EventEmitter` with `AsyncResource` for `EventEmitter`s that require
-         * manual async tracking. Specifically, all events emitted by instances of
-         * `EventEmitterAsyncResource` will run within its async context.
-         *
-         * The EventEmitterAsyncResource class has the same methods and takes the
-         * same options as EventEmitter and AsyncResource themselves.
-         * @throws if `options.name` is not provided when instantiated directly.
-         * @since v17.4.0, v16.14.0
-         */
-        export class EventEmitterAsyncResource extends EventEmitter {
-            /**
-             * @param options Only optional in child class.
-             */
-            constructor(options?: EventEmitterAsyncResourceOptions);
-            /**
-             * Call all destroy hooks. This should only ever be called once. An
-             * error will be thrown if it is called more than once. This must be
-             * manually called. If the resource is left to be collected by the GC then
-             * the destroy hooks will never be called.
-             */
-            emitDestroy(): void;
-            /** The unique asyncId assigned to the resource. */
-            readonly asyncId: number;
-            /** The same triggerAsyncId that is passed to the AsyncResource constructor. */
-            readonly triggerAsyncId: number;
-            /** The underlying AsyncResource */
-            readonly asyncResource: EventEmitterReferencingAsyncResource;
-        }
     }
     global {
         namespace NodeJS {
             interface EventEmitter {
-                [EventEmitter.captureRejectionSymbol]?(error: Error, event: string, ...args: any[]): void;
                 /**
                  * Alias for `emitter.on(eventName, listener)`.
                  * @since v0.1.26
@@ -526,7 +315,6 @@ declare module "events" {
                  * event listener to the beginning of the listeners array.
                  *
                  * ```js
-                 * import { EventEmitter } from 'node:events';
                  * const myEE = new EventEmitter();
                  * myEE.on('foo', () => console.log('a'));
                  * myEE.prependListener('foo', () => console.log('b'));
@@ -556,7 +344,6 @@ declare module "events" {
                  * event listener to the beginning of the listeners array.
                  *
                  * ```js
-                 * import { EventEmitter } from 'node:events';
                  * const myEE = new EventEmitter();
                  * myEE.once('foo', () => console.log('a'));
                  * myEE.prependOnceListener('foo', () => console.log('b'));
@@ -588,12 +375,10 @@ declare module "events" {
                  * called multiple times to remove each instance.
                  *
                  * Once an event is emitted, all listeners attached to it at the
-                 * time of emitting are called in order. This implies that any`removeListener()` or `removeAllListeners()` calls _after_ emitting and _before_ the last listener finishes execution
-                 * will not remove them from`emit()` in progress. Subsequent events behave as expected.
+                 * time of emitting are called in order. This implies that any`removeListener()` or `removeAllListeners()` calls _after_ emitting and_before_ the last listener finishes execution will
+                 * not remove them from`emit()` in progress. Subsequent events behave as expected.
                  *
                  * ```js
-                 * import { EventEmitter } from 'node:events';
-                 * class MyEmitter extends EventEmitter {}
                  * const myEmitter = new MyEmitter();
                  *
                  * const callbackA = () => {
@@ -634,7 +419,6 @@ declare module "events" {
                  * recently added instance. In the example the `once('ping')`listener is removed:
                  *
                  * ```js
-                 * import { EventEmitter } from 'node:events';
                  * const ee = new EventEmitter();
                  *
                  * function pong() {
@@ -703,7 +487,6 @@ declare module "events" {
                  * including any wrappers (such as those created by `.once()`).
                  *
                  * ```js
-                 * import { EventEmitter } from 'node:events';
                  * const emitter = new EventEmitter();
                  * emitter.once('log', () => console.log('log once'));
                  *
@@ -736,7 +519,7 @@ declare module "events" {
                  * Returns `true` if the event had listeners, `false` otherwise.
                  *
                  * ```js
-                 * import { EventEmitter } from 'node:events';
+                 * const EventEmitter = require('events');
                  * const myEmitter = new EventEmitter();
                  *
                  * // First listener
@@ -771,14 +554,11 @@ declare module "events" {
                  */
                 emit(eventName: string | symbol, ...args: any[]): boolean;
                 /**
-                 * Returns the number of listeners listening for the event named `eventName`.
-                 * If `listener` is provided, it will return how many times the listener is found
-                 * in the list of the listeners of the event.
+                 * Returns the number of listeners listening to the event named `eventName`.
                  * @since v3.2.0
                  * @param eventName The name of the event being listened for
-                 * @param listener The event handler function
                  */
-                listenerCount(eventName: string | symbol, listener?: Function): number;
+                listenerCount(eventName: string | symbol): number;
                 /**
                  * Adds the `listener` function to the _beginning_ of the listeners array for the
                  * event named `eventName`. No checks are made to see if the `listener` has
@@ -798,7 +578,7 @@ declare module "events" {
                  */
                 prependListener(eventName: string | symbol, listener: (...args: any[]) => void): this;
                 /**
-                 * Adds a **one-time**`listener` function for the event named `eventName` to the _beginning_ of the listeners array. The next time `eventName` is triggered, this
+                 * Adds a **one-time**`listener` function for the event named `eventName` to the_beginning_ of the listeners array. The next time `eventName` is triggered, this
                  * listener is removed, and then invoked.
                  *
                  * ```js
@@ -818,8 +598,7 @@ declare module "events" {
                  * listeners. The values in the array are strings or `Symbol`s.
                  *
                  * ```js
-                 * import { EventEmitter } from 'node:events';
-                 *
+                 * const EventEmitter = require('events');
                  * const myEE = new EventEmitter();
                  * myEE.on('foo', () => {});
                  * myEE.on('bar', () => {});
@@ -838,7 +617,7 @@ declare module "events" {
     }
     export = EventEmitter;
 }
-declare module "node:events" {
-    import events = require("events");
+declare module 'node:events' {
+    import events = require('events');
     export = events;
 }

node_modules/@types/node/fs/promises.d.ts

@@ -8,52 +8,45 @@
  * concurrent modifications on the same file or data corruption may occur.
  * @since v10.0.0
  */
-declare module "fs/promises" {
-    import { Abortable } from "node:events";
-    import { Stream } from "node:stream";
-    import { ReadableStream } from "node:stream/web";
+declare module 'fs/promises' {
+    import { Abortable } from 'node:events';
+    import { Stream } from 'node:stream';
     import {
+        Stats,
         BigIntStats,
-        BigIntStatsFs,
-        BufferEncodingOption,
-        constants as fsConstants,
-        CopyOptions,
-        Dir,
-        Dirent,
-        MakeDirectoryOptions,
-        Mode,
-        ObjectEncodingOptions,
-        OpenDirOptions,
-        OpenMode,
-        PathLike,
-        ReadStream,
+        StatOptions,
+        WriteVResult,
         ReadVResult,
+        PathLike,
         RmDirOptions,
         RmOptions,
-        StatFsOptions,
-        StatOptions,
-        Stats,
-        StatsFs,
-        TimeLike,
-        WatchEventType,
+        MakeDirectoryOptions,
+        Dirent,
+        OpenDirOptions,
+        Dir,
+        ObjectEncodingOptions,
+        BufferEncodingOption,
+        OpenMode,
+        Mode,
         WatchOptions,
+        WatchEventType,
+        CopyOptions,
+        ReadStream,
         WriteStream,
-        WriteVResult,
-    } from "node:fs";
-    import { Interface as ReadlineInterface } from "node:readline";
+    } from 'node:fs';
     interface FileChangeInfo<T extends string | Buffer> {
         eventType: WatchEventType;
-        filename: T | null;
+        filename: T;
     }
     interface FlagAndOpenMode {
         mode?: Mode | undefined;
         flag?: OpenMode | undefined;
     }
-    interface FileReadResult<T extends NodeJS.ArrayBufferView> {
+    interface FileReadResult<T extends ArrayBufferView> {
         bytesRead: number;
         buffer: T;
     }
-    interface FileReadOptions<T extends NodeJS.ArrayBufferView = Buffer> {
+    interface FileReadOptions<T extends ArrayBufferView = Buffer> {
         /**
          * @default `Buffer.alloc(0xffff)`
          */
@@ -81,14 +74,6 @@ declare module "fs/promises" {
         autoClose?: boolean | undefined;
         emitClose?: boolean | undefined;
         start?: number | undefined;
-        highWaterMark?: number | undefined;
-    }
-    interface ReadableWebStreamOptions {
-        /**
-         * Whether to open a normal or a `'bytes'` stream.
-         * @since v20.0.0
-         */
-        type?: "bytes" | undefined;
     }
     // TODO: Add `EventEmitter` close
     interface FileHandle {
@@ -105,10 +90,7 @@ declare module "fs/promises" {
          * @since v10.0.0
          * @return Fulfills with `undefined` upon success.
          */
-        appendFile(
-            data: string | Uint8Array,
-            options?: (ObjectEncodingOptions & FlagAndOpenMode) | BufferEncoding | null,
-        ): Promise<void>;
+        appendFile(data: string | Uint8Array, options?: (ObjectEncodingOptions & FlagAndOpenMode) | BufferEncoding | null): Promise<void>;
         /**
          * Changes the ownership of the file. A wrapper for [`chown(2)`](http://man7.org/linux/man-pages/man2/chown.2.html).
          * @since v10.0.0
@@ -125,8 +107,8 @@ declare module "fs/promises" {
          */
         chmod(mode: Mode): Promise<void>;
         /**
-         * Unlike the 16 KiB default `highWaterMark` for a `stream.Readable`, the stream
-         * returned by this method has a default `highWaterMark` of 64 KiB.
+         * Unlike the 16 kb default `highWaterMark` for a `stream.Readable`, the stream
+         * returned by this method has a default `highWaterMark` of 64 kb.
          *
          * `options` can include `start` and `end` values to read a range of bytes from
          * the file instead of the entire file. Both `start` and `end` are inclusive and
@@ -144,7 +126,7 @@ declare module "fs/promises" {
          * destroyed.  Set the `emitClose` option to `false` to change this behavior.
          *
          * ```js
-         * import { open } from 'node:fs/promises';
+         * import { open } from 'fs/promises';
          *
          * const fd = await open('/dev/input/event0');
          * // Create a stream from some character device.
@@ -170,7 +152,7 @@ declare module "fs/promises" {
          * An example to read the last 10 bytes of a file which is 100 bytes long:
          *
          * ```js
-         * import { open } from 'node:fs/promises';
+         * import { open } from 'fs/promises';
          *
          * const fd = await open('sample.txt');
          * fd.createReadStream({ start: 90, end: 99 });
@@ -181,9 +163,9 @@ declare module "fs/promises" {
         /**
          * `options` may also include a `start` option to allow writing data at some
          * position past the beginning of the file, allowed values are in the
-         * \[0, [`Number.MAX_SAFE_INTEGER`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/MAX_SAFE_INTEGER)\] range. Modifying a file rather than
-         * replacing it may require the `flags` `open` option to be set to `r+` rather than
-         * the default `r`. The `encoding` can be any one of those accepted by `Buffer`.
+         * \[0, [`Number.MAX_SAFE_INTEGER`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/MAX_SAFE_INTEGER)\] range. Modifying a file rather than replacing
+         * it may require the `flags` `open` option to be set to `r+` rather than the
+         * default `r`. The `encoding` can be any one of those accepted by `Buffer`.
          *
          * If `autoClose` is set to true (default behavior) on `'error'` or `'finish'`the file descriptor will be closed automatically. If `autoClose` is false,
          * then the file descriptor won't be closed, even if there's an error.
@@ -209,7 +191,7 @@ declare module "fs/promises" {
          * device. The specific implementation is operating system and device specific.
          * Refer to the POSIX [`fsync(2)`](http://man7.org/linux/man-pages/man2/fsync.2.html) documentation for more detail.
          * @since v10.0.0
-         * @return Fulfills with `undefined` upon success.
+         * @return Fufills with `undefined` upon success.
          */
         sync(): Promise<void>;
         /**
@@ -225,38 +207,8 @@ declare module "fs/promises" {
          * integer, the current file position will remain unchanged.
          * @return Fulfills upon success with an object with two properties:
          */
-        read<T extends NodeJS.ArrayBufferView>(
-            buffer: T,
-            offset?: number | null,
-            length?: number | null,
-            position?: number | null,
-        ): Promise<FileReadResult<T>>;
-        read<T extends NodeJS.ArrayBufferView = Buffer>(options?: FileReadOptions<T>): Promise<FileReadResult<T>>;
-        /**
-         * Returns a `ReadableStream` that may be used to read the files data.
-         *
-         * An error will be thrown if this method is called more than once or is called
-         * after the `FileHandle` is closed or closing.
-         *
-         * ```js
-         * import {
-         *   open,
-         * } from 'node:fs/promises';
-         *
-         * const file = await open('./some/file/to/read');
-         *
-         * for await (const chunk of file.readableWebStream())
-         *   console.log(chunk);
-         *
-         * await file.close();
-         * ```
-         *
-         * While the `ReadableStream` will read the file to completion, it will not
-         * close the `FileHandle` automatically. User code must still call the`fileHandle.close()` method.
-         * @since v17.0.0
-         * @experimental
-         */
-        readableWebStream(options?: ReadableWebStreamOptions): ReadableStream;
+        read<T extends ArrayBufferView>(buffer: T, offset?: number | null, length?: number | null, position?: number | null): Promise<FileReadResult<T>>;
+        read<T extends ArrayBufferView = Buffer>(options?: FileReadOptions<T>): Promise<FileReadResult<T>>;
         /**
          * Asynchronously reads the entire contents of a file.
          *
@@ -275,7 +227,7 @@ declare module "fs/promises" {
             options?: {
                 encoding?: null | undefined;
                 flag?: OpenMode | undefined;
-            } | null,
+            } | null
         ): Promise<Buffer>;
         /**
          * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
@@ -286,10 +238,10 @@ declare module "fs/promises" {
         readFile(
             options:
                 | {
-                    encoding: BufferEncoding;
-                    flag?: OpenMode | undefined;
-                }
-                | BufferEncoding,
+                      encoding: BufferEncoding;
+                      flag?: OpenMode | undefined;
+                  }
+                | BufferEncoding
         ): Promise<string>;
         /**
          * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
@@ -300,27 +252,11 @@ declare module "fs/promises" {
         readFile(
             options?:
                 | (ObjectEncodingOptions & {
-                    flag?: OpenMode | undefined;
-                })
+                      flag?: OpenMode | undefined;
+                  })
                 | BufferEncoding
-                | null,
+                | null
         ): Promise<string | Buffer>;
-        /**
-         * Convenience method to create a `readline` interface and stream over the file.
-         * See `filehandle.createReadStream()` for the options.
-         *
-         * ```js
-         * import { open } from 'node:fs/promises';
-         *
-         * const file = await open('./some/file/to/read');
-         *
-         * for await (const line of file.readLines()) {
-         *   console.log(line);
-         * }
-         * ```
-         * @since v18.11.0
-         */
-        readLines(options?: CreateReadStreamOptions): ReadlineInterface;
         /**
          * @since v10.0.0
          * @return Fulfills with an {fs.Stats} for the file.
@@ -328,12 +264,12 @@ declare module "fs/promises" {
         stat(
             opts?: StatOptions & {
                 bigint?: false | undefined;
-            },
+            }
         ): Promise<Stats>;
         stat(
             opts: StatOptions & {
                 bigint: true;
-            },
+            }
         ): Promise<BigIntStats>;
         stat(opts?: StatOptions): Promise<Stats | BigIntStats>;
         /**
@@ -345,7 +281,7 @@ declare module "fs/promises" {
          * The following example retains only the first four bytes of the file:
          *
          * ```js
-         * import { open } from 'node:fs/promises';
+         * import { open } from 'fs/promises';
          *
          * let filehandle = null;
          * try {
@@ -369,12 +305,13 @@ declare module "fs/promises" {
          * Change the file system timestamps of the object referenced by the `FileHandle` then resolves the promise with no arguments upon success.
          * @since v10.0.0
          */
-        utimes(atime: TimeLike, mtime: TimeLike): Promise<void>;
+        utimes(atime: string | number | Date, mtime: string | number | Date): Promise<void>;
         /**
          * Asynchronously writes data to a file, replacing the file if it already exists.`data` can be a string, a buffer, an
-         * [AsyncIterable](https://tc39.github.io/ecma262/#sec-asynciterable-interface), or an
-         * [Iterable](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols#The_iterable_protocol) object.
-         * The promise is resolved with no arguments upon success.
+         * [AsyncIterable](https://tc39.github.io/ecma262/#sec-asynciterable-interface) or
+         * [Iterable](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols#The_iterable_protocol) object, or an
+         * object with an own `toString` function
+         * property. The promise is resolved with no arguments upon success.
          *
          * If `options` is a string, then it specifies the `encoding`.
          *
@@ -388,33 +325,32 @@ declare module "fs/promises" {
          * beginning of the file.
          * @since v10.0.0
          */
-        writeFile(
-            data: string | Uint8Array,
-            options?: (ObjectEncodingOptions & FlagAndOpenMode & Abortable) | BufferEncoding | null,
-        ): Promise<void>;
+        writeFile(data: string | Uint8Array, options?: (ObjectEncodingOptions & FlagAndOpenMode & Abortable) | BufferEncoding | null): Promise<void>;
         /**
          * Write `buffer` to the file.
          *
+         * If `buffer` is a plain object, it must have an own (not inherited) `toString`function property.
+         *
          * The promise is resolved with an object containing two properties:
          *
          * It is unsafe to use `filehandle.write()` multiple times on the same file
          * without waiting for the promise to be resolved (or rejected). For this
-         * scenario, use `filehandle.createWriteStream()`.
+         * scenario, use `fs.createWriteStream()`.
          *
          * On Linux, positional writes do not work when the file is opened in append mode.
          * The kernel ignores the position argument and always appends the data to
          * the end of the file.
          * @since v10.0.0
-         * @param offset The start position from within `buffer` where the data to write begins.
-         * @param [length=buffer.byteLength - offset] The number of bytes from `buffer` to write.
-         * @param [position='null'] The offset from the beginning of the file where the data from `buffer` should be written. If `position` is not a `number`, the data will be written at the current
-         * position. See the POSIX pwrite(2) documentation for more detail.
+         * @param [offset=0] The start position from within `buffer` where the data to write begins.
+         * @param [length=buffer.byteLength] The number of bytes from `buffer` to write.
+         * @param position The offset from the beginning of the file where the data from `buffer` should be written. If `position` is not a `number`, the data will be written at the current position.
+         * See the POSIX pwrite(2) documentation for more detail.
          */
         write<TBuffer extends Uint8Array>(
             buffer: TBuffer,
             offset?: number | null,
             length?: number | null,
-            position?: number | null,
+            position?: number | null
         ): Promise<{
             bytesWritten: number;
             buffer: TBuffer;
@@ -422,7 +358,7 @@ declare module "fs/promises" {
         write(
             data: string,
             position?: number | null,
-            encoding?: BufferEncoding | null,
+            encoding?: BufferEncoding | null
         ): Promise<{
             bytesWritten: number;
             buffer: string;
@@ -439,14 +375,14 @@ declare module "fs/promises" {
          * The kernel ignores the position argument and always appends the data to
          * the end of the file.
          * @since v12.9.0
-         * @param [position='null'] The offset from the beginning of the file where the data from `buffers` should be written. If `position` is not a `number`, the data will be written at the current
+         * @param position The offset from the beginning of the file where the data from `buffers` should be written. If `position` is not a `number`, the data will be written at the current
          * position.
          */
         writev(buffers: ReadonlyArray<NodeJS.ArrayBufferView>, position?: number): Promise<WriteVResult>;
         /**
          * Read from a file and write to an array of [ArrayBufferView](https://developer.mozilla.org/en-US/docs/Web/API/ArrayBufferView) s
          * @since v13.13.0, v12.17.0
-         * @param [position='null'] The offset from the beginning of the file where the data should be read from. If `position` is not a `number`, the data will be read from the current position.
+         * @param position The offset from the beginning of the file where the data should be read from. If `position` is not a `number`, the data will be read from the current position.
          * @return Fulfills upon success an object containing two properties:
          */
         readv(buffers: ReadonlyArray<NodeJS.ArrayBufferView>, position?: number): Promise<ReadVResult>;
@@ -455,7 +391,7 @@ declare module "fs/promises" {
          * complete.
          *
          * ```js
-         * import { open } from 'node:fs/promises';
+         * import { open } from 'fs/promises';
          *
          * let filehandle;
          * try {
@@ -468,19 +404,13 @@ declare module "fs/promises" {
          * @return Fulfills with `undefined` upon success.
          */
         close(): Promise<void>;
-        /**
-         * An alias for {@link FileHandle.close()}.
-         * @since v20.4.0
-         */
-        [Symbol.asyncDispose](): Promise<void>;
     }
-    const constants: typeof fsConstants;
     /**
      * Tests a user's permissions for the file or directory specified by `path`.
      * The `mode` argument is an optional integer that specifies the accessibility
-     * checks to be performed. `mode` should be either the value `fs.constants.F_OK`or a mask consisting of the bitwise OR of any of `fs.constants.R_OK`,`fs.constants.W_OK`, and `fs.constants.X_OK`
-     * (e.g.`fs.constants.W_OK | fs.constants.R_OK`). Check `File access constants` for
-     * possible values of `mode`.
+     * checks to be performed. Check `File access constants` for possible values
+     * of `mode`. It is possible to create a mask consisting of the bitwise OR of
+     * two or more values (e.g. `fs.constants.W_OK | fs.constants.R_OK`).
      *
      * If the accessibility check is successful, the promise is resolved with no
      * value. If any of the accessibility checks fail, the promise is rejected
@@ -488,7 +418,8 @@ declare module "fs/promises" {
      * written by the current process.
      *
      * ```js
-     * import { access, constants } from 'node:fs/promises';
+     * import { access } from 'fs/promises';
+     * import { constants } from 'fs';
      *
      * try {
      *   await access('/etc/passwd', constants.R_OK | constants.W_OK);
@@ -517,13 +448,14 @@ declare module "fs/promises" {
      * will be made to remove the destination.
      *
      * ```js
-     * import { copyFile, constants } from 'node:fs/promises';
+     * import { constants } from 'fs';
+     * import { copyFile } from 'fs/promises';
      *
      * try {
      *   await copyFile('source.txt', 'destination.txt');
      *   console.log('source.txt was copied to destination.txt');
      * } catch {
-     *   console.error('The file could not be copied');
+     *   console.log('The file could not be copied');
      * }
      *
      * // By using COPYFILE_EXCL, the operation will fail if destination.txt exists.
@@ -531,7 +463,7 @@ declare module "fs/promises" {
      *   await copyFile('source.txt', 'destination.txt', constants.COPYFILE_EXCL);
      *   console.log('source.txt was copied to destination.txt');
      * } catch {
-     *   console.error('The file could not be copied');
+     *   console.log('The file could not be copied');
      * }
      * ```
      * @since v10.0.0
@@ -555,7 +487,7 @@ declare module "fs/promises" {
      * @param [mode=0o666] Sets the file mode (permission and sticky bits) if the file is created.
      * @return Fulfills with a {FileHandle} object.
      */
-    function open(path: PathLike, flags?: string | number, mode?: Mode): Promise<FileHandle>;
+    function open(path: PathLike, flags: string | number, mode?: Mode): Promise<FileHandle>;
     /**
      * Renames `oldPath` to `newPath`.
      * @since v10.0.0
@@ -593,19 +525,6 @@ declare module "fs/promises" {
      * and sticky bits), or an object with a `mode` property and a `recursive`property indicating whether parent directories should be created. Calling`fsPromises.mkdir()` when `path` is a directory
      * that exists results in a
      * rejection only when `recursive` is false.
-     *
-     * ```js
-     * import { mkdir } from 'node:fs/promises';
-     *
-     * try {
-     *   const projectFolder = new URL('./test/project/', import.meta.url);
-     *   const createDir = await mkdir(projectFolder, { recursive: true });
-     *
-     *   console.log(`created ${createDir}`);
-     * } catch (err) {
-     *   console.error(err.message);
-     * }
-     * ```
      * @since v10.0.0
      * @return Upon success, fulfills with `undefined` if `recursive` is `false`, or the first directory path created if `recursive` is `true`.
      */
@@ -613,7 +532,7 @@ declare module "fs/promises" {
         path: PathLike,
         options: MakeDirectoryOptions & {
             recursive: true;
-        },
+        }
     ): Promise<string | undefined>;
     /**
      * Asynchronous mkdir(2) - create a directory.
@@ -626,9 +545,9 @@ declare module "fs/promises" {
         options?:
             | Mode
             | (MakeDirectoryOptions & {
-                recursive?: false | undefined;
-            })
-            | null,
+                  recursive?: false | undefined;
+              })
+            | null
     ): Promise<void>;
     /**
      * Asynchronous mkdir(2) - create a directory.
@@ -648,7 +567,7 @@ declare module "fs/promises" {
      * If `options.withFileTypes` is set to `true`, the resolved array will contain `fs.Dirent` objects.
      *
      * ```js
-     * import { readdir } from 'node:fs/promises';
+     * import { readdir } from 'fs/promises';
      *
      * try {
      *   const files = await readdir(path);
@@ -665,11 +584,10 @@ declare module "fs/promises" {
         path: PathLike,
         options?:
             | (ObjectEncodingOptions & {
-                withFileTypes?: false | undefined;
-                recursive?: boolean | undefined;
-            })
+                  withFileTypes?: false | undefined;
+              })
             | BufferEncoding
-            | null,
+            | null
     ): Promise<string[]>;
     /**
      * Asynchronous readdir(3) - read a directory.
@@ -680,11 +598,10 @@ declare module "fs/promises" {
         path: PathLike,
         options:
             | {
-                encoding: "buffer";
-                withFileTypes?: false | undefined;
-                recursive?: boolean | undefined;
-            }
-            | "buffer",
+                  encoding: 'buffer';
+                  withFileTypes?: false | undefined;
+              }
+            | 'buffer'
     ): Promise<Buffer[]>;
     /**
      * Asynchronous readdir(3) - read a directory.
@@ -695,11 +612,10 @@ declare module "fs/promises" {
         path: PathLike,
         options?:
             | (ObjectEncodingOptions & {
-                withFileTypes?: false | undefined;
-                recursive?: boolean | undefined;
-            })
+                  withFileTypes?: false | undefined;
+              })
             | BufferEncoding
-            | null,
+            | null
     ): Promise<string[] | Buffer[]>;
     /**
      * Asynchronous readdir(3) - read a directory.
@@ -710,8 +626,7 @@ declare module "fs/promises" {
         path: PathLike,
         options: ObjectEncodingOptions & {
             withFileTypes: true;
-            recursive?: boolean | undefined;
-        },
+        }
     ): Promise<Dirent[]>;
     /**
      * Reads the contents of the symbolic link referred to by `path`. See the POSIX [`readlink(2)`](http://man7.org/linux/man-pages/man2/readlink.2.html) documentation for more detail. The promise is
@@ -740,14 +655,11 @@ declare module "fs/promises" {
     /**
      * Creates a symbolic link.
      *
-     * The `type` argument is only used on Windows platforms and can be one of `'dir'`,`'file'`, or `'junction'`. If the `type` argument is not a string, Node.js will
-     * autodetect `target` type and use `'file'` or `'dir'`. If the `target` does not
-     * exist, `'file'` will be used. Windows junction points require the destination
-     * path to be absolute. When using `'junction'`, the `target` argument will
-     * automatically be normalized to absolute path. Junction points on NTFS volumes
-     * can only point to directories.
+     * The `type` argument is only used on Windows platforms and can be one of `'dir'`,`'file'`, or `'junction'`. Windows junction points require the destination path
+     * to be absolute. When using `'junction'`, the `target` argument will
+     * automatically be normalized to absolute path.
      * @since v10.0.0
-     * @param [type='null']
+     * @param [type='file']
      * @return Fulfills with `undefined` upon success.
      */
     function symlink(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
@@ -762,13 +674,13 @@ declare module "fs/promises" {
         path: PathLike,
         opts?: StatOptions & {
             bigint?: false | undefined;
-        },
+        }
     ): Promise<Stats>;
     function lstat(
         path: PathLike,
         opts: StatOptions & {
             bigint: true;
-        },
+        }
     ): Promise<BigIntStats>;
     function lstat(path: PathLike, opts?: StatOptions): Promise<Stats | BigIntStats>;
     /**
@@ -779,32 +691,15 @@ declare module "fs/promises" {
         path: PathLike,
         opts?: StatOptions & {
             bigint?: false | undefined;
-        },
+        }
     ): Promise<Stats>;
     function stat(
         path: PathLike,
         opts: StatOptions & {
             bigint: true;
-        },
+        }
     ): Promise<BigIntStats>;
     function stat(path: PathLike, opts?: StatOptions): Promise<Stats | BigIntStats>;
-    /**
-     * @since v19.6.0, v18.15.0
-     * @return Fulfills with the {fs.StatFs} object for the given `path`.
-     */
-    function statfs(
-        path: PathLike,
-        opts?: StatFsOptions & {
-            bigint?: false | undefined;
-        },
-    ): Promise<StatsFs>;
-    function statfs(
-        path: PathLike,
-        opts: StatFsOptions & {
-            bigint: true;
-        },
-    ): Promise<BigIntStatsFs>;
-    function statfs(path: PathLike, opts?: StatFsOptions): Promise<StatsFs | BigIntStatsFs>;
     /**
      * Creates a new link from the `existingPath` to the `newPath`. See the POSIX [`link(2)`](http://man7.org/linux/man-pages/man2/link.2.html) documentation for more detail.
      * @since v10.0.0
@@ -846,7 +741,7 @@ declare module "fs/promises" {
      * @since v14.5.0, v12.19.0
      * @return Fulfills with `undefined` upon success.
      */
-    function lutimes(path: PathLike, atime: TimeLike, mtime: TimeLike): Promise<void>;
+    function lutimes(path: PathLike, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
     /**
      * Changes the ownership of a file.
      * @since v10.0.0
@@ -860,11 +755,11 @@ declare module "fs/promises" {
      *
      * * Values can be either numbers representing Unix epoch time, `Date`s, or a
      * numeric string like `'123456789.0'`.
-     * * If the value can not be converted to a number, or is `NaN`, `Infinity`, or`-Infinity`, an `Error` will be thrown.
+     * * If the value can not be converted to a number, or is `NaN`, `Infinity` or`-Infinity`, an `Error` will be thrown.
      * @since v10.0.0
      * @return Fulfills with `undefined` upon success.
      */
-    function utimes(path: PathLike, atime: TimeLike, mtime: TimeLike): Promise<void>;
+    function utimes(path: PathLike, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
     /**
      * Determines the actual location of `path` using the same semantics as the`fs.realpath.native()` function.
      *
@@ -893,10 +788,7 @@ declare module "fs/promises" {
      * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
      * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
      */
-    function realpath(
-        path: PathLike,
-        options?: ObjectEncodingOptions | BufferEncoding | null,
-    ): Promise<string | Buffer>;
+    function realpath(path: PathLike, options?: ObjectEncodingOptions | BufferEncoding | null): Promise<string | Buffer>;
     /**
      * Creates a unique temporary directory. A unique directory name is generated by
      * appending six random characters to the end of the provided `prefix`. Due to
@@ -908,12 +800,10 @@ declare module "fs/promises" {
      * object with an `encoding` property specifying the character encoding to use.
      *
      * ```js
-     * import { mkdtemp } from 'node:fs/promises';
-     * import { join } from 'node:path';
-     * import { tmpdir } from 'node:os';
+     * import { mkdtemp } from 'fs/promises';
      *
      * try {
-     *   await mkdtemp(join(tmpdir(), 'foo-'));
+     *   await mkdtemp(path.join(os.tmpdir(), 'foo-'));
      * } catch (err) {
      *   console.error(err);
      * }
@@ -922,9 +812,9 @@ declare module "fs/promises" {
      * The `fsPromises.mkdtemp()` method will append the six randomly selected
      * characters directly to the `prefix` string. For instance, given a directory`/tmp`, if the intention is to create a temporary directory _within_`/tmp`, the`prefix` must end with a trailing
      * platform-specific path separator
-     * (`require('node:path').sep`).
+     * (`require('path').sep`).
      * @since v10.0.0
-     * @return Fulfills with a string containing the file system path of the newly created temporary directory.
+     * @return Fulfills with a string containing the filesystem path of the newly created temporary directory.
      */
     function mkdtemp(prefix: string, options?: ObjectEncodingOptions | BufferEncoding | null): Promise<string>;
     /**
@@ -940,9 +830,7 @@ declare module "fs/promises" {
      */
     function mkdtemp(prefix: string, options?: ObjectEncodingOptions | BufferEncoding | null): Promise<string | Buffer>;
     /**
-     * Asynchronously writes data to a file, replacing the file if it already exists.`data` can be a string, a buffer, an
-     * [AsyncIterable](https://tc39.github.io/ecma262/#sec-asynciterable-interface), or an
-     * [Iterable](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols#The_iterable_protocol) object.
+     * Asynchronously writes data to a file, replacing the file if it already exists.`data` can be a string, a `Buffer`, or, an object with an own (not inherited)`toString` function property.
      *
      * The `encoding` option is ignored if `data` is a buffer.
      *
@@ -957,15 +845,15 @@ declare module "fs/promises" {
      *
      * Similarly to `fsPromises.readFile` \- `fsPromises.writeFile` is a convenience
      * method that performs multiple `write` calls internally to write the buffer
-     * passed to it. For performance sensitive code consider using `fs.createWriteStream()` or `filehandle.createWriteStream()`.
+     * passed to it. For performance sensitive code consider using `fs.createWriteStream()`.
      *
      * It is possible to use an `AbortSignal` to cancel an `fsPromises.writeFile()`.
      * Cancelation is "best effort", and some amount of data is likely still
      * to be written.
      *
      * ```js
-     * import { writeFile } from 'node:fs/promises';
-     * import { Buffer } from 'node:buffer';
+     * import { writeFile } from 'fs/promises';
+     * import { Buffer } from 'buffer';
      *
      * try {
      *   const controller = new AbortController();
@@ -991,19 +879,14 @@ declare module "fs/promises" {
      */
     function writeFile(
         file: PathLike | FileHandle,
-        data:
-            | string
-            | NodeJS.ArrayBufferView
-            | Iterable<string | NodeJS.ArrayBufferView>
-            | AsyncIterable<string | NodeJS.ArrayBufferView>
-            | Stream,
+        data: string | NodeJS.ArrayBufferView | Iterable<string | NodeJS.ArrayBufferView> | AsyncIterable<string | NodeJS.ArrayBufferView> | Stream,
         options?:
             | (ObjectEncodingOptions & {
-                mode?: Mode | undefined;
-                flag?: OpenMode | undefined;
-            } & Abortable)
+                  mode?: Mode | undefined;
+                  flag?: OpenMode | undefined;
+              } & Abortable)
             | BufferEncoding
-            | null,
+            | null
     ): Promise<void>;
     /**
      * Asynchronously append data to a file, creating the file if it does not yet
@@ -1019,11 +902,7 @@ declare module "fs/promises" {
      * @param path filename or {FileHandle}
      * @return Fulfills with `undefined` upon success.
      */
-    function appendFile(
-        path: PathLike | FileHandle,
-        data: string | Uint8Array,
-        options?: (ObjectEncodingOptions & FlagAndOpenMode) | BufferEncoding | null,
-    ): Promise<void>;
+    function appendFile(path: PathLike | FileHandle, data: string | Uint8Array, options?: (ObjectEncodingOptions & FlagAndOpenMode) | BufferEncoding | null): Promise<void>;
     /**
      * Asynchronously reads the entire contents of a file.
      *
@@ -1037,25 +916,11 @@ declare module "fs/promises" {
      * with an error. On FreeBSD, a representation of the directory's contents will be
      * returned.
      *
-     * An example of reading a `package.json` file located in the same directory of the
-     * running code:
-     *
-     * ```js
-     * import { readFile } from 'node:fs/promises';
-     * try {
-     *   const filePath = new URL('./package.json', import.meta.url);
-     *   const contents = await readFile(filePath, { encoding: 'utf8' });
-     *   console.log(contents);
-     * } catch (err) {
-     *   console.error(err.message);
-     * }
-     * ```
-     *
      * It is possible to abort an ongoing `readFile` using an `AbortSignal`. If a
      * request is aborted the promise returned is rejected with an `AbortError`:
      *
      * ```js
-     * import { readFile } from 'node:fs/promises';
+     * import { readFile } from 'fs/promises';
      *
      * try {
      *   const controller = new AbortController();
@@ -1084,10 +949,10 @@ declare module "fs/promises" {
         path: PathLike | FileHandle,
         options?:
             | ({
-                encoding?: null | undefined;
-                flag?: OpenMode | undefined;
-            } & Abortable)
-            | null,
+                  encoding?: null | undefined;
+                  flag?: OpenMode | undefined;
+              } & Abortable)
+            | null
     ): Promise<Buffer>;
     /**
      * Asynchronously reads the entire contents of a file.
@@ -1100,10 +965,10 @@ declare module "fs/promises" {
         path: PathLike | FileHandle,
         options:
             | ({
-                encoding: BufferEncoding;
-                flag?: OpenMode | undefined;
-            } & Abortable)
-            | BufferEncoding,
+                  encoding: BufferEncoding;
+                  flag?: OpenMode | undefined;
+              } & Abortable)
+            | BufferEncoding
     ): Promise<string>;
     /**
      * Asynchronously reads the entire contents of a file.
@@ -1115,15 +980,12 @@ declare module "fs/promises" {
     function readFile(
         path: PathLike | FileHandle,
         options?:
-            | (
-                & ObjectEncodingOptions
-                & Abortable
-                & {
-                    flag?: OpenMode | undefined;
-                }
-            )
+            | (ObjectEncodingOptions &
+                  Abortable & {
+                      flag?: OpenMode | undefined;
+                  })
             | BufferEncoding
-            | null,
+            | null
     ): Promise<string | Buffer>;
     /**
      * Asynchronously open a directory for iterative scanning. See the POSIX [`opendir(3)`](http://man7.org/linux/man-pages/man3/opendir.3.html) documentation for more detail.
@@ -1137,7 +999,7 @@ declare module "fs/promises" {
      * Example using async iteration:
      *
      * ```js
-     * import { opendir } from 'node:fs/promises';
+     * import { opendir } from 'fs/promises';
      *
      * try {
      *   const dir = await opendir('./');
@@ -1158,7 +1020,7 @@ declare module "fs/promises" {
      * Returns an async iterator that watches for changes on `filename`, where `filename`is either a file or a directory.
      *
      * ```js
-     * const { watch } = require('node:fs/promises');
+     * const { watch } = require('fs/promises');
      *
      * const ac = new AbortController();
      * const { signal } = ac;
@@ -1181,16 +1043,16 @@ declare module "fs/promises" {
      * disappears in the directory.
      *
      * All the `caveats` for `fs.watch()` also apply to `fsPromises.watch()`.
-     * @since v15.9.0, v14.18.0
+     * @since v15.9.0
      * @return of objects with the properties:
      */
     function watch(
         filename: PathLike,
         options:
             | (WatchOptions & {
-                encoding: "buffer";
-            })
-            | "buffer",
+                  encoding: 'buffer';
+              })
+            | 'buffer'
     ): AsyncIterable<FileChangeInfo<Buffer>>;
     /**
      * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
@@ -1209,10 +1071,7 @@ declare module "fs/promises" {
      * If `persistent` is not supplied, the default of `true` is used.
      * If `recursive` is not supplied, the default of `false` is used.
      */
-    function watch(
-        filename: PathLike,
-        options: WatchOptions | string,
-    ): AsyncIterable<FileChangeInfo<string>> | AsyncIterable<FileChangeInfo<Buffer>>;
+    function watch(filename: PathLike, options: WatchOptions | string): AsyncIterable<FileChangeInfo<string>> | AsyncIterable<FileChangeInfo<Buffer>>;
     /**
      * Asynchronously copies the entire directory structure from `src` to `dest`,
      * including subdirectories and files.
@@ -1225,8 +1084,8 @@ declare module "fs/promises" {
      * @param dest destination path to copy to.
      * @return Fulfills with `undefined` upon success.
      */
-    function cp(source: string | URL, destination: string | URL, opts?: CopyOptions): Promise<void>;
+    function cp(source: string, destination: string, opts?: CopyOptions): Promise<void>;
 }
-declare module "node:fs/promises" {
-    export * from "fs/promises";
+declare module 'node:fs/promises' {
+    export * from 'fs/promises';
 }

node_modules/@types/node/globals.d.ts

@@ -20,9 +20,9 @@ interface ErrorConstructor {
  ------------------------------------------------*/
 
 // For backwards compability
-interface NodeRequire extends NodeJS.Require {}
-interface RequireResolve extends NodeJS.RequireResolve {}
-interface NodeModule extends NodeJS.Module {}
+interface NodeRequire extends NodeJS.Require { }
+interface RequireResolve extends NodeJS.RequireResolve { }
+interface NodeModule extends NodeJS.Module { }
 
 declare var process: NodeJS.Process;
 declare var console: Console;
@@ -41,7 +41,7 @@ declare var exports: any;
  */
 declare var gc: undefined | (() => void);
 
-// #region borrowed
+//#region borrowed
 // from https://github.com/microsoft/TypeScript/blob/38da7c600c83e7b31193a62495239a0fe478cb67/lib/lib.webworker.d.ts#L633 until moved to separate lib
 /** A controller object that allows you to abort one or more DOM requests as and when desired. */
 interface AbortController {
@@ -53,58 +53,30 @@ interface AbortController {
     /**
      * Invoking this method will set this object's AbortSignal's aborted flag and signal to any observers that the associated activity is to be aborted.
      */
-    abort(reason?: any): void;
+    abort(): void;
 }
 
 /** A signal object that allows you to communicate with a DOM request (such as a Fetch) and abort it if required via an AbortController object. */
-interface AbortSignal extends EventTarget {
+interface AbortSignal {
     /**
      * Returns true if this AbortSignal's AbortController has signaled to abort, and false otherwise.
      */
     readonly aborted: boolean;
-    readonly reason: any;
-    onabort: null | ((this: AbortSignal, event: Event) => any);
-    throwIfAborted(): void;
 }
 
-declare var AbortController: typeof globalThis extends { onmessage: any; AbortController: infer T } ? T
-    : {
-        prototype: AbortController;
-        new(): AbortController;
-    };
+declare var AbortController: {
+    prototype: AbortController;
+    new(): AbortController;
+};
 
-declare var AbortSignal: typeof globalThis extends { onmessage: any; AbortSignal: infer T } ? T
-    : {
-        prototype: AbortSignal;
-        new(): AbortSignal;
-        abort(reason?: any): AbortSignal;
-        timeout(milliseconds: number): AbortSignal;
-    };
-// #endregion borrowed
+declare var AbortSignal: {
+    prototype: AbortSignal;
+    new(): AbortSignal;
+    // TODO: Add abort() static
+};
+//#endregion borrowed
 
-// #region Disposable
-interface SymbolConstructor {
-    /**
-     * A method that is used to release resources held by an object. Called by the semantics of the `using` statement.
-     */
-    readonly dispose: unique symbol;
-
-    /**
-     * A method that is used to asynchronously release resources held by an object. Called by the semantics of the `await using` statement.
-     */
-    readonly asyncDispose: unique symbol;
-}
-
-interface Disposable {
-    [Symbol.dispose](): void;
-}
-
-interface AsyncDisposable {
-    [Symbol.asyncDispose](): PromiseLike<void>;
-}
-// #endregion Disposable
-
-// #region ArrayLike.at()
+//#region ArrayLike.at()
 interface RelativeIndexable<T> {
     /**
      * Takes an integer value and returns the item at that index,
@@ -115,7 +87,6 @@ interface RelativeIndexable<T> {
 }
 interface String extends RelativeIndexable<string> {}
 interface Array<T> extends RelativeIndexable<T> {}
-interface ReadonlyArray<T> extends RelativeIndexable<T> {}
 interface Int8Array extends RelativeIndexable<number> {}
 interface Uint8Array extends RelativeIndexable<number> {}
 interface Uint8ClampedArray extends RelativeIndexable<number> {}
@@ -127,17 +98,7 @@ interface Float32Array extends RelativeIndexable<number> {}
 interface Float64Array extends RelativeIndexable<number> {}
 interface BigInt64Array extends RelativeIndexable<bigint> {}
 interface BigUint64Array extends RelativeIndexable<bigint> {}
-// #endregion ArrayLike.at() end
-
-/**
- * @since v17.0.0
- *
- * Creates a deep clone of an object.
- */
-declare function structuredClone<T>(
-    value: T,
-    transfer?: { transfer: ReadonlyArray<import("worker_threads").TransferListItem> },
-): T;
+//#endregion ArrayLike.at() end
 
 /*----------------------------------------------*
 *                                               *
@@ -180,7 +141,7 @@ declare namespace NodeJS {
         /**
          * Name of the script [if this function was defined in a script]
          */
-        getFileName(): string | undefined;
+        getFileName(): string | null;
 
         /**
          * Current line number [if this function was defined in a script]
@@ -233,7 +194,7 @@ declare namespace NodeJS {
         pause(): this;
         resume(): this;
         isPaused(): boolean;
-        pipe<T extends WritableStream>(destination: T, options?: { end?: boolean | undefined }): T;
+        pipe<T extends WritableStream>(destination: T, options?: { end?: boolean | undefined; }): T;
         unpipe(destination?: WritableStream): this;
         unshift(chunk: string | Uint8Array, encoding?: BufferEncoding): void;
         wrap(oldStream: ReadableStream): this;
@@ -244,12 +205,12 @@ declare namespace NodeJS {
         writable: boolean;
         write(buffer: Uint8Array | string, cb?: (err?: Error | null) => void): boolean;
         write(str: string, encoding?: BufferEncoding, cb?: (err?: Error | null) => void): boolean;
-        end(cb?: () => void): this;
-        end(data: string | Uint8Array, cb?: () => void): this;
-        end(str: string, encoding?: BufferEncoding, cb?: () => void): this;
+        end(cb?: () => void): void;
+        end(data: string | Uint8Array, cb?: () => void): void;
+        end(str: string, encoding?: BufferEncoding, cb?: () => void): void;
     }
 
-    interface ReadWriteStream extends ReadableStream, WritableStream {}
+    interface ReadWriteStream extends ReadableStream, WritableStream { }
 
     interface RefCounted {
         ref(): this;
@@ -282,14 +243,14 @@ declare namespace NodeJS {
     }
 
     interface RequireResolve {
-        (id: string, options?: { paths?: string[] | undefined }): string;
+        (id: string, options?: { paths?: string[] | undefined; }): string;
         paths(request: string): string[] | null;
     }
 
     interface RequireExtensions extends Dict<(m: Module, filename: string) => any> {
-        ".js": (m: Module, filename: string) => any;
-        ".json": (m: Module, filename: string) => any;
-        ".node": (m: Module, filename: string) => any;
+        '.js': (m: Module, filename: string) => any;
+        '.json': (m: Module, filename: string) => any;
+        '.node': (m: Module, filename: string) => any;
     }
     interface Module {
         /**
@@ -301,11 +262,11 @@ declare namespace NodeJS {
         id: string;
         filename: string;
         loaded: boolean;
-        /** @deprecated since v14.6.0 Please use `require.main` and `module.children` instead. */
+        /** @deprecated since 14.6.0 Please use `require.main` and `module.children` instead. */
         parent: Module | null | undefined;
         children: Module[];
         /**
-         * @since v11.14.0
+         * @since 11.14.0
          *
          * The directory name of the module. This is usually the same as the path.dirname() of the module.id.
          */
@@ -320,62 +281,4 @@ declare namespace NodeJS {
     interface ReadOnlyDict<T> {
         readonly [key: string]: T | undefined;
     }
-
-    namespace fetch {
-        type _Request = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").Request;
-        type _Response = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").Response;
-        type _FormData = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").FormData;
-        type _Headers = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").Headers;
-        type _RequestInit = typeof globalThis extends { onmessage: any } ? {}
-            : import("undici-types").RequestInit;
-        type Request = globalThis.Request;
-        type Response = globalThis.Response;
-        type Headers = globalThis.Headers;
-        type FormData = globalThis.FormData;
-        type RequestInit = globalThis.RequestInit;
-        type RequestInfo = import("undici-types").RequestInfo;
-        type HeadersInit = import("undici-types").HeadersInit;
-        type BodyInit = import("undici-types").BodyInit;
-        type RequestRedirect = import("undici-types").RequestRedirect;
-        type RequestCredentials = import("undici-types").RequestCredentials;
-        type RequestMode = import("undici-types").RequestMode;
-        type ReferrerPolicy = import("undici-types").ReferrerPolicy;
-        type Dispatcher = import("undici-types").Dispatcher;
-        type RequestDuplex = import("undici-types").RequestDuplex;
-    }
 }
-
-interface RequestInit extends NodeJS.fetch._RequestInit {}
-
-declare function fetch(
-    input: NodeJS.fetch.RequestInfo,
-    init?: RequestInit,
-): Promise<Response>;
-
-interface Request extends NodeJS.fetch._Request {}
-declare var Request: typeof globalThis extends {
-    onmessage: any;
-    Request: infer T;
-} ? T
-    : typeof import("undici-types").Request;
-
-interface Response extends NodeJS.fetch._Response {}
-declare var Response: typeof globalThis extends {
-    onmessage: any;
-    Response: infer T;
-} ? T
-    : typeof import("undici-types").Response;
-
-interface FormData extends NodeJS.fetch._FormData {}
-declare var FormData: typeof globalThis extends {
-    onmessage: any;
-    FormData: infer T;
-} ? T
-    : typeof import("undici-types").FormData;
-
-interface Headers extends NodeJS.fetch._Headers {}
-declare var Headers: typeof globalThis extends {
-    onmessage: any;
-    Headers: infer T;
-} ? T
-    : typeof import("undici-types").Headers;

node_modules/@types/node/https.d.ts

@@ -1,22 +1,16 @@
 /**
  * HTTPS is the HTTP protocol over TLS/SSL. In Node.js this is implemented as a
  * separate module.
- * @see [source](https://github.com/nodejs/node/blob/v20.2.0/lib/https.js)
+ * @see [source](https://github.com/nodejs/node/blob/v16.9.0/lib/https.js)
  */
-declare module "https" {
-    import { Duplex } from "node:stream";
-    import * as tls from "node:tls";
-    import * as http from "node:http";
-    import { URL } from "node:url";
-    type ServerOptions<
-        Request extends typeof http.IncomingMessage = typeof http.IncomingMessage,
-        Response extends typeof http.ServerResponse = typeof http.ServerResponse,
-    > = tls.SecureContextOptions & tls.TlsOptions & http.ServerOptions<Request, Response>;
-    type RequestOptions =
-        & http.RequestOptions
-        & tls.SecureContextOptions
-        & {
-            checkServerIdentity?: typeof tls.checkServerIdentity | undefined;
+declare module 'https' {
+    import { Duplex } from 'node:stream';
+    import * as tls from 'node:tls';
+    import * as http from 'node:http';
+    import { URL } from 'node:url';
+    type ServerOptions = tls.SecureContextOptions & tls.TlsOptions & http.ServerOptions;
+    type RequestOptions = http.RequestOptions &
+        tls.SecureContextOptions & {
             rejectUnauthorized?: boolean | undefined; // Defaults to true
             servername?: string | undefined; // SNI TLS Extension
         };
@@ -32,256 +26,126 @@ declare module "https" {
         constructor(options?: AgentOptions);
         options: AgentOptions;
     }
-    interface Server<
-        Request extends typeof http.IncomingMessage = typeof http.IncomingMessage,
-        Response extends typeof http.ServerResponse = typeof http.ServerResponse,
-    > extends http.Server<Request, Response> {}
+    interface Server extends http.Server {}
     /**
      * See `http.Server` for more information.
      * @since v0.3.4
      */
-    class Server<
-        Request extends typeof http.IncomingMessage = typeof http.IncomingMessage,
-        Response extends typeof http.ServerResponse = typeof http.ServerResponse,
-    > extends tls.Server {
-        constructor(requestListener?: http.RequestListener<Request, Response>);
-        constructor(
-            options: ServerOptions<Request, Response>,
-            requestListener?: http.RequestListener<Request, Response>,
-        );
-        /**
-         * Closes all connections connected to this server.
-         * @since v18.2.0
-         */
-        closeAllConnections(): void;
-        /**
-         * Closes all connections connected to this server which are not sending a request or waiting for a response.
-         * @since v18.2.0
-         */
-        closeIdleConnections(): void;
+    class Server extends tls.Server {
+        constructor(requestListener?: http.RequestListener);
+        constructor(options: ServerOptions, requestListener?: http.RequestListener);
         addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "keylog", listener: (line: Buffer, tlsSocket: tls.TLSSocket) => void): this;
-        addListener(
-            event: "newSession",
-            listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void,
-        ): this;
-        addListener(
-            event: "OCSPRequest",
-            listener: (
-                certificate: Buffer,
-                issuer: Buffer,
-                callback: (err: Error | null, resp: Buffer) => void,
-            ) => void,
-        ): this;
-        addListener(
-            event: "resumeSession",
-            listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void,
-        ): this;
-        addListener(event: "secureConnection", listener: (tlsSocket: tls.TLSSocket) => void): this;
-        addListener(event: "tlsClientError", listener: (err: Error, tlsSocket: tls.TLSSocket) => void): this;
-        addListener(event: "close", listener: () => void): this;
-        addListener(event: "connection", listener: (socket: Duplex) => void): this;
-        addListener(event: "error", listener: (err: Error) => void): this;
-        addListener(event: "listening", listener: () => void): this;
-        addListener(event: "checkContinue", listener: http.RequestListener<Request, Response>): this;
-        addListener(event: "checkExpectation", listener: http.RequestListener<Request, Response>): this;
-        addListener(event: "clientError", listener: (err: Error, socket: Duplex) => void): this;
-        addListener(
-            event: "connect",
-            listener: (req: InstanceType<Request>, socket: Duplex, head: Buffer) => void,
-        ): this;
-        addListener(event: "request", listener: http.RequestListener<Request, Response>): this;
-        addListener(
-            event: "upgrade",
-            listener: (req: InstanceType<Request>, socket: Duplex, head: Buffer) => void,
-        ): this;
+        addListener(event: 'keylog', listener: (line: Buffer, tlsSocket: tls.TLSSocket) => void): this;
+        addListener(event: 'newSession', listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void): this;
+        addListener(event: 'OCSPRequest', listener: (certificate: Buffer, issuer: Buffer, callback: (err: Error | null, resp: Buffer) => void) => void): this;
+        addListener(event: 'resumeSession', listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void): this;
+        addListener(event: 'secureConnection', listener: (tlsSocket: tls.TLSSocket) => void): this;
+        addListener(event: 'tlsClientError', listener: (err: Error, tlsSocket: tls.TLSSocket) => void): this;
+        addListener(event: 'close', listener: () => void): this;
+        addListener(event: 'connection', listener: (socket: Duplex) => void): this;
+        addListener(event: 'error', listener: (err: Error) => void): this;
+        addListener(event: 'listening', listener: () => void): this;
+        addListener(event: 'checkContinue', listener: http.RequestListener): this;
+        addListener(event: 'checkExpectation', listener: http.RequestListener): this;
+        addListener(event: 'clientError', listener: (err: Error, socket: Duplex) => void): this;
+        addListener(event: 'connect', listener: (req: http.IncomingMessage, socket: Duplex, head: Buffer) => void): this;
+        addListener(event: 'request', listener: http.RequestListener): this;
+        addListener(event: 'upgrade', listener: (req: http.IncomingMessage, socket: Duplex, head: Buffer) => void): this;
         emit(event: string, ...args: any[]): boolean;
-        emit(event: "keylog", line: Buffer, tlsSocket: tls.TLSSocket): boolean;
-        emit(
-            event: "newSession",
-            sessionId: Buffer,
-            sessionData: Buffer,
-            callback: (err: Error, resp: Buffer) => void,
-        ): boolean;
-        emit(
-            event: "OCSPRequest",
-            certificate: Buffer,
-            issuer: Buffer,
-            callback: (err: Error | null, resp: Buffer) => void,
-        ): boolean;
-        emit(event: "resumeSession", sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void): boolean;
-        emit(event: "secureConnection", tlsSocket: tls.TLSSocket): boolean;
-        emit(event: "tlsClientError", err: Error, tlsSocket: tls.TLSSocket): boolean;
-        emit(event: "close"): boolean;
-        emit(event: "connection", socket: Duplex): boolean;
-        emit(event: "error", err: Error): boolean;
-        emit(event: "listening"): boolean;
-        emit(
-            event: "checkContinue",
-            req: InstanceType<Request>,
-            res: InstanceType<Response> & {
-                req: InstanceType<Request>;
-            },
-        ): boolean;
-        emit(
-            event: "checkExpectation",
-            req: InstanceType<Request>,
-            res: InstanceType<Response> & {
-                req: InstanceType<Request>;
-            },
-        ): boolean;
-        emit(event: "clientError", err: Error, socket: Duplex): boolean;
-        emit(event: "connect", req: InstanceType<Request>, socket: Duplex, head: Buffer): boolean;
-        emit(
-            event: "request",
-            req: InstanceType<Request>,
-            res: InstanceType<Response> & {
-                req: InstanceType<Request>;
-            },
-        ): boolean;
-        emit(event: "upgrade", req: InstanceType<Request>, socket: Duplex, head: Buffer): boolean;
+        emit(event: 'keylog', line: Buffer, tlsSocket: tls.TLSSocket): boolean;
+        emit(event: 'newSession', sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void): boolean;
+        emit(event: 'OCSPRequest', certificate: Buffer, issuer: Buffer, callback: (err: Error | null, resp: Buffer) => void): boolean;
+        emit(event: 'resumeSession', sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void): boolean;
+        emit(event: 'secureConnection', tlsSocket: tls.TLSSocket): boolean;
+        emit(event: 'tlsClientError', err: Error, tlsSocket: tls.TLSSocket): boolean;
+        emit(event: 'close'): boolean;
+        emit(event: 'connection', socket: Duplex): boolean;
+        emit(event: 'error', err: Error): boolean;
+        emit(event: 'listening'): boolean;
+        emit(event: 'checkContinue', req: http.IncomingMessage, res: http.ServerResponse): boolean;
+        emit(event: 'checkExpectation', req: http.IncomingMessage, res: http.ServerResponse): boolean;
+        emit(event: 'clientError', err: Error, socket: Duplex): boolean;
+        emit(event: 'connect', req: http.IncomingMessage, socket: Duplex, head: Buffer): boolean;
+        emit(event: 'request', req: http.IncomingMessage, res: http.ServerResponse): boolean;
+        emit(event: 'upgrade', req: http.IncomingMessage, socket: Duplex, head: Buffer): boolean;
         on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "keylog", listener: (line: Buffer, tlsSocket: tls.TLSSocket) => void): this;
-        on(
-            event: "newSession",
-            listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void,
-        ): this;
-        on(
-            event: "OCSPRequest",
-            listener: (
-                certificate: Buffer,
-                issuer: Buffer,
-                callback: (err: Error | null, resp: Buffer) => void,
-            ) => void,
-        ): this;
-        on(
-            event: "resumeSession",
-            listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void,
-        ): this;
-        on(event: "secureConnection", listener: (tlsSocket: tls.TLSSocket) => void): this;
-        on(event: "tlsClientError", listener: (err: Error, tlsSocket: tls.TLSSocket) => void): this;
-        on(event: "close", listener: () => void): this;
-        on(event: "connection", listener: (socket: Duplex) => void): this;
-        on(event: "error", listener: (err: Error) => void): this;
-        on(event: "listening", listener: () => void): this;
-        on(event: "checkContinue", listener: http.RequestListener<Request, Response>): this;
-        on(event: "checkExpectation", listener: http.RequestListener<Request, Response>): this;
-        on(event: "clientError", listener: (err: Error, socket: Duplex) => void): this;
-        on(event: "connect", listener: (req: InstanceType<Request>, socket: Duplex, head: Buffer) => void): this;
-        on(event: "request", listener: http.RequestListener<Request, Response>): this;
-        on(event: "upgrade", listener: (req: InstanceType<Request>, socket: Duplex, head: Buffer) => void): this;
+        on(event: 'keylog', listener: (line: Buffer, tlsSocket: tls.TLSSocket) => void): this;
+        on(event: 'newSession', listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void): this;
+        on(event: 'OCSPRequest', listener: (certificate: Buffer, issuer: Buffer, callback: (err: Error | null, resp: Buffer) => void) => void): this;
+        on(event: 'resumeSession', listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void): this;
+        on(event: 'secureConnection', listener: (tlsSocket: tls.TLSSocket) => void): this;
+        on(event: 'tlsClientError', listener: (err: Error, tlsSocket: tls.TLSSocket) => void): this;
+        on(event: 'close', listener: () => void): this;
+        on(event: 'connection', listener: (socket: Duplex) => void): this;
+        on(event: 'error', listener: (err: Error) => void): this;
+        on(event: 'listening', listener: () => void): this;
+        on(event: 'checkContinue', listener: http.RequestListener): this;
+        on(event: 'checkExpectation', listener: http.RequestListener): this;
+        on(event: 'clientError', listener: (err: Error, socket: Duplex) => void): this;
+        on(event: 'connect', listener: (req: http.IncomingMessage, socket: Duplex, head: Buffer) => void): this;
+        on(event: 'request', listener: http.RequestListener): this;
+        on(event: 'upgrade', listener: (req: http.IncomingMessage, socket: Duplex, head: Buffer) => void): this;
         once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "keylog", listener: (line: Buffer, tlsSocket: tls.TLSSocket) => void): this;
-        once(
-            event: "newSession",
-            listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void,
-        ): this;
-        once(
-            event: "OCSPRequest",
-            listener: (
-                certificate: Buffer,
-                issuer: Buffer,
-                callback: (err: Error | null, resp: Buffer) => void,
-            ) => void,
-        ): this;
-        once(
-            event: "resumeSession",
-            listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void,
-        ): this;
-        once(event: "secureConnection", listener: (tlsSocket: tls.TLSSocket) => void): this;
-        once(event: "tlsClientError", listener: (err: Error, tlsSocket: tls.TLSSocket) => void): this;
-        once(event: "close", listener: () => void): this;
-        once(event: "connection", listener: (socket: Duplex) => void): this;
-        once(event: "error", listener: (err: Error) => void): this;
-        once(event: "listening", listener: () => void): this;
-        once(event: "checkContinue", listener: http.RequestListener<Request, Response>): this;
-        once(event: "checkExpectation", listener: http.RequestListener<Request, Response>): this;
-        once(event: "clientError", listener: (err: Error, socket: Duplex) => void): this;
-        once(event: "connect", listener: (req: InstanceType<Request>, socket: Duplex, head: Buffer) => void): this;
-        once(event: "request", listener: http.RequestListener<Request, Response>): this;
-        once(event: "upgrade", listener: (req: InstanceType<Request>, socket: Duplex, head: Buffer) => void): this;
+        once(event: 'keylog', listener: (line: Buffer, tlsSocket: tls.TLSSocket) => void): this;
+        once(event: 'newSession', listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void): this;
+        once(event: 'OCSPRequest', listener: (certificate: Buffer, issuer: Buffer, callback: (err: Error | null, resp: Buffer) => void) => void): this;
+        once(event: 'resumeSession', listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void): this;
+        once(event: 'secureConnection', listener: (tlsSocket: tls.TLSSocket) => void): this;
+        once(event: 'tlsClientError', listener: (err: Error, tlsSocket: tls.TLSSocket) => void): this;
+        once(event: 'close', listener: () => void): this;
+        once(event: 'connection', listener: (socket: Duplex) => void): this;
+        once(event: 'error', listener: (err: Error) => void): this;
+        once(event: 'listening', listener: () => void): this;
+        once(event: 'checkContinue', listener: http.RequestListener): this;
+        once(event: 'checkExpectation', listener: http.RequestListener): this;
+        once(event: 'clientError', listener: (err: Error, socket: Duplex) => void): this;
+        once(event: 'connect', listener: (req: http.IncomingMessage, socket: Duplex, head: Buffer) => void): this;
+        once(event: 'request', listener: http.RequestListener): this;
+        once(event: 'upgrade', listener: (req: http.IncomingMessage, socket: Duplex, head: Buffer) => void): this;
         prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "keylog", listener: (line: Buffer, tlsSocket: tls.TLSSocket) => void): this;
-        prependListener(
-            event: "newSession",
-            listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void,
-        ): this;
-        prependListener(
-            event: "OCSPRequest",
-            listener: (
-                certificate: Buffer,
-                issuer: Buffer,
-                callback: (err: Error | null, resp: Buffer) => void,
-            ) => void,
-        ): this;
-        prependListener(
-            event: "resumeSession",
-            listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void,
-        ): this;
-        prependListener(event: "secureConnection", listener: (tlsSocket: tls.TLSSocket) => void): this;
-        prependListener(event: "tlsClientError", listener: (err: Error, tlsSocket: tls.TLSSocket) => void): this;
-        prependListener(event: "close", listener: () => void): this;
-        prependListener(event: "connection", listener: (socket: Duplex) => void): this;
-        prependListener(event: "error", listener: (err: Error) => void): this;
-        prependListener(event: "listening", listener: () => void): this;
-        prependListener(event: "checkContinue", listener: http.RequestListener<Request, Response>): this;
-        prependListener(event: "checkExpectation", listener: http.RequestListener<Request, Response>): this;
-        prependListener(event: "clientError", listener: (err: Error, socket: Duplex) => void): this;
-        prependListener(
-            event: "connect",
-            listener: (req: InstanceType<Request>, socket: Duplex, head: Buffer) => void,
-        ): this;
-        prependListener(event: "request", listener: http.RequestListener<Request, Response>): this;
-        prependListener(
-            event: "upgrade",
-            listener: (req: InstanceType<Request>, socket: Duplex, head: Buffer) => void,
-        ): this;
+        prependListener(event: 'keylog', listener: (line: Buffer, tlsSocket: tls.TLSSocket) => void): this;
+        prependListener(event: 'newSession', listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependListener(event: 'OCSPRequest', listener: (certificate: Buffer, issuer: Buffer, callback: (err: Error | null, resp: Buffer) => void) => void): this;
+        prependListener(event: 'resumeSession', listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void): this;
+        prependListener(event: 'secureConnection', listener: (tlsSocket: tls.TLSSocket) => void): this;
+        prependListener(event: 'tlsClientError', listener: (err: Error, tlsSocket: tls.TLSSocket) => void): this;
+        prependListener(event: 'close', listener: () => void): this;
+        prependListener(event: 'connection', listener: (socket: Duplex) => void): this;
+        prependListener(event: 'error', listener: (err: Error) => void): this;
+        prependListener(event: 'listening', listener: () => void): this;
+        prependListener(event: 'checkContinue', listener: http.RequestListener): this;
+        prependListener(event: 'checkExpectation', listener: http.RequestListener): this;
+        prependListener(event: 'clientError', listener: (err: Error, socket: Duplex) => void): this;
+        prependListener(event: 'connect', listener: (req: http.IncomingMessage, socket: Duplex, head: Buffer) => void): this;
+        prependListener(event: 'request', listener: http.RequestListener): this;
+        prependListener(event: 'upgrade', listener: (req: http.IncomingMessage, socket: Duplex, head: Buffer) => void): this;
         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "keylog", listener: (line: Buffer, tlsSocket: tls.TLSSocket) => void): this;
-        prependOnceListener(
-            event: "newSession",
-            listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void,
-        ): this;
-        prependOnceListener(
-            event: "OCSPRequest",
-            listener: (
-                certificate: Buffer,
-                issuer: Buffer,
-                callback: (err: Error | null, resp: Buffer) => void,
-            ) => void,
-        ): this;
-        prependOnceListener(
-            event: "resumeSession",
-            listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void,
-        ): this;
-        prependOnceListener(event: "secureConnection", listener: (tlsSocket: tls.TLSSocket) => void): this;
-        prependOnceListener(event: "tlsClientError", listener: (err: Error, tlsSocket: tls.TLSSocket) => void): this;
-        prependOnceListener(event: "close", listener: () => void): this;
-        prependOnceListener(event: "connection", listener: (socket: Duplex) => void): this;
-        prependOnceListener(event: "error", listener: (err: Error) => void): this;
-        prependOnceListener(event: "listening", listener: () => void): this;
-        prependOnceListener(event: "checkContinue", listener: http.RequestListener<Request, Response>): this;
-        prependOnceListener(event: "checkExpectation", listener: http.RequestListener<Request, Response>): this;
-        prependOnceListener(event: "clientError", listener: (err: Error, socket: Duplex) => void): this;
-        prependOnceListener(
-            event: "connect",
-            listener: (req: InstanceType<Request>, socket: Duplex, head: Buffer) => void,
-        ): this;
-        prependOnceListener(event: "request", listener: http.RequestListener<Request, Response>): this;
-        prependOnceListener(
-            event: "upgrade",
-            listener: (req: InstanceType<Request>, socket: Duplex, head: Buffer) => void,
-        ): this;
+        prependOnceListener(event: 'keylog', listener: (line: Buffer, tlsSocket: tls.TLSSocket) => void): this;
+        prependOnceListener(event: 'newSession', listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependOnceListener(event: 'OCSPRequest', listener: (certificate: Buffer, issuer: Buffer, callback: (err: Error | null, resp: Buffer) => void) => void): this;
+        prependOnceListener(event: 'resumeSession', listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void): this;
+        prependOnceListener(event: 'secureConnection', listener: (tlsSocket: tls.TLSSocket) => void): this;
+        prependOnceListener(event: 'tlsClientError', listener: (err: Error, tlsSocket: tls.TLSSocket) => void): this;
+        prependOnceListener(event: 'close', listener: () => void): this;
+        prependOnceListener(event: 'connection', listener: (socket: Duplex) => void): this;
+        prependOnceListener(event: 'error', listener: (err: Error) => void): this;
+        prependOnceListener(event: 'listening', listener: () => void): this;
+        prependOnceListener(event: 'checkContinue', listener: http.RequestListener): this;
+        prependOnceListener(event: 'checkExpectation', listener: http.RequestListener): this;
+        prependOnceListener(event: 'clientError', listener: (err: Error, socket: Duplex) => void): this;
+        prependOnceListener(event: 'connect', listener: (req: http.IncomingMessage, socket: Duplex, head: Buffer) => void): this;
+        prependOnceListener(event: 'request', listener: http.RequestListener): this;
+        prependOnceListener(event: 'upgrade', listener: (req: http.IncomingMessage, socket: Duplex, head: Buffer) => void): this;
     }
     /**
      * ```js
      * // curl -k https://localhost:8000/
-     * const https = require('node:https');
-     * const fs = require('node:fs');
+     * const https = require('https');
+     * const fs = require('fs');
      *
      * const options = {
      *   key: fs.readFileSync('test/fixtures/keys/agent2-key.pem'),
-     *   cert: fs.readFileSync('test/fixtures/keys/agent2-cert.pem'),
+     *   cert: fs.readFileSync('test/fixtures/keys/agent2-cert.pem')
      * };
      *
      * https.createServer(options, (req, res) => {
@@ -293,12 +157,12 @@ declare module "https" {
      * Or
      *
      * ```js
-     * const https = require('node:https');
-     * const fs = require('node:fs');
+     * const https = require('https');
+     * const fs = require('fs');
      *
      * const options = {
      *   pfx: fs.readFileSync('test/fixtures/test_cert.pfx'),
-     *   passphrase: 'sample',
+     *   passphrase: 'sample'
      * };
      *
      * https.createServer(options, (req, res) => {
@@ -310,17 +174,8 @@ declare module "https" {
      * @param options Accepts `options` from `createServer`, `createSecureContext` and `createServer`.
      * @param requestListener A listener to be added to the `'request'` event.
      */
-    function createServer<
-        Request extends typeof http.IncomingMessage = typeof http.IncomingMessage,
-        Response extends typeof http.ServerResponse = typeof http.ServerResponse,
-    >(requestListener?: http.RequestListener<Request, Response>): Server<Request, Response>;
-    function createServer<
-        Request extends typeof http.IncomingMessage = typeof http.IncomingMessage,
-        Response extends typeof http.ServerResponse = typeof http.ServerResponse,
-    >(
-        options: ServerOptions<Request, Response>,
-        requestListener?: http.RequestListener<Request, Response>,
-    ): Server<Request, Response>;
+    function createServer(requestListener?: http.RequestListener): Server;
+    function createServer(options: ServerOptions, requestListener?: http.RequestListener): Server;
     /**
      * Makes a request to a secure web server.
      *
@@ -334,13 +189,13 @@ declare module "https" {
      * upload a file with a POST request, then write to the `ClientRequest` object.
      *
      * ```js
-     * const https = require('node:https');
+     * const https = require('https');
      *
      * const options = {
      *   hostname: 'encrypted.google.com',
      *   port: 443,
      *   path: '/',
-     *   method: 'GET',
+     *   method: 'GET'
      * };
      *
      * const req = https.request(options, (res) => {
@@ -367,7 +222,7 @@ declare module "https" {
      *   path: '/',
      *   method: 'GET',
      *   key: fs.readFileSync('test/fixtures/keys/agent2-key.pem'),
-     *   cert: fs.readFileSync('test/fixtures/keys/agent2-cert.pem'),
+     *   cert: fs.readFileSync('test/fixtures/keys/agent2-cert.pem')
      * };
      * options.agent = new https.Agent(options);
      *
@@ -386,7 +241,7 @@ declare module "https" {
      *   method: 'GET',
      *   key: fs.readFileSync('test/fixtures/keys/agent2-key.pem'),
      *   cert: fs.readFileSync('test/fixtures/keys/agent2-cert.pem'),
-     *   agent: false,
+     *   agent: false
      * };
      *
      * const req = https.request(options, (res) => {
@@ -407,9 +262,9 @@ declare module "https" {
      * Example pinning on certificate fingerprint, or the public key (similar to`pin-sha256`):
      *
      * ```js
-     * const tls = require('node:tls');
-     * const https = require('node:https');
-     * const crypto = require('node:crypto');
+     * const tls = require('tls');
+     * const https = require('https');
+     * const crypto = require('crypto');
      *
      * function sha256(s) {
      *   return crypto.createHash('sha256').update(s).digest('base64');
@@ -426,7 +281,7 @@ declare module "https" {
      *       return err;
      *     }
      *
-     *     // Pin the public key, similar to HPKP pin-sha256 pinning
+     *     // Pin the public key, similar to HPKP pin-sha25 pinning
      *     const pubkey256 = 'pL1+qb9HTMRZJmuC/bB/ZI9d302BYrrqiVuRyW+DGrU=';
      *     if (sha256(cert.pubkey) !== pubkey256) {
      *       const msg = 'Certificate verification error: ' +
@@ -501,15 +356,8 @@ declare module "https" {
      * @since v0.3.6
      * @param options Accepts all `options` from `request`, with some differences in default values:
      */
-    function request(
-        options: RequestOptions | string | URL,
-        callback?: (res: http.IncomingMessage) => void,
-    ): http.ClientRequest;
-    function request(
-        url: string | URL,
-        options: RequestOptions,
-        callback?: (res: http.IncomingMessage) => void,
-    ): http.ClientRequest;
+    function request(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    function request(url: string | URL, options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
     /**
      * Like `http.get()` but for HTTPS.
      *
@@ -517,7 +365,7 @@ declare module "https" {
      * string, it is automatically parsed with `new URL()`. If it is a `URL` object, it will be automatically converted to an ordinary `options` object.
      *
      * ```js
-     * const https = require('node:https');
+     * const https = require('https');
      *
      * https.get('https://encrypted.google.com/', (res) => {
      *   console.log('statusCode:', res.statusCode);
@@ -534,17 +382,10 @@ declare module "https" {
      * @since v0.3.6
      * @param options Accepts the same `options` as {@link request}, with the `method` always set to `GET`.
      */
-    function get(
-        options: RequestOptions | string | URL,
-        callback?: (res: http.IncomingMessage) => void,
-    ): http.ClientRequest;
-    function get(
-        url: string | URL,
-        options: RequestOptions,
-        callback?: (res: http.IncomingMessage) => void,
-    ): http.ClientRequest;
+    function get(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    function get(url: string | URL, options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
     let globalAgent: Agent;
 }
-declare module "node:https" {
-    export * from "https";
+declare module 'node:https' {
+    export * from 'https';
 }

node_modules/@types/node/index.d.ts

@@ -1,3 +1,48 @@
+// Type definitions for non-npm package Node.js 16.11
+// Project: https://nodejs.org/
+// Definitions by: Microsoft TypeScript <https://github.com/Microsoft>
+//                 DefinitelyTyped <https://github.com/DefinitelyTyped>
+//                 Alberto Schiabel <https://github.com/jkomyno>
+//                 Alvis HT Tang <https://github.com/alvis>
+//                 Andrew Makarov <https://github.com/r3nya>
+//                 Benjamin Toueg <https://github.com/btoueg>
+//                 Chigozirim C. <https://github.com/smac89>
+//                 David Junger <https://github.com/touffy>
+//                 Deividas Bakanas <https://github.com/DeividasBakanas>
+//                 Eugene Y. Q. Shen <https://github.com/eyqs>
+//                 Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>
+//                 Huw <https://github.com/hoo29>
+//                 Kelvin Jin <https://github.com/kjin>
+//                 Klaus Meinhardt <https://github.com/ajafff>
+//                 Lishude <https://github.com/islishude>
+//                 Mariusz Wiktorczyk <https://github.com/mwiktorczyk>
+//                 Mohsen Azimi <https://github.com/mohsen1>
+//                 Nicolas Even <https://github.com/n-e>
+//                 Nikita Galkin <https://github.com/galkin>
+//                 Parambir Singh <https://github.com/parambirs>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
+//                 Seth Westphal <https://github.com/westy92>
+//                 Simon Schick <https://github.com/SimonSchick>
+//                 Thomas den Hollander <https://github.com/ThomasdenH>
+//                 Wilco Bakker <https://github.com/WilcoBakker>
+//                 wwwy3y3 <https://github.com/wwwy3y3>
+//                 Samuel Ainsworth <https://github.com/samuela>
+//                 Kyle Uehlein <https://github.com/kuehlein>
+//                 Thanik Bhongbhibhat <https://github.com/bhongy>
+//                 Marcin Kopacz <https://github.com/chyzwar>
+//                 Trivikram Kamat <https://github.com/trivikr>
+//                 Junxiao Shi <https://github.com/yoursunny>
+//                 Ilia Baryshnikov <https://github.com/qwelias>
+//                 ExE Boss <https://github.com/ExE-Boss>
+//                 Piotr Błażejewicz <https://github.com/peterblazejewicz>
+//                 Anna Henningsen <https://github.com/addaleax>
+//                 Victor Perin <https://github.com/victorperin>
+//                 Yongsheng Zhang <https://github.com/ZYSzys>
+//                 NodeJS Contributors <https://github.com/NodeJS>
+//                 Linus Unnebäck <https://github.com/LinusU>
+//                 wafuwafu13 <https://github.com/wafuwafu13>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
 /**
  * License for programmatically and manually incorporated
  * documentation aka. `JSDoc` from https://github.com/nodejs/node/tree/master/doc
@@ -22,7 +67,7 @@
  * IN THE SOFTWARE.
  */
 
-// NOTE: These definitions support NodeJS and TypeScript 4.9+.
+// NOTE: These definitions support NodeJS and TypeScript 3.7+.
 
 // Reference required types from the default lib:
 /// <reference lib="es2020" />
@@ -47,7 +92,6 @@
 /// <reference path="dns/promises.d.ts" />
 /// <reference path="dns/promises.d.ts" />
 /// <reference path="domain.d.ts" />
-/// <reference path="dom-events.d.ts" />
 /// <reference path="events.d.ts" />
 /// <reference path="fs.d.ts" />
 /// <reference path="fs/promises.d.ts" />
@@ -64,14 +108,12 @@
 /// <reference path="punycode.d.ts" />
 /// <reference path="querystring.d.ts" />
 /// <reference path="readline.d.ts" />
-/// <reference path="readline/promises.d.ts" />
 /// <reference path="repl.d.ts" />
 /// <reference path="stream.d.ts" />
 /// <reference path="stream/promises.d.ts" />
 /// <reference path="stream/consumers.d.ts" />
 /// <reference path="stream/web.d.ts" />
 /// <reference path="string_decoder.d.ts" />
-/// <reference path="test.d.ts" />
 /// <reference path="timers.d.ts" />
 /// <reference path="timers/promises.d.ts" />
 /// <reference path="tls.d.ts" />

node_modules/@types/node/inspector.d.ts

@@ -1,26 +1,21 @@
+// tslint:disable-next-line:dt-header
 // Type definitions for inspector
 
 // These definitions are auto-generated.
 // Please see https://github.com/DefinitelyTyped/DefinitelyTyped/pull/19330
 // for more information.
 
+// tslint:disable:max-line-length
 
 /**
- * The `node:inspector` module provides an API for interacting with the V8
- * inspector.
+ * The `inspector` module provides an API for interacting with the V8 inspector.
  *
  * It can be accessed using:
  *
  * ```js
- * import * as inspector from 'node:inspector/promises';
+ * const inspector = require('inspector');
  * ```
- *
- * or
- *
- * ```js
- * import * as inspector from 'node:inspector';
- * ```
- * @see [source](https://github.com/nodejs/node/blob/v20.2.0/lib/inspector.js)
+ * @see [source](https://github.com/nodejs/node/blob/v16.9.0/lib/inspector.js)
  */
 declare module 'inspector' {
     import EventEmitter = require('node:events');
@@ -1693,7 +1688,7 @@ declare module 'inspector' {
             /**
              * Controls how the trace buffer stores data.
              */
-            recordMode?: string | undefined;
+            recordMode?: string;
             /**
              * Included category filters.
              */
@@ -1783,6 +1778,13 @@ declare module 'inspector' {
          * @since v8.0.0
          */
         connect(): void;
+        /**
+         * Connects a session to the main thread inspector back-end.
+         * An exception will be thrown if this API was not called on a Worker
+         * thread.
+         * @since 12.11.0
+         */
+        connectToMainThread(): void;
         /**
          * Immediately close the session. All pending message callbacks will be called
          * with an error. `session.connect()` will need to be called to be able to send
@@ -2694,7 +2696,7 @@ declare module 'inspector' {
         prependOnceListener(event: 'NodeRuntime.waitingForDisconnect', listener: () => void): this;
     }
     /**
-     * Activate inspector on host and port. Equivalent to`node --inspect=[[host:]port]`, but can be done programmatically after node has
+     * Activate inspector on host and port. Equivalent to `node --inspect=[[host:]port]`, but can be done programmatically after node has
      * started.
      *
      * If wait is `true`, will block until a client has connected to the inspect port
@@ -2704,9 +2706,8 @@ declare module 'inspector' {
      * @param [port='what was specified on the CLI'] Port to listen on for inspector connections. Optional.
      * @param [host='what was specified on the CLI'] Host to listen on for inspector connections. Optional.
      * @param [wait=false] Block until a client has connected. Optional.
-     * @returns Disposable that calls `inspector.close()`.
      */
-    function open(port?: number, host?: string, wait?: boolean): Disposable;
+    function open(port?: number, host?: string, wait?: boolean): void;
     /**
      * Deactivate the inspector. Blocks until there are no active connections.
      */
@@ -2717,12 +2718,12 @@ declare module 'inspector' {
      * ```console
      * $ node --inspect -p 'inspector.url()'
      * Debugger listening on ws://127.0.0.1:9229/166e272e-7a30-4d09-97ce-f1c012b43c34
-     * For help, see: https://nodejs.org/en/docs/inspector
+     * For help see https://nodejs.org/en/docs/inspector
      * ws://127.0.0.1:9229/166e272e-7a30-4d09-97ce-f1c012b43c34
      *
      * $ node --inspect=localhost:3000 -p 'inspector.url()'
      * Debugger listening on ws://localhost:3000/51cf8d0e-3c36-4c59-8efd-54519839e56a
-     * For help, see: https://nodejs.org/en/docs/inspector
+     * For help see https://nodejs.org/en/docs/inspector
      * ws://localhost:3000/51cf8d0e-3c36-4c59-8efd-54519839e56a
      *
      * $ node -p 'inspector.url()'
@@ -2738,10 +2739,7 @@ declare module 'inspector' {
      */
     function waitForDebugger(): void;
 }
-/**
- * The inspector module provides an API for interacting with the V8 inspector.
- */
 declare module 'node:inspector' {
-    import inspector = require('inspector');
-    export = inspector;
+    import EventEmitter = require('inspector');
+    export = EventEmitter;
 }